From b0608212e4ec77e73b49079f68aa7c37c82fde35 Mon Sep 17 00:00:00 2001
From: Emil Marklund <emil.marklund@vkmedia.se>
Date: Wed, 2 Oct 2019 20:04:09 +0200
Subject: [PATCH] [stable/nginx-ingress] Make prometheus scrape interval
 configurable (#17613)

Signed-off-by: Emil Marklund <emil.marklund@vkmedia.se>
---
 stable/nginx-ingress/Chart.yaml                               | 2 +-
 stable/nginx-ingress/README.md                                | 3 ++-
 stable/nginx-ingress/templates/controller-servicemonitor.yaml | 2 +-
 stable/nginx-ingress/values.yaml                              | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml
index 729dd4b552..79ea547754 100644
--- a/stable/nginx-ingress/Chart.yaml
+++ b/stable/nginx-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nginx-ingress
-version: 1.23.0
+version: 1.24.0
 appVersion: 0.26.1
 home: https://github.com/kubernetes/ingress-nginx
 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.
diff --git a/stable/nginx-ingress/README.md b/stable/nginx-ingress/README.md
index aa15d3d974..4548ba97c4 100644
--- a/stable/nginx-ingress/README.md
+++ b/stable/nginx-ingress/README.md
@@ -137,8 +137,9 @@ Parameter | Description | Default
 `controller.metrics.service.type` | type of Prometheus metrics service to create | `ClusterIP`
 `controller.metrics.serviceMonitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false`
 `controller.metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}`
-`controller.metrics.serviceMonitor.namespace` | namespace where servicemonitor resource should be created | `the same namespace as nginx ingress`
 `controller.metrics.serviceMonitor.honorLabels` | honorLabels chooses the metric's labels on collisions with target labels. | `false`
+`controller.metrics.serviceMonitor.namespace` | namespace where servicemonitor resource should be created | `the same namespace as nginx ingress`
+`controller.metrics.serviceMonitor.scrapeInterval` | interval between Prometheus scraping | `30s`
 `controller.metrics.prometheusRule.enabled` | Set this to `true` to create prometheusRules for Prometheus operator | `false`
 `controller.metrics.prometheusRule.additionalLabels` | Additional labels that can be used so prometheusRules will be discovered by Prometheus | `{}`
 `controller.metrics.prometheusRule.namespace` | namespace where prometheusRules resource should be created | `the same namespace as nginx ingress`
diff --git a/stable/nginx-ingress/templates/controller-servicemonitor.yaml b/stable/nginx-ingress/templates/controller-servicemonitor.yaml
index 929c6aabc9..d2b5b4285d 100644
--- a/stable/nginx-ingress/templates/controller-servicemonitor.yaml
+++ b/stable/nginx-ingress/templates/controller-servicemonitor.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
   endpoints:
     - port: metrics
-      interval: 30s
+      interval: {{ .Values.controller.metrics.serviceMonitor.scrapeInterval }}
       {{- if .Values.controller.metrics.serviceMonitor.honorLabels }}
       honorLabels: true
       {{- end }}
diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml
index b2469312be..d9ce1577d2 100644
--- a/stable/nginx-ingress/values.yaml
+++ b/stable/nginx-ingress/values.yaml
@@ -365,6 +365,7 @@ controller:
       enabled: false
       additionalLabels: {}
       namespace: ""
+      scrapeInterval: 30s
       # honorLabels: true
 
     prometheusRule: