From 4b6bebcaf124752944c5196b358f75d0024ad027 Mon Sep 17 00:00:00 2001 From: Ian Letourneau Date: Fri, 1 Aug 2025 18:26:05 -0400 Subject: [PATCH] remove unnecessary configure_receivers method from trait --- harmony/src/domain/topology/k8s_anywhere.rs | 24 +++++++++---------- .../k8s_prometheus_alerting_score.rs | 4 ++-- harmony/src/modules/prometheus/prometheus.rs | 5 ---- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/harmony/src/domain/topology/k8s_anywhere.rs b/harmony/src/domain/topology/k8s_anywhere.rs index 09e3cb8..546ca78 100644 --- a/harmony/src/domain/topology/k8s_anywhere.rs +++ b/harmony/src/domain/topology/k8s_anywhere.rs @@ -72,17 +72,6 @@ impl K8sclient for K8sAnywhereTopology { #[async_trait] impl PrometheusApplicationMonitoring for K8sAnywhereTopology { - async fn configure_receivers( - &self, - receivers: Option>>>, - ) -> Option>> { - let Some(receivers) = receivers else { - return None; - }; - - todo!() - } - async fn install_prometheus( &self, sender: &CRDPrometheus, @@ -141,7 +130,7 @@ impl K8sAnywhereTopology { receivers: self .configure_receivers(receivers) .await - .unwrap_or_else(|| vec![]), + .unwrap_or_else(Vec::new), service_monitors: vec![], prometheus_rules: vec![], } @@ -319,6 +308,17 @@ impl K8sAnywhereTopology { "prometheus operator present in cluster".to_string(), )) } + + async fn configure_receivers( + &self, + receivers: Option>>>, + ) -> Option>> { + let Some(receivers) = receivers else { + return None; + }; + + todo!() + } } #[derive(Clone, Debug)] diff --git a/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs b/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs index 7de852e..47ab123 100644 --- a/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs +++ b/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs @@ -564,7 +564,7 @@ impl K8sPrometheusCRDAlertingInterpret { ) -> Result { for receiver in receivers.iter() { let alertmanager_config: AlertmanagerConfig = receiver - .configure_receiver(&client, self.sender.namespace.clone().clone()) + .configure_receiver(client, self.sender.namespace.clone()) .await; let sender = CRDPrometheus { alertmanager_configs: alertmanager_config, @@ -575,6 +575,6 @@ impl K8sPrometheusCRDAlertingInterpret { InterpretError::new(format!("failed to install receiver: {}", err)) })?; } - Ok(Outcome::success(format!("successfully deployed receivers"))) + Ok(Outcome::success("successfully deployed receivers".into())) } } diff --git a/harmony/src/modules/prometheus/prometheus.rs b/harmony/src/modules/prometheus/prometheus.rs index 8d0f295..865b9ca 100644 --- a/harmony/src/modules/prometheus/prometheus.rs +++ b/harmony/src/modules/prometheus/prometheus.rs @@ -3,16 +3,11 @@ use async_trait::async_trait; use crate::{ interpret::{InterpretError, Outcome}, inventory::Inventory, - modules::monitoring::kube_prometheus::crd::crd_alertmanager_config::CRDAlertManagerReceiver, topology::oberservability::monitoring::{AlertReceiver, AlertSender}, }; #[async_trait] pub trait PrometheusApplicationMonitoring { - async fn configure_receivers( - &self, - receivers: Option>>>, - ) -> Option>>; async fn install_prometheus( &self, sender: &S,