Change to reqwest

server/Cargo.toml

@@ -48,6 +48,7 @@ os_info = "3.6"
 hostname = "0.3"
 rand = "0.8"
 relative-path = { version = "1.7", features = ["serde"] }
+reqwest = { version = "0.11", default_features=false, features=["rustls", "json", "hyper-rustls", "tokio-rustls"]}
 rustls = "0.20"
 rustls-pemfile = "1.0"
 rust-flatten-json = "0.2"
@@ -66,7 +67,6 @@ clokwerk = "0.4"
 actix-web-static-files = "4.0"
 static-files = "0.2"
 ulid = { version = "1.0", features = ["serde"] }
-ureq = { version = "2.6", features = ["json"] }
 hex = "0.4"
 itertools = "0.10"
 xxhash-rust = { version = "0.8", features = ["xxh3"] }

server/src/alerts/mod.rs

@@ -16,6 +16,7 @@
  *
  */
 
+use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 
@@ -77,9 +78,9 @@ impl Alert {
         )
     }
 }
-
+#[async_trait]
 pub trait CallableTarget {
-    fn call(&self, payload: &Context);
+    async fn call(&self, payload: &Context);
 }
 
 #[derive(Debug, Clone)]

server/src/alerts/rule.rs

@@ -113,7 +113,6 @@ impl ColumnRule {
             }) => format!(
                 "{} column was {} {}, {} times",
                 column,
-                value,
                 match operator {
                     NumericOperator::EqualTo => "equal to",
                     NumericOperator::NotEqualTo => " not equal to",
@@ -122,6 +121,7 @@ impl ColumnRule {
                     NumericOperator::LessThan => "less than",
                     NumericOperator::LessThanEquals => "less than or equal to",
                 },
+                value,
                 repeats
             ),
             Self::ConsecutiveString(ConsecutiveStringRule {
@@ -137,13 +137,13 @@ impl ColumnRule {
             }) => format!(
                 "{} column {} {}, {} times",
                 column,
-                value,
                 match operator {
                     StringOperator::Exact => "was equal to",
                     StringOperator::NotExact => "was not equal to",
                     StringOperator::Contains => "contained",
                     StringOperator::NotContains => "did not contain",
                 },
+                value,
                 repeats
             ),
         }