From 0f7d64350fe3c03a7156e83ba703fc46d06a595e Mon Sep 17 00:00:00 2001 From: mbecker20 Date: Mon, 21 Aug 2023 03:21:42 -0400 Subject: [PATCH] alert logger 7000. fix alert open when empty --- bin/alert_logger/Dockerfile | 2 +- bin/alert_logger/src/main.rs | 2 +- bin/core/src/helpers/alert.rs | 8 ++++++++ bin/core/src/monitor/alert/server.rs | 12 ++++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/bin/alert_logger/Dockerfile b/bin/alert_logger/Dockerfile index 53caf7786..c131f7ffc 100644 --- a/bin/alert_logger/Dockerfile +++ b/bin/alert_logger/Dockerfile @@ -11,6 +11,6 @@ FROM gcr.io/distroless/cc COPY --from=builder /builder/target/release/alert_logger / -EXPOSE 7777 +EXPOSE 7000 CMD ["./alert_logger"] \ No newline at end of file diff --git a/bin/alert_logger/src/main.rs b/bin/alert_logger/src/main.rs index e2cdfb8b3..1ae3a9d20 100644 --- a/bin/alert_logger/src/main.rs +++ b/bin/alert_logger/src/main.rs @@ -11,7 +11,7 @@ use termination_signal::tokio::immediate_term_handle; async fn app() -> anyhow::Result<()> { logger::init(log::LevelFilter::Info)?; - let socket_addr = SocketAddr::from_str("0.0.0.0:7777").unwrap(); + let socket_addr = SocketAddr::from_str("0.0.0.0:7000").unwrap(); info!( "v {} | {socket_addr}", diff --git a/bin/core/src/helpers/alert.rs b/bin/core/src/helpers/alert.rs index b465dc13f..845f66824 100644 --- a/bin/core/src/helpers/alert.rs +++ b/bin/core/src/helpers/alert.rs @@ -13,6 +13,10 @@ use crate::state::State; impl State { pub async fn send_alerts(&self, alerts: &[Alert]) { + if alerts.is_empty() { + return; + } + let alerters = self.db.alerters.get_some(None, None).await; if let Err(e) = alerters { @@ -29,6 +33,10 @@ impl State { } async fn send_alert(alerters: &[Alerter], alert: &Alert) { + if alerters.is_empty() { + return; + } + let handles = alerters.iter().map(|alerter| async { match &alerter.config { AlerterConfig::Slack(SlackAlerterConfig { url }) => send_slack_alert(url, alert) diff --git a/bin/core/src/monitor/alert/server.rs b/bin/core/src/monitor/alert/server.rs index fec76ba87..54ea12afa 100644 --- a/bin/core/src/monitor/alert/server.rs +++ b/bin/core/src/monitor/alert/server.rs @@ -390,6 +390,10 @@ impl State { } async fn open_alerts(&self, alerts: &[Alert]) { + if alerts.is_empty() { + return; + } + let open = || async { self.db.alerts.create_many(alerts).await?; anyhow::Ok(()) @@ -403,6 +407,10 @@ impl State { } async fn update_alerts(&self, alerts: &[Alert]) { + if alerts.is_empty() { + return; + } + let open = || async { let updates = alerts.iter().map(|alert| { let update = BulkUpdate { @@ -427,6 +435,10 @@ impl State { } async fn resolve_alerts(&self, alert_ids: &[String]) { + if alert_ids.is_empty() { + return; + } + let close = || async { let alert_ids = alert_ids .iter()