From 5aa9dc701fea09140cc1e7d30e580e8808d0cd47 Mon Sep 17 00:00:00 2001 From: Jean-Gabriel Gill-Couture Date: Wed, 28 May 2025 15:19:39 -0400 Subject: [PATCH] fix: Removed forgotten refactoring bits and formatting --- examples/lamp/src/main.rs | 8 +------- harmony/src/modules/monitoring/config.rs | 1 - harmony/src/modules/monitoring/discord_alert_manager.rs | 6 ++++-- harmony/src/modules/monitoring/mod.rs | 4 ++-- harmony/src/modules/monitoring/monitoring_alerting.rs | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/examples/lamp/src/main.rs b/examples/lamp/src/main.rs index feac05d..74df0d8 100644 --- a/examples/lamp/src/main.rs +++ b/examples/lamp/src/main.rs @@ -4,9 +4,7 @@ use harmony::{ maestro::Maestro, modules::{ lamp::{LAMPConfig, LAMPScore}, - monitoring::monitoring_alerting::{ - AlertChannel, MonitoringAlertingStackScore, WebhookServiceType, - }, + monitoring::monitoring_alerting::{AlertChannel, MonitoringAlertingStackScore}, }, topology::{K8sAnywhereTopology, Url}, }; @@ -50,10 +48,6 @@ async fn main() { let mut monitoring_stack_score = MonitoringAlertingStackScore::new(); monitoring_stack_score.namespace = Some(lamp_stack.config.namespace.clone()); - monitoring_stack_score.alert_channel = Some(AlertChannel::WebHookUrl { - url: url, - webhook_service_type: WebhookServiceType::Discord, - }); maestro.register_all(vec![Box::new(lamp_stack), Box::new(monitoring_stack_score)]); // Here we bootstrap the CLI, this gives some nice features if you need them diff --git a/harmony/src/modules/monitoring/config.rs b/harmony/src/modules/monitoring/config.rs index c06377c..1477905 100644 --- a/harmony/src/modules/monitoring/config.rs +++ b/harmony/src/modules/monitoring/config.rs @@ -2,7 +2,6 @@ use serde::Serialize; use super::monitoring_alerting::AlertChannel; - #[derive(Debug, Clone, Serialize)] pub struct KubePrometheusConfig { pub namespace: String, diff --git a/harmony/src/modules/monitoring/discord_alert_manager.rs b/harmony/src/modules/monitoring/discord_alert_manager.rs index 5eaffa0..a3519e8 100644 --- a/harmony/src/modules/monitoring/discord_alert_manager.rs +++ b/harmony/src/modules/monitoring/discord_alert_manager.rs @@ -26,8 +26,10 @@ environment: Some(HelmChartScore { namespace: Some(NonBlankString::from_str(&config.namespace).unwrap()), release_name: NonBlankString::from_str(&name).unwrap(), - chart_name: NonBlankString::from_str("oci://hub.nationtech.io/library/alertmanager-discord") - .unwrap(), + chart_name: NonBlankString::from_str( + "oci://hub.nationtech.io/library/alertmanager-discord", + ) + .unwrap(), chart_version: None, values_overrides: None, values_yaml: Some(values.to_string()), diff --git a/harmony/src/modules/monitoring/mod.rs b/harmony/src/modules/monitoring/mod.rs index d880a67..914ae07 100644 --- a/harmony/src/modules/monitoring/mod.rs +++ b/harmony/src/modules/monitoring/mod.rs @@ -1,4 +1,4 @@ +mod config; +mod discord_alert_manager; mod kube_prometheus; pub mod monitoring_alerting; -mod discord_alert_manager; -mod config; diff --git a/harmony/src/modules/monitoring/monitoring_alerting.rs b/harmony/src/modules/monitoring/monitoring_alerting.rs index 0e7c2d4..325f9d3 100644 --- a/harmony/src/modules/monitoring/monitoring_alerting.rs +++ b/harmony/src/modules/monitoring/monitoring_alerting.rs @@ -116,7 +116,7 @@ impl MonitoringAlertingStackInterpret { outcomes.push(outcome); } for result in outcomes { - result?; + result?; } Ok(Outcome::success("All alert channels deployed".to_string()))