Merge pull request #1693 from superseb/v26_nginx_scrape

[dev-v2.6] add default scrapeinterval for nginx in monitoring

charts/rancher-monitoring/100.1.1+up19.0.3/values.yaml

@@ -432,7 +432,7 @@ ingressNginx:
   serviceMonitor:
     ## Scrape interval. If not set, the Prometheus default scrape interval is used.
     ##
-    interval: ""
+    interval: "30"
 
     ## proxyUrl: URL of a proxy that should be used for scraping.
     ##

index.yaml

@@ -4824,7 +4824,7 @@ entries:
       catalog.cattle.io/upstream-version: 19.0.3
     apiVersion: v2
     appVersion: 0.50.0
-    created: "2022-03-02T16:37:31.536955-08:00"
+    created: "2022-03-03T15:41:22.671122+01:00"
     dependencies:
     - condition: grafana.enabled
       name: grafana
@@ -4898,7 +4898,7 @@ entries:
     description: Collects several related Helm charts, Grafana dashboards, and Prometheus
       rules combined with documentation and scripts to provide easy to operate end-to-end
       Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
-    digest: 129ca63668bd70d2e51b332637f4a3460d49e7793c3be101f56f6fc33410191a
+    digest: 7da5289866629ec8cf50d2485bc2a133fbb7d9bd34b96cc72a75ac5a85512c23
     home: https://github.com/prometheus-operator/kube-prometheus
     icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
     keywords:

packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/Chart.yaml.patch

@@ -22,7 +22,7 @@
  apiVersion: v2
  appVersion: 0.50.0
  dependencies:
-@@ -74,19 +87,19 @@
+@@ -74,19 +89,19 @@
  - condition: rkeScheduler.enabled
    name: rkeScheduler
    repository: file://./charts/rkeScheduler
@@ -47,7 +47,7 @@
  kubeVersion: '>=1.16.0-0'
  maintainers:
  - name: vsliouniaev
-@@ -99,7 +112,12 @@
+@@ -99,7 +114,12 @@
    name: scottrigby
  - email: miroslav.hadzhiev@gmail.com
    name: Xtigyro

packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch

@@ -434,7 +434,7 @@
 +  serviceMonitor:
 +    ## Scrape interval. If not set, the Prometheus default scrape interval is used.
 +    ##
-+    interval: ""
++    interval: "30"
 +
 +    ## proxyUrl: URL of a proxy that should be used for scraping.
 +    ##