diff --git a/harmony/src/domain/topology/k8s_anywhere.rs b/harmony/src/domain/topology/k8s_anywhere.rs index 5df2bc8..4c92b0c 100644 --- a/harmony/src/domain/topology/k8s_anywhere.rs +++ b/harmony/src/domain/topology/k8s_anywhere.rs @@ -15,9 +15,12 @@ use crate::{ }; use super::{ - k8s::K8sClient, oberservability::notification_adapter_deployer::NotificationAdapterDeployer, tenant::{ - k8s::K8sTenantManager, ResourceLimits, TenantConfig, TenantManager, TenantNetworkPolicy - }, HelmCommand, K8sclient, Topology + HelmCommand, K8sclient, Topology, + k8s::K8sClient, + oberservability::notification_adapter_deployer::NotificationAdapterDeployer, + tenant::{ + ResourceLimits, TenantConfig, TenantManager, TenantNetworkPolicy, k8s::K8sTenantManager, + }, }; struct K8sState { diff --git a/harmony/src/domain/topology/mod.rs b/harmony/src/domain/topology/mod.rs index 2dcd501..faa7fee 100644 --- a/harmony/src/domain/topology/mod.rs +++ b/harmony/src/domain/topology/mod.rs @@ -3,8 +3,8 @@ mod host_binding; mod http; mod k8s_anywhere; mod localhost; -pub mod tenant; pub mod oberservability; +pub mod tenant; pub use k8s_anywhere::*; pub use localhost::*; pub mod k8s; diff --git a/harmony/src/domain/topology/oberservability/mod.rs b/harmony/src/domain/topology/oberservability/mod.rs index 6ab1b2c..aa75d09 100644 --- a/harmony/src/domain/topology/oberservability/mod.rs +++ b/harmony/src/domain/topology/oberservability/mod.rs @@ -11,6 +11,3 @@ pub struct MonitorConfig { pub backend: MonitoringBackendType, pub alert_channels: Vec>, } - - - diff --git a/harmony/src/domain/topology/oberservability/monitoring.rs b/harmony/src/domain/topology/oberservability/monitoring.rs index 8ad88f6..9e38358 100644 --- a/harmony/src/domain/topology/oberservability/monitoring.rs +++ b/harmony/src/domain/topology/oberservability/monitoring.rs @@ -1,15 +1,12 @@ use async_trait::async_trait; -use std::fmt::Debug; use dyn_clone::DynClone; use serde_json::Value; +use std::fmt::Debug; use crate::interpret::InterpretError; -use crate::{ - interpret::Outcome, - topology::Topology, -}; +use crate::{interpret::Outcome, topology::Topology}; use super::notification_adapter_deployer::NotificationAdapterDeployer; use super::{MonitorConfig, MonitoringBackendType}; @@ -43,18 +40,23 @@ pub trait Monitor { if let Some(notification_adapter_id) = channel.requires_external_alert_channel_adapter(&monitor_config.backend) { - topology.deploy_notification_adapter( - ¬ification_adapter_id.as_ref(), - )?; + topology.deploy_notification_adapter(¬ification_adapter_id.as_ref())?; } - } - Ok(Outcome::success(format!("deployed alert channels {:?}", &monitor_config.alert_channels))) + Ok(Outcome::success(format!( + "deployed alert channels {:?}", + &monitor_config.alert_channels + ))) } } pub trait AlertChannelConfig: Debug + DynClone + Send + Sync { - fn build_backend_integration_config(&self, backend: &MonitoringBackendType) -> Result; - fn requires_external_alert_channel_adapter(&self, backend: &MonitoringBackendType) -> Option; + fn build_backend_integration_config( + &self, + backend: &MonitoringBackendType, + ) -> Result; + fn requires_external_alert_channel_adapter( + &self, + backend: &MonitoringBackendType, + ) -> Option; } -