From be31a9104f28322bdecf92452aa1ed86dda428b2 Mon Sep 17 00:00:00 2001 From: German Lashevich Date: Sat, 30 Sep 2023 13:44:12 +0200 Subject: [PATCH] docs: specify ServiceMonitor requirements in values.yaml (#585) --- charts/apisix-ingress-controller/README.md | 2 +- charts/apisix-ingress-controller/values.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/apisix-ingress-controller/README.md b/charts/apisix-ingress-controller/README.md index ddff29cc..501be686 100644 --- a/charts/apisix-ingress-controller/README.md +++ b/charts/apisix-ingress-controller/README.md @@ -164,7 +164,7 @@ The same for container level, you need to set: | serviceAccount.automountServiceAccountToken | bool | `true` | Whether automounting API credentials for a service account | | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created | | serviceAccount.name | string | `""` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template | -| serviceMonitor | object | `{"annotations":{},"enabled":false,"interval":"15s","labels":{},"metricRelabelings":{},"namespace":"monitoring"}` | namespace: "ingress-apisix" | +| serviceMonitor | object | `{"annotations":{},"enabled":false,"interval":"15s","labels":{},"metricRelabelings":{},"namespace":"monitoring"}` | Enable creating ServiceMonitor objects for Prometheus operator. Requires Prometheus operator v0.38.0 or higher. | | serviceMonitor.annotations | object | `{}` | @param serviceMonitor.annotations ServiceMonitor annotations | | serviceMonitor.labels | object | `{}` | @param serviceMonitor.labels ServiceMonitor extra labels | | serviceMonitor.metricRelabelings | object | `{}` | @param serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples before ingestion. ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs | diff --git a/charts/apisix-ingress-controller/values.yaml b/charts/apisix-ingress-controller/values.yaml index 63a52ffc..0ab5425c 100644 --- a/charts/apisix-ingress-controller/values.yaml +++ b/charts/apisix-ingress-controller/values.yaml @@ -182,8 +182,10 @@ affinity: {} # ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#spread-constraints-for-pods topologySpreadConstraints: [] -# -- namespace: "ingress-apisix" +# namespace: "ingress-apisix" +# -- Enable creating ServiceMonitor objects for Prometheus operator. +# Requires Prometheus operator v0.38.0 or higher. serviceMonitor: enabled: false namespace: "monitoring"