chore: update storage-calcluator and add metrics monitor

charts/lagoon-remote/Chart.yaml

@@ -40,5 +40,9 @@ dependencies:
 # Valid supported kinds are added, changed, deprecated, removed, fixed and security
 annotations:
   artifacthub.io/changes: |
+    - kind: changed
+      description: update storage-calculator to v0.5.1
+    - kind: changed
+      description: added metrics to storage-calculator
     - kind: removed
       description: removed dioscuri subchart, activestandby is handled via a Lagoon task directly now

charts/lagoon-remote/ci/linter-values.yaml

@@ -98,3 +98,5 @@ sshPortal:
 
 storageCalculator:
   enabled: true
+  serviceMonitor:
+    enabled: false

charts/lagoon-remote/templates/storage-calculator.deployment.yaml

@@ -35,10 +35,14 @@ spec:
         command:
         - /manager
         args:
-        - "--metrics-bind-address=127.0.0.1:8080"
+        - "--metrics-bind-address=0.0.0.0:8080"
+        - "--prometheus-metrics=true"
         {{- with .Values.storageCalculator.extraArgs }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        ports:
+        - name: metrics
+          containerPort: 8080
         env:
         {{- range $name, $value := .Values.storageCalculator.extraEnvs }}
         - name: {{ .name }}

charts/lagoon-remote/templates/storage-calculator.service.yaml

@@ -0,0 +1,17 @@
+{{- if .Values.storageCalculator.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "lagoon-remote.storageCalculator.fullname" . }}-metrics
+  labels:
+    metrics-only: "true"
+    {{- include "lagoon-remote.storageCalculator.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.storageCalculator.metricsService.type }}
+  ports:
+  - port: {{ .Values.storageCalculator.metricsService.ports.metrics }}
+    targetPort: metrics
+    name: metrics
+  selector:
+    {{- include "lagoon-remote.storageCalculator.selectorLabels" . | nindent 4 }}
+{{- end }}

charts/lagoon-remote/templates/storage-calculator.servicemonitor.yaml

@@ -0,0 +1,18 @@
+{{- if and .Values.storageCalculator.enabled .Values.storageCalculator.serviceMonitor.enabled -}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "lagoon-remote.storageCalculator.fullname" . }}
+  labels:
+    {{- include "lagoon-remote.storageCalculator.labels" . | nindent 4 }}
+spec:
+  endpoints:
+  - port: metrics
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      metrics-only: "true"
+      {{- include "lagoon-remote.storageCalculator.selectorLabels" . | nindent 6 }}
+{{- end }}

charts/lagoon-remote/values.yaml

@@ -357,8 +357,16 @@ storageCalculator:
     # template
     name:
 
+  metricsService:
+    type: ClusterIP
+    ports:
+      metrics: 9912
+
+  serviceMonitor:
+    enabled: true
+
   image:
     repository: uselagoon/remote-calculator
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: v0.2.3
+    tag: v0.5.1