Fix servicemonitor relabeling (#456)

Co-authored-by: Alexey Kubrinsky <akubrinsky@zetaglobal.com>
kedacore · Jun 8, 2023 · fff5493 · fff5493
1 parent 84b6cfb
commit fff5493
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 22 deletions.
diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -64,7 +64,7 @@ jobs:
 
     - name: Helm install
       uses: Azure/setup-helm@v3
-      
+
     - name: Create k8s ${{ matrix.kubernetesVersion }} Kind Cluster
       uses: helm/kind-action@main
       with:
@@ -88,9 +88,9 @@ jobs:
         image:
           keda:
             tag: main
-          metricsApiServer:   
+          metricsApiServer:
             tag: main
-          webhooks:   
+          webhooks:
             tag: main
         podIdentity:
           azureWorkload:
@@ -99,7 +99,7 @@ jobs:
             clientId: ${{ matrix.clientId }}
         podDisruptionBudget:
           operator:
-            maxUnavailable: 1 
+            maxUnavailable: 1
           metricServer:
             maxUnavailable: 1
           webhooks:
@@ -109,10 +109,25 @@ jobs:
             enabled: true
             podMonitor:
               enabled: true
+            serviceMonitor:
+              enabled: true
+              relabelings:
+              - regex: (go_.*)
+                action: drop
           webhooks:
             enabled: true
             serviceMonitor:
               enabled: true
+              relabelings:
+              - regex: (go_.*)
+                action: drop
+          metricServer:
+            enabled: true
+            serviceMonitor:
+              enabled: true
+              relabelings:
+              - regex: (go_.*)
+                action: drop
         webhooks:
           failurePolicy: Fail
         certificates:

diff --git a/keda/README.md b/keda/README.md
@@ -163,7 +163,8 @@ their default values.
 | `prometheus.metricServer.serviceMonitor.targetPort`         | Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port | `` |
 | `prometheus.metricServer.serviceMonitor.interval`         | Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used. | `` |
 | `prometheus.metricServer.serviceMonitor.scrapeTimeout`        | Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used | `` |
-| `prometheus.metricServer.serviceMonitor.relabellings`         | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig) | `[]` |
+| `prometheus.metricServer.serviceMonitor.relabellings`         | DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig) | `[]` |
+| `prometheus.metricServer.serviceMonitor.relabelings`         | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig) | `[]` |
 | `prometheus.metricServer.serviceMonitor.additionalLabels`         | Additional labels to add for metric server using ServiceMonitor crd (prometheus operator) | `{}` |
 | `prometheus.operator.enabled`                              | Enable KEDA Operator prometheus metrics expose | `false` |
 | `prometheus.operator.port`                                 | Port used for exposing KEDA Operator prometheus metrics | `8080` |
@@ -180,7 +181,8 @@ their default values.
 | `prometheus.operator.serviceMonitor.targetPort`         | Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port | `` |
 | `prometheus.operator.serviceMonitor.interval`         | Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used. | `` |
 | `prometheus.operator.serviceMonitor.scrapeTimeout`        | Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used | `` |
-| `prometheus.operator.serviceMonitor.relabellings`         | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig) | `[]` |
+| `prometheus.operator.serviceMonitor.relabellings`         | DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig) | `[]` |
+| `prometheus.operator.serviceMonitor.relabelings`         | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig) | `[]` |
 | `prometheus.operator.serviceMonitor.additionalLabels`         | Additional labels to add for metric server using ServiceMonitor crd (prometheus operator) | `{}` |
 | `prometheus.operator.prometheusRules.enabled`              | Enable monitoring for KEDA Operator using prometheusRules crd (prometheus operator) | `false` |
 | `prometheus.operator.prometheusRules.namespace`            | Scraping namespace for KEDA Operator using prometheusRules crd (prometheus operator) | `` |
@@ -197,7 +199,8 @@ their default values.
 | `prometheus.webhooks.serviceMonitor.targetPort`         | Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port | `` |
 | `prometheus.webhooks.serviceMonitor.interval`         | Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used. | `` |
 | `prometheus.webhooks.serviceMonitor.scrapeTimeout`        | Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used | `` |
-| `prometheus.webhooks.serviceMonitor.relabellings`         | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig) | `[]` |
+| `prometheus.webhooks.serviceMonitor.relabellings`         | DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig) | `[]` |
+| `prometheus.webhooks.serviceMonitor.relabelings`         | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig) | `[]` |
 | `prometheus.webhooks.serviceMonitor.additionalLabels`         | Additional labels to add for metric server using ServiceMonitor crd (prometheus operator) | `{}` |
 | `prometheus.webhooks.prometheusRules.enabled`              | Enable monitoring for KEDA admission webhooks using prometheusRules crd (prometheus operator) | `false` |
 | `prometheus.webhooks.prometheusRules.namespace`            | Scraping namespace for KEDA admission webhooks using prometheusRules crd (prometheus operator) | `` |

