Cargo.lock

@@ -1160,6 +1160,7 @@ version = "0.1.0"
 dependencies = [
  "harmony",
  "harmony_cli",
+ "harmony_macros",
  "tokio",
  "url",
 ]

examples/monitoring/Cargo.toml

@@ -8,5 +8,6 @@ license.workspace = true
 [dependencies]
 harmony = { version = "0.1.0", path = "../../harmony" }
 harmony_cli = { version = "0.1.0", path = "../../harmony_cli" }
+harmony_macros = { version = "0.1.0", path = "../../harmony_macros" }
 tokio.workspace = true
 url.workspace = true

examples/monitoring/src/main.rs

@@ -18,6 +18,8 @@ use harmony::{
     topology::{K8sAnywhereTopology, Url},
 };
 
+use harmony_macros::http_scheme;
+
 #[tokio::main]
 async fn main() {
     let discord_receiver = DiscordWebhook {
@@ -41,9 +43,34 @@ async fn main() {
         ],
     );
 
+    let service_monitor_endpoint = ServiceMonitorEndpoint {
+        port: Some(80),
+        target_port: None,
+        bearer_token_file: None,
+        interval: None,
+        path: "/metrics".to_string(),
+        scheme: http_scheme!("http"),
+        tls_config: None,
+        metric_relabelings: vec![],
+        relabelings: vec![],
+    };
+
+    let service_monitor = ServiceMonitor {
+        name: "test service monitor".to_string(),
+        additional_labels: None,
+        job_label: None,
+        target_labels: vec![],
+        pod_target_labels: vec![],
+        selector: None,
+        match_labels: None,
+        namespace_selector: None,
+        endpoints: vec![service_monitor_endpoint],
+        fallback_scrape_protocol: None,
+    };
     let alerting_score = HelmPrometheusAlertingScore {
         receivers: vec![Box::new(discord_receiver)],
         rules: vec![Box::new(additional_rules), Box::new(additional_rules2)],
+        service_monitors: vec![service_monitor],
     };
     let mut maestro = Maestro::<K8sAnywhereTopology>::initialize(
         Inventory::autoload(),

harmony/src/modules/monitoring/kube_prometheus/helm/kube_prometheus_helm_chart.rs

@@ -101,12 +101,14 @@ nodeExporter:
   enabled: {node_exporter}
 prometheusOperator:
   enabled: {prometheus_operator}
+
 "#,
     );
+
     let prometheus_config =
         crate::modules::monitoring::kube_prometheus::types::PrometheusConfigValues {
             prometheus: PrometheusConfig {
-                prometheus,
+                prometheus: bool::from_str(prometheus.as_str()).expect("couldn't parse bool"),
                 additional_service_monitors: config.additional_service_monitors.clone(),
             },
         };

harmony/src/modules/monitoring/kube_prometheus/helm_prometheus_alert_score.rs

@@ -4,6 +4,7 @@ use serde::Serialize;
 
 use super::{helm::config::KubePrometheusConfig, prometheus::Prometheus};
 use crate::{
+    modules::monitoring::kube_prometheus::types::ServiceMonitor,
     score::Score,
     topology::{
         HelmCommand, Topology,
@@ -15,14 +16,18 @@ use crate::{
 pub struct HelmPrometheusAlertingScore {
     pub receivers: Vec<Box<dyn AlertReceiver<Prometheus>>>,
     pub rules: Vec<Box<dyn AlertRule<Prometheus>>>,
+    pub service_monitors: Vec<ServiceMonitor>,
 }
 
 impl<T: Topology + HelmCommand> Score<T> for HelmPrometheusAlertingScore {
     fn create_interpret(&self) -> Box<dyn crate::interpret::Interpret<T>> {
+        let config = Arc::new(Mutex::new(KubePrometheusConfig::new()));
+        config
+            .try_lock()
+            .expect("couldn't lock config")
+            .additional_service_monitors = self.service_monitors.clone();
         Box::new(AlertingInterpret {
-            sender: Prometheus {
+            sender: Prometheus { config },
-                config: Arc::new(Mutex::new(KubePrometheusConfig::new())),
-            },
             receivers: self.receivers.clone(),
             rules: self.rules.clone(),
         })

harmony/src/modules/monitoring/kube_prometheus/types.rs

@@ -64,7 +64,7 @@ pub struct PrometheusConfigValues {
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PrometheusConfig {
-    pub prometheus: String,
+    pub prometheus: bool,
     pub additional_service_monitors: Vec<ServiceMonitor>,
 }
 
@@ -73,23 +73,23 @@ pub struct PrometheusConfig {
 pub struct ServiceMonitorTLSConfig {
     // ## Path to the CA file
     // ##
-    pub ca_file: String,
+    pub ca_file: Option<String>,
 
     // ## Path to client certificate file
     // ##
-    pub cert_file: String,
+    pub cert_file: Option<String>,
 
     // ## Skip certificate verification
     // ##
-    pub insecure_skip_verify: bool,
+    pub insecure_skip_verify: Option<bool>,
 
     // ## Path to client key file
     // ##
-    pub key_file: String,
+    pub key_file: Option<String>,
 
     // ## Server name used to verify host name
     // ##
-    pub server_name: String,
+    pub server_name: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize)]
@@ -97,19 +97,19 @@ pub struct ServiceMonitorTLSConfig {
 pub struct ServiceMonitorEndpoint {
     // ## Name of the endpoint's service port
     // ## Mutually exclusive with targetPort
-    pub port: String,
+    pub port: Option<u16>,
 
     // ## Name or number of the endpoint's target port
     // ## Mutually exclusive with port
-    pub target_port: String,
+    pub target_port: Option<u16>,
 
     // ## File containing bearer token to be used when scraping targets
     // ##
-    pub bearer_token_file: String,
+    pub bearer_token_file: Option<String>,
 
     // ## Interval at which metrics should be scraped
     // ##
-    pub interval: String,
+    pub interval: Option<String>,
 
     // ## HTTP path to scrape for metrics
     // ##
@@ -121,7 +121,7 @@ pub struct ServiceMonitorEndpoint {
 
     // ## TLS configuration to use when scraping the endpoint
     // ##
-    pub tls_config: ServiceMonitorTLSConfig,
+    pub tls_config: Option<ServiceMonitorTLSConfig>,
 
     // ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
     // ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#relabelconfig
@@ -149,11 +149,11 @@ pub struct ServiceMonitor {
     pub name: String,
 
     // # Additional labels to set used for the ServiceMonitorSelector. Together with standard labels from the chart
-    pub additional_labels: Mapping,
+    pub additional_labels: Option<Mapping>,
 
     // # Service label for use in assembling a job name of the form <label value>-<port>
     // # If no label is specified, the service name is used.
-    pub job_label: String,
+    pub job_label: Option<String>,
 
     // # labels to transfer from the kubernetes service to the target
     pub target_labels: Vec<String>,
@@ -170,22 +170,22 @@ pub struct ServiceMonitor {
     //       values:
     //         - example-service-1
     //         - example-service-2
-    pub selector: Mapping,
+    pub selector: Option<Mapping>,
 
     //   # label selector for services
-    pub match_labels: Mapping,
+    pub match_labels: Option<Mapping>,
 
     // # Namespaces from which services are selected
     //   # Match any namespace
     //   any: bool,
     //   # Explicit list of namespace names to select
     //   matchNames: Vec,
-    pub namespace_selector: Mapping,
+    pub namespace_selector: Option<Mapping>,
 
     // # Endpoints of the selected service to be monitored
     pub endpoints: Vec<ServiceMonitorEndpoint>,
 
     // # Fallback scrape protocol used by Prometheus for scraping metrics
     // # ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api-reference/api.md#monitoring.coreos.com/v1.ScrapeProtocol
-    pub fallback_scrape_protocol: String,
+    pub fallback_scrape_protocol: Option<String>,
 }