diff --git a/Cargo.lock b/Cargo.lock index 5c51647..3a47a6d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1161,7 +1161,6 @@ dependencies = [ "harmony", "harmony_cli", "harmony_macros", - "serde_yaml", "tokio", "url", ] diff --git a/examples/monitoring/Cargo.toml b/examples/monitoring/Cargo.toml index 1f27939..1c35330 100644 --- a/examples/monitoring/Cargo.toml +++ b/examples/monitoring/Cargo.toml @@ -9,6 +9,5 @@ license.workspace = true 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" } -serde_yaml.workspace = true tokio.workspace = true url.workspace = true diff --git a/examples/monitoring/src/main.rs b/examples/monitoring/src/main.rs index bb48ccf..59e9f6b 100644 --- a/examples/monitoring/src/main.rs +++ b/examples/monitoring/src/main.rs @@ -1,3 +1,5 @@ +use std::collections::HashMap; + use harmony::{ inventory::Inventory, maestro::Maestro, @@ -56,15 +58,14 @@ async fn main() { relabelings: vec![], }; - let mut selector = Mapping::new(); + let mut selector = HashMap::new(); selector.insert( - Value::from("matchExpressions"), - serde_yaml::to_value(vec![Selector { + "matchExpressions".to_string(), + vec![Selector { key: "monitored".to_string(), operator: "In".to_string(), values: vec!["test-service-1".to_string()], - }]) - .expect("couldn't create mapping value"), + }], ); let service_monitor = ServiceMonitor { diff --git a/harmony/src/modules/monitoring/kube_prometheus/types.rs b/harmony/src/modules/monitoring/kube_prometheus/types.rs index 60c8168..59d6ebc 100644 --- a/harmony/src/modules/monitoring/kube_prometheus/types.rs +++ b/harmony/src/modules/monitoring/kube_prometheus/types.rs @@ -178,7 +178,7 @@ pub struct ServiceMonitor { // values: // - example-service-1 // - example-service-2 - pub selector: Mapping, + pub selector: HashMap>, // # label selector for services pub match_labels: Option,