diff --git a/stable/envoy/Chart.yaml b/stable/envoy/Chart.yaml index be144a74a6..3b575282ee 100755 --- a/stable/envoy/Chart.yaml +++ b/stable/envoy/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Envoy is an open source edge and service proxy, designed for cloud-native applications. name: envoy -version: 1.6.0 -appVersion: 1.11.1 +version: 1.7.0 +appVersion: 1.11.2 keywords: - envoy - proxy diff --git a/stable/envoy/README.md b/stable/envoy/README.md index 6b75e5194c..2f1cc00c72 100644 --- a/stable/envoy/README.md +++ b/stable/envoy/README.md @@ -36,6 +36,8 @@ Parameter | Description | Default `serviceMonitor.interval` | Interval that Prometheus scrapes Envoy metrics | `15s` `serviceMonitor.namespace` | Namespace which the operated Prometheus is running in | `` `serviceMonitor.additionalLabels` | Labels used by Prometheus Operator to discover your Service Monitor. Set according to your Prometheus setup | `{}` +`serviceMonitor.targetLabels` | Labels to transfer from service onto the target | `[]` +`serviceMonitor.podTargetLabels` | Labels to transfor from pod onto the target | `[]` `prometheusRule.enabled` | If `true`, creates a Prometheus Operator PrometheusRule | `false` `prometheusRule.groups` | Prometheus alerting rules | `{}` `prometheusRule.additionalLabels` | Labels used by Prometheus Operator to discover your Prometheus Rule | `{}`| `volumes` | Additional volumes to be added to Envoy pods @@ -44,3 +46,6 @@ Parameter | Description | Default `sidecarContainersTemplate` | Golang template of additional containers added after the primary container of Envoy pods | `` All other user-configurable settings, default values and some commentary about them can be found in [values.yaml](values.yaml). + +| `serviceMonitor.targetLabels` | Labels to transfer from service onto the target | `[]` | +| `serviceMonitor.podTargetLabels` | Labels to transfor from pod onto the target | `[]` | diff --git a/stable/envoy/templates/servicemonitor.yaml b/stable/envoy/templates/servicemonitor.yaml index 43235bea22..4e0f4dadfc 100644 --- a/stable/envoy/templates/servicemonitor.yaml +++ b/stable/envoy/templates/servicemonitor.yaml @@ -27,4 +27,12 @@ spec: matchLabels: app: {{ template "envoy.name" . }} release: {{ .Release.Name }} -{{- end }} + {{- with .Values.serviceMonitor.targetLabels }} + targetLabels: +{{ toYaml . | trim | indent 4 -}} + {{- end }} + {{- with .Values.serviceMonitor.podTargetLabels }} + podTargetLabels: +{{ toYaml . | trim | indent 4 -}} + {{- end }} +{{- end }} diff --git a/stable/envoy/values.yaml b/stable/envoy/values.yaml index bb40e62586..9b377e3491 100644 --- a/stable/envoy/values.yaml +++ b/stable/envoy/values.yaml @@ -293,6 +293,8 @@ serviceMonitor: ## If the operator is installed in your cluster, set to true to create a Service Monitor Entry enabled: false interval: "15s" + targetLabels: [] + podTargetLabels: [] ## Namespace in which the service monitor is created # namespace: monitoring # Added to the ServiceMonitor object so that prometheus-operator is able to discover it