diff --git a/keda/templates/manager/servicemonitor.yaml b/keda/templates/manager/servicemonitor.yaml
@@ -20,11 +20,11 @@ spec:
   {{- end }}
   {{- with .Values.prometheus.operator.serviceMonitor.targetLabels }}
   targetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- with .Values.prometheus.operator.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   endpoints:
   - port: {{ .Values.prometheus.operator.serviceMonitor.port }}
@@ -38,10 +38,17 @@ spec:
     {{- with .Values.prometheus.operator.serviceMonitor.scrapeTimeout }}
     scrapeTimeout: {{ . }}
     {{- end }}
-    {{- with .Values.prometheus.operator.serviceMonitor.relabellings }}
+  {{- if .Values.prometheus.metricServer.serviceMonitor.relabelings}}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.relabelings }}
     relabelings:
-    {{ toYaml . | indent 6 }}
+    {{- toYaml . | nindent 6 }}
     {{- end }}
+  {{- else }}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.relabellings }}
+    relabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- end}}
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace }}

diff --git a/keda/templates/metrics-server/servicemonitor.yaml b/keda/templates/metrics-server/servicemonitor.yaml
@@ -20,11 +20,11 @@ spec:
   {{- end }}
   {{- with .Values.prometheus.metricServer.serviceMonitor.targetLabels }}
   targetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- with .Values.prometheus.metricServer.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   endpoints:
   - port: {{ .Values.prometheus.metricServer.portName }}
@@ -38,10 +38,17 @@ spec:
     {{- with .Values.prometheus.metricServer.serviceMonitor.scrapeTimeout }}
     scrapeTimeout: {{ . }}
     {{- end }}
+  {{- if .Values.prometheus.metricServer.serviceMonitor.relabelings}}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.relabelings }}
+    relabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- else }}
     {{- with .Values.prometheus.metricServer.serviceMonitor.relabellings }}
     relabelings:
-    {{ toYaml . | indent 6 }}
+    {{- toYaml . | nindent 6 }}
     {{- end }}
+  {{- end}}
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace }}

diff --git a/keda/templates/webhooks/servicemonitor.yaml b/keda/templates/webhooks/servicemonitor.yaml
@@ -21,11 +21,11 @@ spec:
   {{- end }}
   {{- with .Values.prometheus.webhooks.serviceMonitor.targetLabels }}
   targetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- with .Values.prometheus.webhooks.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   endpoints:
   - port: {{ .Values.prometheus.webhooks.serviceMonitor.port }}
@@ -39,15 +39,22 @@ spec:
     {{- with .Values.prometheus.webhooks.serviceMonitor.scrapeTimeout }}
     scrapeTimeout: {{ . }}
     {{- end }}
-    {{- with .Values.prometheus.webhooks.serviceMonitor.relabellings }}
+  {{- if .Values.prometheus.metricServer.serviceMonitor.relabelings}}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.relabelings }}
     relabelings:
-    {{ toYaml . | indent 6 }}
+    {{- toYaml . | nindent 6 }}
     {{- end }}
+  {{- else }}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.relabellings }}
+    relabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- end}}
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ .Values.webhooks.name }}
 {{- end }}
-{{- end }}
+{{- end }}
diff --git a/keda/values.yaml b/keda/values.yaml
@@ -375,7 +375,8 @@ prometheus:
       targetPort:
       interval:
       scrapeTimeout:
-      relabellings: []
+      relabellings: [] # DEPRECATED, use relabelings
+      relabelings: []
       additionalLabels: {}
     podMonitor:
       # Enables PodMonitor creation for the Prometheus Operator
@@ -398,7 +399,8 @@ prometheus:
       targetPort:
       interval:
       scrapeTimeout:
-      relabellings: []
+      relabellings: [] # DEPRECATED, use relabelings
+      relabelings: []
       additionalLabels: {}
     podMonitor:
       # Enables PodMonitor creation for the Prometheus Operator
@@ -435,7 +437,8 @@ prometheus:
       targetPort:
       interval:
       scrapeTimeout:
-      relabellings: []
+      relabellings: [] # DEPRECATED, use relabelings
+      relabelings: []
       additionalLabels: {}
     prometheusRules:
       # Enables PrometheusRules creation for the Prometheus Operator