diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml index 5d3fbe8453..8c3c80154f 100644 --- a/bitnami/nginx-ingress-controller/Chart.yaml +++ b/bitnami/nginx-ingress-controller/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nginx-ingress-controller -version: 5.6.13 +version: 5.6.14 appVersion: 0.40.2 description: Chart for the nginx Ingress controller keywords: diff --git a/bitnami/nginx-ingress-controller/README.md b/bitnami/nginx-ingress-controller/README.md index f9650f4fb3..ba0b5506de 100644 --- a/bitnami/nginx-ingress-controller/README.md +++ b/bitnami/nginx-ingress-controller/README.md @@ -133,6 +133,7 @@ The following tables lists the configurable parameters of the nginx-ingress-cont | `metrics.serviceMonitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false` | | `metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}` | | `metrics.serviceMonitor.namespace` | namespace where servicemonitor resource should be created | `the same namespace as nginx ingress` | +| `metrics.serviceMonitor.interval` | scrape interval | `30s` | | `metrics.serviceMonitor.honorLabels` | honorLabels chooses the metric's labels on collisions with target labels. | `false` | | `metrics.serviceMonitor.metricRelabelings` | metricRelabelings which should be applied to the ServiceMonitor. | `[]` | | `metrics.prometheusRule.enabled` | Set this to `true` to create prometheusRules for Prometheus operator | `false` | diff --git a/bitnami/nginx-ingress-controller/templates/controller-servicemonitor.yaml b/bitnami/nginx-ingress-controller/templates/controller-servicemonitor.yaml index 50b94ce834..e119a3b78b 100644 --- a/bitnami/nginx-ingress-controller/templates/controller-servicemonitor.yaml +++ b/bitnami/nginx-ingress-controller/templates/controller-servicemonitor.yaml @@ -22,7 +22,7 @@ metadata: spec: endpoints: - port: metrics - interval: 30s + interval: {{ .Values.metrics.serviceMonitor.interval }} {{- if .Values.metrics.serviceMonitor.honorLabels }} honorLabels: true {{- end }} diff --git a/bitnami/nginx-ingress-controller/values-production.yaml b/bitnami/nginx-ingress-controller/values-production.yaml index b0f39b0680..b2d89e6768 100644 --- a/bitnami/nginx-ingress-controller/values-production.yaml +++ b/bitnami/nginx-ingress-controller/values-production.yaml @@ -500,7 +500,7 @@ metrics: ## Interval at which metrics should be scraped. ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ## - # interval: 10s + interval: 30s ## Timeout after which the scrape is ended ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ## diff --git a/bitnami/nginx-ingress-controller/values.yaml b/bitnami/nginx-ingress-controller/values.yaml index 9973702d2c..08427a86b4 100644 --- a/bitnami/nginx-ingress-controller/values.yaml +++ b/bitnami/nginx-ingress-controller/values.yaml @@ -500,7 +500,7 @@ metrics: ## Interval at which metrics should be scraped. ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ## - # interval: 10s + interval: 30s ## Timeout after which the scrape is ended ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ##