Merge pull request #1766 from code-chris/kube-state-metrics-servicemonitor

[bitnami/kube-state-metrics]: Add metricRelabelings to ServiceMonitor

bitnami/kube-state-metrics/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.9.0
 description: kube-state-metrics is a simple service that listens to the Kubernetes API server and generates metrics about the state of the objects.
 name: kube-state-metrics
-version: 0.1.4
+version: 0.1.5
 keywords:
   - prometheus
   - kube-state-metrics

bitnami/kube-state-metrics/README.md

@@ -133,6 +133,7 @@ The following table lists the configurable parameters of the kube-state-metrics
 | `serviceMonitor.interval`               | Scrape interval (use by default, falling back to Prometheus' default)                                         | `nil`                                                      |
 | `serviceMonitor.jobLabel`               | The name of the label on the target service to use as the job name in prometheus.                             | `nil`                                                      |
 | `serviceMonitor.selector`               | ServiceMonitor selector labels                                                                                | `[]`                                                       |
+| `serviceMonitor.metricRelabelings`      | ServiceMonitor metricRelabelings                                                                              | `[]`                                                       |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example the following command sets the `replicas` of the kube-state-metrics Pods to `2`.
 

bitnami/kube-state-metrics/templates/servicemonitor.yaml

@@ -24,6 +24,9 @@ spec:
       {{- if .Values.serviceMonitor.scrapeTimeout }}
       scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
       {{- end }}
+      {{- if .Values.serviceMonitor.metricRelabelings }}
+      metricRelabelings: {{- include "kube-state-metrics.tplValue" ( dict "value" .Values.serviceMonitor.metricRelabelings "context" $) | nindent 8 }}
+      {{- end }}
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace }}

bitnami/kube-state-metrics/values-production.yaml

@@ -243,3 +243,8 @@ serviceMonitor:
   ##
   # selector:
   #   prometheus: my-prometheus
+
+  ## Metric relabeling
+  ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+  ##
+  # metricRelabelings: []

bitnami/kube-state-metrics/values.yaml

@@ -243,3 +243,8 @@ serviceMonitor:
   ##
   # selector:
   #   prometheus: my-prometheus
+
+  ## Metric relabeling
+  ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+  ##
+  # metricRelabelings: []