Update ghcr.io/moghtech/komodo-core Docker tag to v1.18.4

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

@@ -9,8 +9,8 @@ keywords:
   - metrics
 home: https://wiki.alexlebens.dev/s/
 sources:
-  - https://github.com/ribbybibby/s3_exporter
+  - https://github.com/molu8bits/s3bucket_exporter
-  - https://hub.docker.com/r/ribbybibby/s3-exporter
+  - https://hub.docker.com/r/molu8bits/s3bucket_exporter
   - https://github.com/bjw-s/helm-charts/blob/main/charts/other/app-template
 maintainers:
   - name: alexlebens
@@ -19,4 +19,4 @@ dependencies:
     alias: s3-exporter
     repository: https://bjw-s-labs.github.io/helm-charts/
     version: 4.1.2
-appVersion: v0.5.0
+appVersion: 1.0.2

clusters/cl01tl/monitoring/s3-exporter/templates/scrape-config.yaml

@@ -1,16 +0,0 @@
-apiVersion: monitoring.coreos.com/v1alpha1
-kind: ScrapeConfig
-metadata:
-  name: s3-do-home-infra
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: s3-do-home-infra
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  metricsPath: /probe
-  scrapeInterval: 120s
-  scrapeTimeout: 120s
-  httpSDConfigs:
-    - url: http://s3-exporter.s3-exporter:9340/discovery
-      refreshInterval: 15s

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

@@ -0,0 +1,21 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: s3-exporter
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: s3-exporter
+    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: {{ .Release.Name }}
+    matchExpressions:
+      - { key: app.kubernetes.io/controller, operator: In, values: [digital-ocean] }
+  endpoints:
+    - port: metrics
+      interval: 120s
+      scrapeTimeout: 30s
+      path: /metrics

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

@@ -1,6 +1,6 @@
 s3-exporter:
   controllers:
-    main:
+    digital-ocean:
       type: deployment
       replicas: 1
       strategy: Recreate
@@ -8,30 +8,42 @@ s3-exporter:
       containers:
         main:
           image:
-            repository: ribbybibby/s3-exporter
+            repository: molu8bits/s3bucket_exporter
-            tag: v0.5.0
+            tag: 1.0.2
             pullPolicy: IfNotPresent
           env:
-            - name: S3_EXPORTER_WEB_LISTEN_ADDRESS
+            - name: S3_NAME
-              value: :9340
+              value: digital-ocean
-            - name: S3_EXPORTER_S3_ENDPOINT_URL
+            - name: S3_ENDPOINT
-              value: https://postgres-backups-ce540ddf106d186bbddca68a.nyc3.digitaloceanspaces.com
+              value: https://nyc3.digitaloceanspaces.com
-            - name: S3_EXPORTER_S3_FORCE_PATH_STYLE
+            - name: S3_ACCESS_KEY
-              value: false
+              valueFrom:
-            - name: S3_EXPORTER_LOG_LEVEL
+                secretKeyRef:
+                  name: s3-do-home-infra-secret
+                  key: AWS_ACCESS_KEY_ID
+            - name: S3_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: s3-do-home-infra-secret
+                  key: AWS_SECRET_ACCESS_KEY
+            - name: S3_REGION
+              valueFrom:
+                secretKeyRef:
+                  name: s3-do-home-infra-secret
+                  key: AWS_REGION
+            - name: LOG_LEVEL
               value: debug
-          envFrom:
+            - name: S3_FORCE_PATH_STYLE
-            - secretRef:
+              value: false
-                name: s3-do-home-infra-secret
           resources:
             requests:
               cpu: 10m
               memory: 64Mi
   service:
-    main:
+    digital-ocean:
-      controller: main
+      controller: digital-ocean
       ports:
         metrics:
-          port: 9340
+          port: 9655
-          targetPort: 9340
+          targetPort: 9655
           protocol: TCP