diff --git a/resources/index.json b/resources/index.json index f9f20e9d..73f1389f 100644 --- a/resources/index.json +++ b/resources/index.json @@ -4,10 +4,9 @@ "prometheus": { "pod_monitors": [ "prometheus/pod_monitors/prometheus-self-metrics.yaml", - "prometheus/pod_monitors/rhacs-central-metrics.yaml", "prometheus/pod_monitors/rhacs-cloudwatch-exporter.yaml", "prometheus/pod_monitors/rhacs-fleetshard-sync-metrics.yaml", - "prometheus/pod_monitors/rhacs-scanner-metrics.yaml" + "prometheus/pod_monitors/rhacs-tenant-metrics.yaml" ], "rules": [ "prometheus/billing-rules.yaml", diff --git a/resources/prometheus/pod_monitors/rhacs-scanner-metrics.yaml b/resources/prometheus/pod_monitors/rhacs-scanner-metrics.yaml deleted file mode 100644 index 8dcb01e9..00000000 --- a/resources/prometheus/pod_monitors/rhacs-scanner-metrics.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: rhacs-scanner-metrics - labels: - app: rhacs -spec: - selector: - matchLabels: - app: "scanner" - namespaceSelector: - any: true - podMetricsEndpoints: - - path: /metrics - port: monitoring - relabelings: - - action: labeldrop - regex: endpoint - - - sourceLabels: [container] - targetLabel: job - - - action: labelmap - regex: __meta_kubernetes_pod_annotation_rhacs_redhat_com_(.+) - replacement: rhacs_${1} - - - action: labelmap - regex: __meta_kubernetes_pod_label_rhacs_redhat_com_(.+) - replacement: rhacs_${1} - - - sourceLabels: [rhacs_tenant] - targetLabel: rhacs_instance_id - - - action: labeldrop - regex: rhacs_tenant - - - sourceLabels: [__meta_kubernetes_pod_label_app_kubernetes_io_version] - targetLabel: rhacs_version diff --git a/resources/prometheus/pod_monitors/rhacs-central-metrics.yaml b/resources/prometheus/pod_monitors/rhacs-tenant-metrics.yaml similarity index 92% rename from resources/prometheus/pod_monitors/rhacs-central-metrics.yaml rename to resources/prometheus/pod_monitors/rhacs-tenant-metrics.yaml index 9d198015..a84287a0 100644 --- a/resources/prometheus/pod_monitors/rhacs-central-metrics.yaml +++ b/resources/prometheus/pod_monitors/rhacs-tenant-metrics.yaml @@ -1,13 +1,13 @@ apiVersion: monitoring.coreos.com/v1 kind: PodMonitor metadata: - name: rhacs-central-metrics + name: rhacs-tenant-metrics labels: app: rhacs spec: selector: matchLabels: - app: "central" + app.kubernetes.io/name: stackrox namespaceSelector: any: true podMetricsEndpoints: