From 03ba2ba33a68eba10c9a53bc9b9b231e1b40f165 Mon Sep 17 00:00:00 2001
From: Quentin Bisson <quentin@giantswarm.io>
Date: Mon, 21 Sep 2020 21:55:13 +0200
Subject: [PATCH] Add documentation on how to configure
 additionalPrometheusRulesMap (#109)

Signed-off-by: Quentin Bisson <quentin@giantswarm.io>
---
 charts/kube-prometheus-stack/Chart.yaml  |  2 +-
 charts/kube-prometheus-stack/values.yaml | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
index 9f5aabb490ad..7616f1a854c0 100644
--- a/charts/kube-prometheus-stack/Chart.yaml
+++ b/charts/kube-prometheus-stack/Chart.yaml
@@ -17,7 +17,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 9.4.3
+version: 9.4.4
 appVersion: 0.38.1
 tillerVersion: ">=2.12.0"
 home: https://github.com/prometheus-operator/kube-prometheus
diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
index 12d782d4f1db..5202bac57fcb 100644
--- a/charts/kube-prometheus-stack/values.yaml
+++ b/charts/kube-prometheus-stack/values.yaml
@@ -64,9 +64,9 @@ defaultRules:
   ## Annotations for default rules
   annotations: {}
 
-## Provide custom recording or alerting rules to be deployed into the cluster.
+## Deprecated way to provide custom recording or alerting rules to be deployed into the cluster.
 ##
-additionalPrometheusRules: []
+# additionalPrometheusRules: []
 #  - name: my-rule-file
 #    groups:
 #      - name: my_group
@@ -74,6 +74,16 @@ additionalPrometheusRules: []
 #        - record: my_record
 #          expr: 100 * my_record
 
+## Provide custom recording or alerting rules to be deployed into the cluster.
+##
+additionalPrometheusRulesMap: {}
+#  rule-name:
+#    groups:
+#    - name: my_group
+#      rules:
+#      - record: my_record
+#        expr: 100 * my_record
+
 ##
 global:
   rbac: