Fix prometheus labels

hoprnet · Mar 13, 2024 · 67507d6 · 67507d6
1 parent d4a64e1
commit 67507d6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hoprd_operator"
-version = "0.2.8"
+version = "0.2.9"
 authors = ["HOPR Association <[email protected]>"]
 edition = "2021"
 

diff --git a/src/identity_pool/identity_pool_service_monitor.rs b/src/identity_pool/identity_pool_service_monitor.rs
@@ -93,27 +93,7 @@ pub fn build_metric_relabel() -> Vec<ServiceMonitorEndpointsRelabelings> {
     }, ServiceMonitorEndpointsRelabelings {
         action: Some(ServiceMonitorEndpointsRelabelingsAction::Replace),
         source_labels: Some(vec![
-            "__meta_kubernetes_pod_label_app_kubernetes_io_instance".to_owned(),
-        ]),
-        target_label: Some("node_name".to_owned()),
-        modulus: None,
-        regex: None,
-        replacement: None,
-        separator: None,
-    }, ServiceMonitorEndpointsRelabelings {
-        action: Some(ServiceMonitorEndpointsRelabelingsAction::Replace),
-        source_labels: Some(vec![
-            "__meta_kubernetes_pod_label_app_kubernetes_io_instance".to_owned(),
-        ]),
-        target_label: Some("nodename".to_owned()),
-        modulus: None,
-        regex: None,
-        replacement: None,
-        separator: None,
-    }, ServiceMonitorEndpointsRelabelings {
-        action: Some(ServiceMonitorEndpointsRelabelingsAction::Replace),
-        source_labels: Some(vec![
-            "__meta_kubernetes_pod_label_hoprds_hoprnet_org_safe_address".to_owned(),
+            "__meta_kubernetes_pod_label_hoprds_hoprnet_org_safeAddress".to_owned(),
         ]),
         target_label: Some("hoprd_safe_address".to_owned()),
         modulus: None,
@@ -123,17 +103,7 @@ pub fn build_metric_relabel() -> Vec<ServiceMonitorEndpointsRelabelings> {
     }, ServiceMonitorEndpointsRelabelings {
         action: Some(ServiceMonitorEndpointsRelabelingsAction::Replace),
         source_labels: Some(vec![
-            "__meta_kubernetes_pod_label_hoprds_hoprnet_org_module_address".to_owned(),
-        ]),
-        target_label: Some("hoprd_module_address".to_owned()),
-        modulus: None,
-        regex: None,
-        replacement: None,
-        separator: None,
-    }, ServiceMonitorEndpointsRelabelings {
-        action: Some(ServiceMonitorEndpointsRelabelingsAction::Replace),
-        source_labels: Some(vec![
-            "__meta_kubernetes_pod_label_hoprds_hoprnet_org_address".to_owned(),
+            "__meta_kubernetes_pod_label_hoprds_hoprnet_org_native_address".to_owned(),
         ]),
         target_label: Some("hoprd_address".to_owned()),
         modulus: None,