From a11f83db24b57f8c765974261e2b3fc65af8a41c Mon Sep 17 00:00:00 2001
From: Frank Reno <frank.reno@me.com>
Date: Tue, 26 May 2020 08:02:34 -0600
Subject: [PATCH] Expose Scrape Intervals in values.yaml to make it easier to
 adjust. (#665)

* Expose Scrape Intervals in values.yaml to make it easier to adjust.

* Generate new overrides yaml/libsonnet file(s).

Co-authored-by: Travis CI <travis@travis-ci.org>
---
 deploy/helm/prometheus-overrides.yaml | 36 +++++++++++++++++++++++++++
 deploy/helm/sumologic/values.yaml     | 36 +++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/deploy/helm/prometheus-overrides.yaml b/deploy/helm/prometheus-overrides.yaml
index 7aa54be307..cd5f2bd9a0 100644
--- a/deploy/helm/prometheus-overrides.yaml
+++ b/deploy/helm/prometheus-overrides.yaml
@@ -1,4 +1,37 @@
 # This file is auto-generated.
+## NOTE changing the serviceMonitor scrape interval to be >1m can result in metrics from recording rules to be missing and empty panels in Sumo Logic Kubernetes apps.
+kubeApiServer:
+  serviceMonitor:
+    ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+    interval:
+kubelet:
+  serviceMonitor:
+    ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+    interval:
+kubeControllerManager:
+  serviceMonitor:
+    ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+    interval:
+coreDns:
+  serviceMonitor:
+    ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+    interval:
+kubeEtcd:
+  serviceMonitor:
+    ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+    interval:
+kubeScheduler:
+  serviceMonitor:
+    ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+    interval:
+kubeStateMetrics:
+  serviceMonitor:
+    ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+    interval:
+nodeExporter:
+  serviceMonitor:
+    ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+    interval:
 # Ensure we use pre 1.14 recording rules consistently as current content depends on them.
 kubeTargetVersionOverride: 1.13.0-0
 ## Set the enabled flag to false for either of the below two purposes:
@@ -100,6 +133,9 @@ prometheus:
       matchLabels:
         app: collection-sumologic-otelcol
   prometheusSpec:
+    ## Prometheus default scrape interval, default from upstream Prometheus Operator Helm chart
+    ## NOTE changing the scrape interval to be >1m can result in metrics from recording rules to be missing and empty panels in Sumo Logic Kubernetes apps.
+    scrapeInterval: "30s"
     ## Define resources requests and limits for single Pods.
     resources: {}
     # limits:
diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
index 2e19e107f5..331e6f0b76 100644
--- a/deploy/helm/sumologic/values.yaml
+++ b/deploy/helm/sumologic/values.yaml
@@ -557,6 +557,39 @@ fluent-bit:
 grafana:
   enabled: false
 prometheus-operator:
+  ## NOTE changing the serviceMonitor scrape interval to be >1m can result in metrics from recording rules to be missing and empty panels in Sumo Logic Kubernetes apps.
+  kubeApiServer:
+    serviceMonitor:
+      ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+      interval:
+  kubelet:
+    serviceMonitor:
+      ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+      interval:
+  kubeControllerManager:
+    serviceMonitor:
+      ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+      interval:
+  coreDns:
+    serviceMonitor:
+      ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+      interval:
+  kubeEtcd:
+    serviceMonitor:
+      ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+      interval:
+  kubeScheduler:
+    serviceMonitor:
+      ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+      interval:
+  kubeStateMetrics:
+    serviceMonitor:
+      ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+      interval:
+  nodeExporter:
+    serviceMonitor:
+      ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+      interval:
   # Ensure we use pre 1.14 recording rules consistently as current content depends on them.
   kubeTargetVersionOverride: 1.13.0-0
   ## Set the enabled flag to false for either of the below two purposes:
@@ -658,6 +691,9 @@ prometheus-operator:
           matchLabels:
             app: collection-sumologic-otelcol
     prometheusSpec:
+      ## Prometheus default scrape interval, default from upstream Prometheus Operator Helm chart
+      ## NOTE changing the scrape interval to be >1m can result in metrics from recording rules to be missing and empty panels in Sumo Logic Kubernetes apps.
+      scrapeInterval: "30s"
       ## Define resources requests and limits for single Pods.
       resources: {}
       # limits: