Compare commits
No commits in common. 'main' and 'detection_runner_updade' have entirely different histories.
main
...
detection_
24 changed files with 164 additions and 627 deletions
@ -1,27 +0,0 @@
|
||||
FROM rust:1.57.0-bullseye as builder |
||||
|
||||
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - |
||||
|
||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ |
||||
nodejs \ |
||||
gcc \ |
||||
g++ \ |
||||
make \ |
||||
musl-tools \ |
||||
&& rm -rf /var/lib/apt/lists/* |
||||
|
||||
RUN npm install --global yarn |
||||
|
||||
RUN rustup target add x86_64-unknown-linux-musl |
||||
|
||||
ADD . ./ |
||||
|
||||
RUN make |
||||
|
||||
FROM debian:bullseye-slim |
||||
|
||||
COPY --from=builder /release/hastic /hastic |
||||
COPY --from=builder /release/config.toml /config.toml |
||||
COPY --from=builder /release/public /public |
||||
|
||||
CMD ["./hastic"] |
||||
@ -1,12 +0,0 @@
|
||||
|
||||
version: '3' |
||||
services: |
||||
app: |
||||
image: hastic/hastic:latest |
||||
restart: always |
||||
environment: |
||||
HASTIC_PORT: "4347" |
||||
HASTIC_PROMETHEUS__URL: "http://demo.robustperception.io:9090" |
||||
HASTIC_PROMETHEUS__QUERY: "rate(go_memstats_alloc_bytes_total[1m])" |
||||
ports: |
||||
- "4347:4347" |
||||
@ -1,195 +1,76 @@
|
||||
use std::sync::{Arc, Mutex}; |
||||
|
||||
use rusqlite::{params, Connection}; |
||||
use crate::utils::get_random_str; |
||||
|
||||
use super::analytic_service::analytic_unit::{ |
||||
anomaly_analytic_unit::AnomalyAnalyticUnit, |
||||
pattern_analytic_unit::PatternAnalyticUnit, |
||||
threshold_analytic_unit::ThresholdAnalyticUnit, |
||||
types::{self, AnalyticUnitConfig}, |
||||
}; |
||||
use rusqlite::{params, Connection, Row}; |
||||
use warp::hyper::rt::Executor; |
||||
|
||||
use super::data_service::DataService; |
||||
use super::analytic_service::analytic_unit::{types::{AnalyticUnitConfig, self}, threshold_analytic_unit::ThresholdAnalyticUnit, pattern_analytic_unit::PatternAnalyticUnit, anomaly_analytic_unit::AnomalyAnalyticUnit}; |
||||
|
||||
#[derive(Clone)] |
||||
pub struct AnalyticUnitService { |
||||
connection: Arc<Mutex<Connection>>, |
||||
// TODO: resolve by setting id for 3 types
|
||||
// TODO: create database
|
||||
// TODO: update detection
|
||||
connection: Arc<Mutex<Connection>> |
||||
} |
||||
|
||||
// TODO: get DataService
|
||||
impl AnalyticUnitService { |
||||
pub fn new(ds: &DataService) -> anyhow::Result<AnalyticUnitService> { |
||||
let conn = ds.analytic_units_connection.clone(); |
||||
pub fn new() -> anyhow::Result<AnalyticUnitService> { |
||||
// TODO: remove repetitoin with segment_service
|
||||
std::fs::create_dir_all("./data").unwrap(); |
||||
let conn = Connection::open("./data/analytic_units.db")?; |
||||
|
||||
// TODO: add learning results field
|
||||
conn.lock().unwrap().execute( |
||||
conn.execute( |
||||
"CREATE TABLE IF NOT EXISTS analytic_unit ( |
||||
id TEXT PRIMARY KEY, |
||||
last_detection INTEGER, |
||||
active BOOLEAN, |
||||
type INTEGER, |
||||
config TEXT |
||||
last_detection INTEGER |
||||
)", |
||||
[], |
||||
)?; |
||||
|
||||
Ok(AnalyticUnitService { |
||||
connection: conn |
||||
connection: Arc::new(Mutex::new(conn)), |
||||
}) |
||||
} |
||||
|
||||
// TODO: optional id
|
||||
pub fn resolve_au( |
||||
&self, |
||||
cfg: &AnalyticUnitConfig, |
||||
) -> Box<dyn types::AnalyticUnit + Send + Sync> { |
||||
pub fn resolve_au(&self, cfg: AnalyticUnitConfig) -> Box<dyn types::AnalyticUnit + Send + Sync> { |
||||
match cfg { |
||||
AnalyticUnitConfig::Threshold(c) => { |
||||
Box::new(ThresholdAnalyticUnit::new("1".to_string(), c.clone())) |
||||
} |
||||
AnalyticUnitConfig::Pattern(c) => { |
||||
Box::new(PatternAnalyticUnit::new("2".to_string(), c.clone())) |
||||
} |
||||
AnalyticUnitConfig::Anomaly(c) => { |
||||
Box::new(AnomalyAnalyticUnit::new("3".to_string(), c.clone())) |
||||
} |
||||
AnalyticUnitConfig::Threshold(c) => Box::new(ThresholdAnalyticUnit::new("1".to_string(), c.clone())), |
||||
AnalyticUnitConfig::Pattern(c) => Box::new(PatternAnalyticUnit::new("2".to_string(), c.clone())), |
||||
AnalyticUnitConfig::Anomaly(c) => Box::new(AnomalyAnalyticUnit::new("3".to_string(), c.clone())), |
||||
} |
||||
} |
||||
|
||||
// TODO: get id of analytic_unit which be used also as it's type
|
||||
pub fn resolve( |
||||
&self, |
||||
cfg: &AnalyticUnitConfig, |
||||
) -> anyhow::Result<Box<dyn types::AnalyticUnit + Send + Sync>> { |
||||
pub fn resolve(&self, cfg: AnalyticUnitConfig) -> anyhow::Result<Box<dyn types::AnalyticUnit + Send + Sync>> { |
||||
let au = self.resolve_au(cfg); |
||||
let id = au.as_ref().get_id(); |
||||
|
||||
let conn = self.connection.lock().unwrap(); |
||||
let mut stmt = conn.prepare("SELECT id from analytic_unit WHERE id = ?1")?; |
||||
let mut stmt = conn.prepare( |
||||
"SELECT id from analytic_unit WHERE id = ?1", |
||||
)?; |
||||
let res = stmt.exists(params![id])?; |
||||
|
||||
if res == false { |
||||
let cfg_json = serde_json::to_string(&cfg)?; |
||||
conn.execute( |
||||
"INSERT INTO analytic_unit (id, type, config) VALUES (?1, ?1, ?2)", |
||||
params![id, cfg_json], |
||||
"INSERT INTO analytic_unit (id) VALUES (?1)", |
||||
params![id] |
||||
)?; |
||||
} |
||||
|
||||
conn.execute( |
||||
"UPDATE analytic_unit set active = FALSE where active = TRUE", |
||||
params![], |
||||
)?; |
||||
conn.execute( |
||||
"UPDATE analytic_unit set active = TRUE where id = ?1", |
||||
params![id], |
||||
)?; |
||||
|
||||
return Ok(au); |
||||
} |
||||
|
||||
// TODO: resolve with saving by id
|
||||
pub fn set_last_detection(&self, id: String, last_detection: u64) -> anyhow::Result<()> { |
||||
let conn = self.connection.lock().unwrap(); |
||||
conn.execute( |
||||
"UPDATE analytic_unit SET last_detection = ?1 WHERE id = ?2", |
||||
params![last_detection, id], |
||||
params![last_detection, id] |
||||
)?; |
||||
Ok(()) |
||||
} |
||||
|
||||
pub fn get_active(&self) -> anyhow::Result<Box<dyn types::AnalyticUnit + Send + Sync>> { |
||||
// TODO: return default when there is no active
|
||||
let conn = self.connection.lock().unwrap(); |
||||
let mut stmt = |
||||
conn.prepare("SELECT id, type, config from analytic_unit WHERE active = TRUE")?; |
||||
|
||||
let au = stmt.query_row([], |row| { |
||||
let c: String = row.get(2)?; |
||||
let cfg: AnalyticUnitConfig = serde_json::from_str(&c).unwrap(); |
||||
Ok(self.resolve(&cfg)) |
||||
})??; |
||||
|
||||
return Ok(au); |
||||
} |
||||
|
||||
pub fn get_active_config(&self) -> anyhow::Result<AnalyticUnitConfig> { |
||||
let exists = { |
||||
let conn = self.connection.lock().unwrap(); |
||||
let mut stmt = conn.prepare("SELECT config from analytic_unit WHERE active = TRUE")?; |
||||
stmt.exists([])? |
||||
}; |
||||
|
||||
if exists == false { |
||||
let c = AnalyticUnitConfig::Pattern(Default::default()); |
||||
self.resolve(&c)?; |
||||
return Ok(c); |
||||
} else { |
||||
let conn = self.connection.lock().unwrap(); |
||||
let mut stmt = conn.prepare("SELECT config from analytic_unit WHERE active = TRUE")?; |
||||
let acfg = stmt.query_row([], |row| { |
||||
let c: String = row.get(0)?; |
||||
let cfg = serde_json::from_str(&c).unwrap(); |
||||
Ok(cfg) |
||||
})?; |
||||
return Ok(acfg); |
||||
} |
||||
} |
||||
|
||||
pub fn get_config_by_id(&self, id: &String) -> anyhow::Result<AnalyticUnitConfig> { |
||||
let exists = { |
||||
let conn = self.connection.lock().unwrap(); |
||||
let mut stmt = conn.prepare("SELECT config from analytic_unit WHERE id = ?1")?; |
||||
stmt.exists([id])? |
||||
}; |
||||
|
||||
if exists == false { |
||||
let c = AnalyticUnitConfig::get_default_by_id(id); |
||||
self.resolve(&c)?; |
||||
return Ok(c); |
||||
} else { |
||||
let conn = self.connection.lock().unwrap(); |
||||
let mut stmt = conn.prepare("SELECT config from analytic_unit WHERE id = ?1")?; |
||||
let acfg = stmt.query_row([id], |row| { |
||||
let c: String = row.get(0)?; |
||||
let cfg = serde_json::from_str(&c).unwrap(); |
||||
Ok(cfg) |
||||
})?; |
||||
return Ok(acfg); |
||||
} |
||||
} |
||||
|
||||
pub fn get_config_id(&self, cfg: &AnalyticUnitConfig) -> String { |
||||
match cfg { |
||||
AnalyticUnitConfig::Threshold(_) => "1".to_string(), |
||||
AnalyticUnitConfig::Pattern(_) => "2".to_string(), |
||||
AnalyticUnitConfig::Anomaly(_) => "3".to_string(), |
||||
} |
||||
} |
||||
|
||||
pub fn update_config_by_id(&self, id: &String, cfg: &AnalyticUnitConfig) -> anyhow::Result<()> { |
||||
// TODO: it's possble that config doesn't exist, but we trying to update it
|
||||
let conn = self.connection.lock().unwrap(); |
||||
|
||||
let cfg_json = serde_json::to_string(&cfg)?; |
||||
|
||||
conn.execute( |
||||
"UPDATE analytic_unit SET config = ?1 WHERE id = ?2", |
||||
params![cfg_json, id], |
||||
)?; |
||||
|
||||
return Ok(()); |
||||
} |
||||
|
||||
pub fn update_active_config(&self, cfg: &AnalyticUnitConfig) -> anyhow::Result<()> { |
||||
let conn = self.connection.lock().unwrap(); |
||||
|
||||
let cfg_json = serde_json::to_string(&cfg)?; |
||||
|
||||
conn.execute( |
||||
"UPDATE analytic_unit SET config = ?1 WHERE active = TRUE", |
||||
params![cfg_json], |
||||
)?; |
||||
|
||||
return Ok(()); |
||||
} |
||||
} |
||||
} |
||||
@ -1,23 +0,0 @@
|
||||
use std::sync::{Arc, Mutex}; |
||||
|
||||
use rusqlite::{Connection}; |
||||
|
||||
|
||||
pub struct DataService { |
||||
pub analytic_units_connection: Arc<Mutex<Connection>>, |
||||
pub segments_connection: Arc<Mutex<Connection>> |
||||
} |
||||
|
||||
impl DataService { |
||||
pub fn new() -> anyhow::Result<DataService> { |
||||
std::fs::create_dir_all("./data").unwrap(); |
||||
|
||||
let analytic_units_connection = Connection::open("./data/analytic_units.db")?; |
||||
let segments_connection = Connection::open("./data/segments.db")?; |
||||
|
||||
Ok(DataService { |
||||
analytic_units_connection: Arc::new(Mutex::new(analytic_units_connection)), |
||||
segments_connection: Arc::new(Mutex::new(segments_connection)) |
||||
}) |
||||
} |
||||
} |
||||
@ -1,6 +1,5 @@
|
||||
pub mod analytic_service; |
||||
pub mod data_service; |
||||
pub mod analytic_unit_service; |
||||
pub mod metric_service; |
||||
pub mod segments_service; |
||||
pub mod user_service; |
||||
pub mod analytic_unit_service; |
||||
|
||||
Loading…
Reference in new issue