From 652f9c62202abdeca6efcec0b6e43512b8e94acb Mon Sep 17 00:00:00 2001
From: Ben Kochie <superq@gmail.com>
Date: Mon, 19 Sep 2022 11:20:03 +0200
Subject: [PATCH] chore(prometheus): Expose prometheus configuration options in
 Scale GUI (#3797)

* Update prometheus configuration

* Add new config quesiton to adjust prometheus.scrapeInterval.
* Add new config question to adjust prometheus.evaluationInterval.
* Set default scrapeInterval to 15s to match typical Prometheus
  deployments.
* Set WAL compression to on by default, this has been default upstream
  since Prometheus v2.20.0 (2020-07-22).

Signed-off-by: SuperQ <superq@gmail.com>

* Update charts/stable/prometheus/questions.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

Signed-off-by: SuperQ <superq@gmail.com>
Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Co-authored-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
---
 charts/stable/prometheus/Chart.yaml     |  2 +-
 charts/stable/prometheus/questions.yaml | 13 +++++++++++++
 charts/stable/prometheus/values.yaml    |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/charts/stable/prometheus/Chart.yaml b/charts/stable/prometheus/Chart.yaml
index aa64d2c7d7e..e8dc926e76b 100644
--- a/charts/stable/prometheus/Chart.yaml
+++ b/charts/stable/prometheus/Chart.yaml
@@ -29,7 +29,7 @@ sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 4.0.84
+version: 4.0.85
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/stable/prometheus/questions.yaml b/charts/stable/prometheus/questions.yaml
index 298160aae2f..9d54bcef2a2 100644
--- a/charts/stable/prometheus/questions.yaml
+++ b/charts/stable/prometheus/questions.yaml
@@ -55,6 +55,18 @@ questions:
                 schema:
                   type: string
                   default: ""
+              - variable: scrapeInterval
+                label: "Scrape interval"
+                description: "Interval between consecutive scrapes"
+                schema:
+                  type: string
+                  default: "15s"
+              - variable: evaluationInterval
+                label: "Evaluation interval"
+                description: "Interval between consecutive evaluations"
+                schema:
+                  type: string
+                  default: "30s"
               - variable: disableCompaction
                 label: "Disable Compaction"
                 description: "Disable the compaction of the Prometheus TSDB"
@@ -67,6 +79,7 @@ questions:
                 schema:
                   type: boolean
                   default: false
+
   - variable: alertmanager
     group: "App Configuration"
     label: "Alertmanager Settings"
diff --git a/charts/stable/prometheus/values.yaml b/charts/stable/prometheus/values.yaml
index 5a2225c028c..d76a4476146 100644
--- a/charts/stable/prometheus/values.yaml
+++ b/charts/stable/prometheus/values.yaml
@@ -404,10 +404,10 @@ prometheus:
   tolerations: []
   ## @param prometheus.scrapeInterval Interval between consecutive scrapes
   ##
-  scrapeInterval: ""
+  scrapeInterval: "15s"
   ## @param prometheus.evaluationInterval Interval between consecutive evaluations
   ##
-  evaluationInterval: ""
+  evaluationInterval: "30s"
   ## @param prometheus.listenLocal ListenLocal makes the Prometheus server listen on loopback
   ##
   listenLocal: false