diff --git a/kubernetes/main/apps/observability/exporters/blackbox-exporter/app/helmrelease.yaml b/kubernetes/main/apps/observability/exporters/blackbox-exporter/app/helmrelease.yaml index 29fae8df8d..113286adff 100644 --- a/kubernetes/main/apps/observability/exporters/blackbox-exporter/app/helmrelease.yaml +++ b/kubernetes/main/apps/observability/exporters/blackbox-exporter/app/helmrelease.yaml @@ -84,6 +84,9 @@ spec: release: prometheus interval: 30s scrapeTimeout: 30s + additionalRelabeling: + - action: labeldrop + regex: (pod) targets: - module: icmp name: unifi-dream-machine diff --git a/kubernetes/main/apps/observability/exporters/smartctl-exporter/app/helmrelease.yaml b/kubernetes/main/apps/observability/exporters/smartctl-exporter/app/helmrelease.yaml index 260351f342..0fa856fe85 100644 --- a/kubernetes/main/apps/observability/exporters/smartctl-exporter/app/helmrelease.yaml +++ b/kubernetes/main/apps/observability/exporters/smartctl-exporter/app/helmrelease.yaml @@ -34,6 +34,9 @@ spec: - /dev/nvme0n1 serviceMonitor: enabled: true + relabelings: + - action: labeldrop + regex: (pod) prometheusRules: enabled: false tolerations: {} diff --git a/kubernetes/main/apps/observability/gatus/app/helmrelease.yaml b/kubernetes/main/apps/observability/gatus/app/helmrelease.yaml index 555a3d07c0..a52270eac9 100644 --- a/kubernetes/main/apps/observability/gatus/app/helmrelease.yaml +++ b/kubernetes/main/apps/observability/gatus/app/helmrelease.yaml @@ -112,6 +112,12 @@ spec: path: /metrics interval: 1m scrapeTimeout: 10s + metricRelabelings: + - action: labeldrop + regex: (pod) + - action: replace + sourceLabels: ["service"] + targetLabel: instance ingress: app: className: external diff --git a/kubernetes/main/apps/observability/grafana/app/helmrelease.yaml b/kubernetes/main/apps/observability/grafana/app/helmrelease.yaml index 336cd0ad61..80a884af19 100644 --- a/kubernetes/main/apps/observability/grafana/app/helmrelease.yaml +++ b/kubernetes/main/apps/observability/grafana/app/helmrelease.yaml @@ -394,6 +394,9 @@ spec: - vonage-status-panel serviceMonitor: enabled: true + metricRelabelings: + - action: labeldrop + regex: (pod) ingress: enabled: true ingressClassName: external diff --git a/kubernetes/pi/apps/observability/smartctl-exporter/app/helmrelease.yaml b/kubernetes/pi/apps/observability/smartctl-exporter/app/helmrelease.yaml index c53935497b..c7086482d3 100644 --- a/kubernetes/pi/apps/observability/smartctl-exporter/app/helmrelease.yaml +++ b/kubernetes/pi/apps/observability/smartctl-exporter/app/helmrelease.yaml @@ -33,6 +33,9 @@ spec: - /dev/sda serviceMonitor: enabled: true + relabelings: + - action: labeldrop + regex: (pod) prometheusRules: enabled: false tolerations: {}