update chart

clusters/cl01tl/helm/s3-exporter/Chart.yaml

@@ -19,4 +19,5 @@ dependencies:
     alias: s3-exporter
     repository: https://bjw-s-labs.github.io/helm-charts/
     version: 4.5.0
+# renovate: github=molu8bits/s3bucket_exporter
 appVersion: 1.0.2

clusters/cl01tl/helm/s3-exporter/templates/service-monitor.yaml

@@ -1,86 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: s3-exporter-digital-ocean
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: s3-exporter-digital-ocean
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: s3-exporter
-      app.kubernetes.io/instance: s3-exporter
-      app.kubernetes.io/service: s3-exporter-digital-ocean
-  endpoints:
-    - port: metrics
-      interval: 5m
-      scrapeTimeout: 120s
-      path: /metrics
-
----
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: s3-exporter-ceph-directus
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: s3-exporter-ceph-directus
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: s3-exporter
-      app.kubernetes.io/instance: s3-exporter
-      app.kubernetes.io/service: s3-exporter-ceph-directus
-  endpoints:
-    - port: metrics
-      interval: 5m
-      scrapeTimeout: 120s
-      path: /metrics
-
----
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: s3-exporter-garage-local
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: s3-exporter-garage-local
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: s3-exporter
-      app.kubernetes.io/instance: s3-exporter
-      app.kubernetes.io/service: s3-exporter-garage-local
-  endpoints:
-    - port: metrics
-      interval: 5m
-      scrapeTimeout: 120s
-      path: /metrics
-
----
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: s3-exporter-garage-remote
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: s3-exporter-garage-remote
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: s3-exporter
-      app.kubernetes.io/instance: s3-exporter
-      app.kubernetes.io/service: s3-exporter-garage-remote
-  endpoints:
-    - port: metrics
-      interval: 5m
-      scrapeTimeout: 5m
-      path: /metrics

clusters/cl01tl/helm/s3-exporter/values.yaml

@@ -179,3 +179,48 @@ s3-exporter:
           port: 9655
           targetPort: 9655
           protocol: TCP
+  serviceMonitor:
+    digital-ocean:
+      selector:
+        matchLabels:
+          app.kubernetes.io/name: s3-exporter-digital-ocean
+          app.kubernetes.io/instance: s3-exporter-digital-ocean
+      serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+      endpoints:
+        - port: metrics
+          interval: 5m
+          scrapeTimeout: 120s
+          path: /metrics
+    ceph-directus:
+      selector:
+        matchLabels:
+          app.kubernetes.io/name: s3-exporter-ceph-directus
+          app.kubernetes.io/instance: s3-exporter-ceph-directus
+      serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+      endpoints:
+        - port: metrics
+          interval: 5m
+          scrapeTimeout: 120s
+          path: /metrics
+    garage-local:
+      selector:
+        matchLabels:
+          app.kubernetes.io/name: s3-exporter-garage-local
+          app.kubernetes.io/instance: s3-exporter-garage-local
+      serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+      endpoints:
+        - port: metrics
+          interval: 5m
+          scrapeTimeout: 120s
+          path: /metrics
+    garage-remote:
+      selector:
+        matchLabels:
+          app.kubernetes.io/name: s3-exporter-garage-remote
+          app.kubernetes.io/instance: s3-exporter-garage-remote
+      serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+      endpoints:
+        - port: metrics
+          interval: 5m
+          scrapeTimeout: 120s
+          path: /metrics