Merge pull request #33 from intergral/cluster_label

fix(monitoring): fix issue with cluster label
intergral · Oct 10, 2023 · 77705c8 · 77705c8
2 parents 1785839 + 0fbe93d
commit 77705c8
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 5 deletions.
diff --git a/charts/deep-distributed/Chart.yaml b/charts/deep-distributed/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.18
+version: 0.0.19
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/deep-distributed/templates/lib/service-monitor.yaml b/charts/deep-distributed/templates/lib/service-monitor.yaml
@@ -52,7 +52,7 @@ spec:
           targetLabel: job
         {{- if kindIs "string" .clusterLabel }}
         - replacement: "{{ include "deep.clusterName" $.ctx}}"
-          targetLabel: cluster
+          targetLabel: "{{ .clusterLabel }}"
         {{- end }}
         {{- with .relabelings }}
         {{- toYaml . | nindent 8 }}

diff --git a/charts/deep/Chart.yaml b/charts/deep/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.7
+version: 1.0.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/deep/templates/serviceMonitor.yaml b/charts/deep/templates/serviceMonitor.yaml
@@ -43,8 +43,8 @@ spec:
           replacement: "{{ include "deep.fullname" $ }}"
           targetLabel: job
         {{- if kindIs "string" .clusterLabel }}
-        - replacement: "{{ include "deep.clusterName" $.ctx}}"
-          targetLabel: cluster
+        - replacement: "{{ include "deep.clusterName" $ }}"
+          targetLabel: "{{ .clusterLabel }}"
         {{- end }}
         {{- with .relabelings }}
         {{- toYaml . | nindent 8 }}

diff --git a/charts/deep/unittests/serviceMonitor_test.yaml b/charts/deep/unittests/serviceMonitor_test.yaml
@@ -0,0 +1,46 @@
+suite: test service monitor
+chart:
+  version: 9.9.9+test
+  appVersion: 1.1.1+test
+release:
+  name: deep
+set:
+  monitoring:
+    enabled: true
+    serviceMonitor:
+      namespace: monitoring
+      labels:
+        release: prometheus
+tests:
+  - it: should create correct servicemonitor
+    template: serviceMonitor.yaml
+    asserts:
+      - isKind:
+          of: ServiceMonitor
+      - matchRegex:
+          path: metadata.name
+          pattern: deep
+  - it: should have cluster label
+    template: serviceMonitor.yaml
+    asserts:
+      - equal:
+          path: spec.endpoints[0].relabelings[1].replacement
+          value: deep
+      - equal:
+          path: spec.endpoints[0].relabelings[1].targetLabel
+          value: cluster
+  - it: cluster label should use config
+    set:
+      config:
+        clusterName: "fromconfig"
+      monitoring:
+        serviceMonitor:
+          clusterLabel: "labelfromconfig"
+    template: serviceMonitor.yaml
+    asserts:
+      - equal:
+          path: spec.endpoints[0].relabelings[1].replacement
+          value: fromconfig
+      - equal:
+          path: spec.endpoints[0].relabelings[1].targetLabel
+          value: labelfromconfig