[kube-prometheus-stack] Fix Grafana Deeplinks (#4087)

* [kube-prometheus-stack] Fix Grafana Deeplinks

Signed-off-by: Jan-Otto Kröpke <[email protected]>

* Update Chart.yaml

Signed-off-by: Jan-Otto Kröpke <[email protected]>

---------

Signed-off-by: Jan-Otto Kröpke <[email protected]>
Signed-off-by: Jan-Otto Kröpke <[email protected]>
Co-authored-by: MH <[email protected]>

charts/kube-prometheus-stack/Chart.yaml

@@ -21,7 +21,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 55.8.1
+version: 55.8.2
 appVersion: v0.70.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py

@@ -81,6 +81,18 @@ def new_representer(dumper, data):
     'k8s-resources-windows-pod': ' .Values.windowsMonitoring.enabled',
 }
 
+replacement_map = {
+    'var-namespace=$__cell_1': {
+        'replacement': 'var-namespace=${__data.fields.namespace}',
+    },
+    'var-type=$__cell_2': {
+        'replacement': 'var-type=${__data.fields.workload_type}',
+    },
+    '=$__cell': {
+        'replacement': '=${__value.text}',
+    },
+}
+
 # standard header
 header = '''{{- /*
 Generated from '%(name)s' from %(url)s
@@ -152,6 +164,9 @@ def patch_dashboards_json(content, multicluster_key):
 
         content = json.dumps(content_struct, separators=(',', ':'))
         content = content.replace('":multicluster:"', '`}}{{ if %s }}0{{ else }}2{{ end }}{{`' % multicluster_key,)
+
+        for line in replacement_map:
+            content = content.replace(line, replacement_map[line]['replacement'])
     except (ValueError, KeyError):
         pass