Add ServiceMonitor for scraping gitops-controller in rancher-monitori…

…ng chart (#4101) Co-authored-by: Patrick Seidensal <pseidensal@suse.com>
rancher · Jun 25, 2024 · bc88dd8 · bc88dd8
1 parent 58a1f1f
commit bc88dd8
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 2 deletions.
diff --git a/assets/rancher-monitoring/rancher-monitoring-104.0.0-rc1+up45.31.1.tgz b/assets/rancher-monitoring/rancher-monitoring-104.0.0-rc1+up45.31.1.tgz
diff --git a/...ng/104.0.0-rc1+up45.31.1/templates/rancher-monitoring/exporters/fleet/servicemonitor.yaml b/...ng/104.0.0-rc1+up45.31.1/templates/rancher-monitoring/exporters/fleet/servicemonitor.yaml
@@ -24,3 +24,30 @@ spec:
     matchLabels:
       app: fleet-controller
 {{- end }}
+---
+{{- if .Values.rancherMonitoring.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }}
+  name: monitoring-gitops-controller
+  namespace: cattle-fleet-system
+spec:
+  endpoints:
+  - port: metrics
+    metricRelabelings:
+    {{ if .Values.global.cattle.clusterId }}
+      - sourceLabels: [__address__]
+        targetLabel: cluster_id
+        replacement: {{ .Values.global.cattle.clusterId }}
+    {{- end }}
+    {{ if .Values.global.cattle.clusterName}}
+      - sourceLabels: [__address__]
+        targetLabel: cluster_name
+        replacement: {{ .Values.global.cattle.clusterName }}
+    {{- end }}
+  jobLabel: gitops
+  selector:
+    matchLabels:
+      app: gitjob
+{{- end }}
diff --git a/index.yaml b/index.yaml
@@ -16369,7 +16369,7 @@ entries:
       catalog.cattle.io/upstream-version: 45.31.1
     apiVersion: v2
     appVersion: v0.65.1
-    created: "2024-06-21T10:33:45.247640617+02:00"
+    created: "2024-06-21T16:08:14.887388097+02:00"
     dependencies:
     - condition: grafana.enabled
       name: grafana
@@ -16463,7 +16463,7 @@ entries:
       and Prometheus rules combined with documentation and scripts to provide easy
       to operate end-to-end Kubernetes cluster monitoring with Prometheus using the
       Prometheus Operator.
-    digest: c8647120ec147163717b16a83c4276bb8e3b81656e3067f25ef70e8b9b0fffd5
+    digest: b1c66287a0c5c15bc5212c897dfd28e354c6ca00d311c2fca639b7c8406ec6ef
     home: https://github.com/prometheus-operator/kube-prometheus
     icon: file://assets/logos/rancher-monitoring.png
     keywords:

diff --git a/...enerated-changes/overlay/templates/rancher-monitoring/exporters/fleet/servicemonitor.yaml b/...enerated-changes/overlay/templates/rancher-monitoring/exporters/fleet/servicemonitor.yaml
@@ -24,3 +24,30 @@ spec:
     matchLabels:
       app: fleet-controller
 {{- end }}
+---
+{{- if .Values.rancherMonitoring.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }}
+  name: monitoring-gitops-controller
+  namespace: cattle-fleet-system
+spec:
+  endpoints:
+  - port: metrics
+    metricRelabelings:
+    {{ if .Values.global.cattle.clusterId }}
+      - sourceLabels: [__address__]
+        targetLabel: cluster_id
+        replacement: {{ .Values.global.cattle.clusterId }}
+    {{- end }}
+    {{ if .Values.global.cattle.clusterName}}
+      - sourceLabels: [__address__]
+        targetLabel: cluster_name
+        replacement: {{ .Values.global.cattle.clusterName }}
+    {{- end }}
+  jobLabel: gitops
+  selector:
+    matchLabels:
+      app: gitjob
+{{- end }}