[stable/prometheus-operator] Re-sync prometheus rules and grafana das…

…hboards (#21248) * Re-sync prometheus rules Signed-off-by: iuri aranda <[email protected]> * Manually fix special notiation in prometheus rules I see that this was previously manually fixed as well, so I kept it like before Signed-off-by: iuri aranda <[email protected]> * Bump chart version Signed-off-by: iuri aranda <[email protected]> * Bump patch version Signed-off-by: iuri aranda <[email protected]> * Fix Helm interpolation escaping in sync scripts This should fix the issue of having a backtick (`) inside a {{ ... }} command block in prometheus syntax. As per helm/charts#21248 (comment) Signed-off-by: iuri aranda <[email protected]> * Bump patch version Signed-off-by: iuri aranda <[email protected]> * Remove unnecessary whitespace Signed-off-by: iuri aranda <[email protected]> * Bump patch version Signed-off-by: iuri aranda <[email protected]> * Bump prometheus-operator chart patch version Signed-off-by: iuri aranda <[email protected]> * Update prometheus rules gain Signed-off-by: iuri aranda <[email protected]> * Sync grafana dashboards as well Signed-off-by: iuri aranda <[email protected]> * Bump patch version for prometheus-operator chart Signed-off-by: iuri aranda <[email protected]>
Rungway · Aug 14, 2020 · 739e0e3 · 739e0e3
1 parent 3ad2c9f
commit 739e0e3
Show file tree

Hide file tree

Showing 72 changed files with 3,289 additions and 1,399 deletions.
diff --git a/charts/prometheus-operator/Chart.yaml b/charts/prometheus-operator/Chart.yaml
@@ -12,7 +12,7 @@ sources:
   - https://github.com/coreos/kube-prometheus
   - https://github.com/coreos/prometheus-operator
   - https://coreos.com/operators/prometheus
-version: 8.12.4
+version: 8.12.5
 appVersion: 0.37.0
 tillerVersion: ">=2.12.0"
 home: https://github.com/coreos/prometheus-operator

diff --git a/charts/prometheus-operator/hack/sync_grafana_dashboards.py b/charts/prometheus-operator/hack/sync_grafana_dashboards.py
@@ -96,7 +96,7 @@ def init_yaml_styles():
 
 
 def escape(s):
-    return s.replace("{{", "{{`{{").replace("}}", "}}`}}")
+    return s.replace("{{", "{{`{{").replace("}}", "}}`}}").replace("{{`{{", "{{`{{`}}").replace("}}`}}", "{{`}}`}}")
 
 
 def yaml_str_repr(struct, indent=2):

diff --git a/charts/prometheus-operator/hack/sync_prometheus_rules.py b/charts/prometheus-operator/hack/sync_prometheus_rules.py
@@ -120,7 +120,7 @@ def new_representer(dumper, data):
 }
 
 # standard header
-header = '''{{- /* 
+header = '''{{- /*
 Generated from '%(name)s' group from %(url)s
 Do not change in-place! In order to change this file first read following link:
 https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
@@ -153,7 +153,7 @@ def init_yaml_styles():
 
 
 def escape(s):
-    return s.replace("{{", "{{`{{").replace("}}", "}}`}}")
+    return s.replace("{{", "{{`{{").replace("}}", "}}`}}").replace("{{`{{", "{{`{{`}}").replace("}}`}}", "{{`}}`}}")
 
 
 def fix_expr(rules):

diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml b/charts/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml