Skip to content

Commit

Permalink
[kube-prometheus-stack] Conditionally support new table panels (#4297)
Browse files Browse the repository at this point in the history
Co-authored-by: Gabriel Martinez <[email protected]>
  • Loading branch information
jkroepke and GMartinez-Sisti authored Feb 27, 2024
1 parent 845c7fa commit 843dd67
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion charts/kube-prometheus-stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}{{`',
},
}

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions charts/kube-prometheus-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down

0 comments on commit 843dd67

Please sign in to comment.