Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-01 23:37:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/nginx-ingress-controller] Fix for scrape interval not propagated to template (#4063)

Browse Source 
* [nginx-ingress-controller] Fix for scrape interval not propagate to template

* Format README

Co-authored-by: Jose Antonio Carmona <jcarmona@vmware.com>
This commit is contained in:
Maxence Boutet
2020-10-21 03:24:13 -04:00
committed by GitHub
parent f605c3d8b3
commit fabacf685e
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/nginx-ingress-controller/Chart.yaml
View File

@@ -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:

1
bitnami/nginx-ingress-controller/README.md
View File

@@ -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` |

2
bitnami/nginx-ingress-controller/templates/controller-servicemonitor.yaml
View File

@@ -22,7 +22,7 @@ metadata:
spec:
endpoints:
- port: metrics
interval: 30s
interval: {{ .Values.metrics.serviceMonitor.interval }}
{{- if .Values.metrics.serviceMonitor.honorLabels }}
honorLabels: true
{{- end }}

2
bitnami/nginx-ingress-controller/values-production.yaml
View File

@@ -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
##

2
bitnami/nginx-ingress-controller/values.yaml
View File

@@ -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
##