[stable/traefik] config option for endpoint of prometheus ServiceMonitor

Signed-off-by: a-hat <github@andreaskappler.de>
a-hat · Nov 22, 2019 · 6677976 · 6677976
1 parent 9939a9f
commit 6677976
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/stable/traefik/Chart.yaml b/stable/traefik/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: traefik
-version: 1.82.0
+version: 1.83.0
 appVersion: 1.7.19
 description: A Traefik based Kubernetes ingress controller with Let's Encrypt support
 keywords:

diff --git a/stable/traefik/README.md b/stable/traefik/README.md
@@ -208,6 +208,7 @@ The following table lists the configurable parameters of the Traefik chart and t
 | `metrics.prometheus.enabled`           | Whether to enable the `/metrics` endpoint for metric collection by Prometheus.                                               | `false`                                           |
 | `metrics.prometheus.buckets`           | A list of response times (in seconds) - for each list element, Traefik will report all response times less than the element. | `[0.1,0.3,1.2,5]`                                 |
 | `metrics.serviceMonitor.enabled`       | Whether to enable servicemonitor for Prometheus.                                               | `false`                                           |
+| `metrics.serviceMonitor.endpointConfig`| Specify additional yaml for the endpoint configuration (e.g. for re-labeling)                                                | `{}   `                                           |
 | `metrics.datadog.enabled`              | Whether to enable pushing metrics to Datadog.                                                                                | `false`                                           |
 | `metrics.datadog.address`              | Datadog host in the format <hostname>:<port>                                                                                 | `localhost:8125`                                  |
 | `metrics.datadog.pushInterval`         | How often to push metrics to Datadog.                                                                                        | `10s`                                             |

diff --git a/stable/traefik/templates/servicemonitor.yaml b/stable/traefik/templates/servicemonitor.yaml
@@ -21,6 +21,9 @@ spec:
     path: /metrics
 {{- if .Values.metrics.serviceMonitor.interval }}
     interval: {{ .Values.metrics.serviceMonitor.interval }}
+{{- end }}
+{{- with .Values.metrics.serviceMonitor.endpointConfig }}
+{{ toYaml . | indent 4 }}
 {{- end }}
   jobLabel: {{ template "traefik.fullname" . }}-prometheus-exporter
   namespaceSelector:

diff --git a/stable/traefik/values.yaml b/stable/traefik/values.yaml
@@ -429,6 +429,8 @@ metrics:
     # interval: 30s
     # Set labels for the ServiceMonitor, use this to define your scrape label for Prometheus Operator
     # labels:
+    # Specify additional yaml for the endpoint configuration (e.g. for re-labeling)
+    # endpointConfig: {}
   datadog:
     enabled: false
     # address: localhost:8125