NationTech/harmony
6
0
Fork 1
Code Issues 35 Pull Requests 6 Actions Packages Projects Releases 1 Wiki Activity

fix: change request from pr
All checks were successful
Run Check Script / check (pull_request) Successful in 1m23s
Details

Browse Source
This commit is contained in:
Willem 2025-06-24 14:50:56 -04:00
parent 55da0cb1ea
commit 61c1d22b55
3 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
harmony/src/domain/topology/oberservability/monitoring.rs
View File

@ -19,9 +19,7 @@ pub struct AlertingInterpret<S: AlertSender> {
} }
#[async_trait] #[async_trait]
impl<S: AlertSender + Installable<T>, T: Topology + HelmCommand> Interpret<T> impl<S: AlertSender + Installable<T>, T: Topology> Interpret<T> for AlertingInterpret<S> {
for AlertingInterpret<S>
{
async fn execute( async fn execute(
&self, &self,
inventory: &Inventory, inventory: &Inventory,

2
harmony/src/modules/monitoring/kube_prometheus/helm/kube_prometheus_helm_chart.rs
View File

@ -198,7 +198,7 @@ prometheus:
let alert_manager_yaml = let alert_manager_yaml =
serde_yaml::to_string(&alert_manager_values).expect("Failed to serialize YAML"); serde_yaml::to_string(&alert_manager_values).expect("Failed to serialize YAML");
debug!("serialed alert manager: \n {:#}", alert_manager_yaml); debug!("serialized alert manager: \n {:#}", alert_manager_yaml);
values.push_str(&alert_manager_yaml); values.push_str(&alert_manager_yaml);
debug!("full values.yaml: \n {:#}", values); debug!("full values.yaml: \n {:#}", values);
HelmChartScore { HelmChartScore {

25
harmony/src/modules/monitoring/kube_prometheus/prometheus.rs
View File

@ -41,26 +41,6 @@ impl<T: Topology + HelmCommand> Installable<T> for Prometheus {
} }
} }
// //before we talked about having a trait installable and a trait installer for the topology
// // i feel like that might still be necessary to meet the requirement of inventory and topology on
// // the score.create_interpret().execute(inventory, topology) method
// #[async_trait]
// pub trait Installer {
// async fn install(&self, inventory: &Inventory, sender: Box<dyn Installable>) -> Result<(), InterpretError>;
// }
//
// #[async_trait]
// impl Installer for K8sAnywhereTopology {
// async fn install(
// &self,
// inventory: &Inventory,
// installable: Box<dyn Installable<T>>,
// ) -> Result<(), InterpretError> {
// installable.ensure_installed(inventory, self).await?;
// Ok(())
// }
// }
#[derive(Debug)] #[derive(Debug)]
pub struct Prometheus { pub struct Prometheus {
pub config: Arc<Mutex<KubePrometheusConfig>>, pub config: Arc<Mutex<KubePrometheusConfig>>,
@ -103,9 +83,4 @@ impl Prometheus {
pub trait PrometheusReceiver: Send + Sync + std::fmt::Debug { pub trait PrometheusReceiver: Send + Sync + std::fmt::Debug {
fn name(&self) -> String; fn name(&self) -> String;
async fn configure_receiver(&self) -> AlertManagerChannelConfig; async fn configure_receiver(&self) -> AlertManagerChannelConfig;
//this probably needs to be a type
//that
//represents
//a
//promtheusreceiver
} }