Merge branch 'main' of https://github.com/Sheikh-Abubaker/prometheus-…

…helm-charts into additionalMetricsRelabels-pr

charts/kube-prometheus-stack/Chart.yaml

@@ -23,7 +23,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 56.13.0
+version: 56.13.1
 appVersion: v0.71.2
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

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

@@ -92,13 +92,13 @@ def new_representer(dumper, data):
 
 replacement_map = {
     'var-namespace=$__cell_1': {
-        'replacement': 'var-namespace=${__data.fields.namespace}',
+        'replacement': 'var-namespace=`}}{{ if .Values.grafana.sidecar.dashboards.enableNewTablePanelSyntax }}${__data.fields.namespace}{{ else }}$__cell_1{{ end }}{{`',
     },
     'var-type=$__cell_2': {
-        'replacement': 'var-type=${__data.fields.workload_type}',
+        'replacement': 'var-type=`}}{{ if .Values.grafana.sidecar.dashboards.enableNewTablePanelSyntax }}${__data.fields.workload_type}{{ else }}$__cell_2{{ end }}{{`',
     },
     '=$__cell': {
-        'replacement': '=${__value.text}',
+        'replacement': '=`}}{{ if .Values.grafana.sidecar.dashboards.enableNewTablePanelSyntax }}${__value.text}{{ else }}$__cell{{ end }}{{`',
     },
 }
 

charts/kube-prometheus-stack/values.yaml

@@ -1033,6 +1033,9 @@ grafana:
       # Allow discovery in all namespaces for dashboards
       searchNamespace: ALL
 
+      # Support for new table panels, when enabled grafana auto migrates the old table panels to newer table panels
+      enableNewTablePanelSyntax: false
+
       ## Annotations for Grafana dashboard configmaps
       ##
       annotations: {}