mirror of https://git.rancher.io/charts
50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
--- charts-original/templates/grafana/dashboards-1.14/namespace-by-pod.yaml
|
|
+++ charts/templates/grafana/dashboards-1.14/namespace-by-pod.yaml
|
|
@@ -4,11 +4,11 @@
|
|
https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack
|
|
*/ -}}
|
|
{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
|
|
-{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }}
|
|
+{{- if and (or .Values.grafana.enabled .Values.grafana.forceDeployDashboards) (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.defaultDashboardsEnabled }}
|
|
apiVersion: v1
|
|
kind: ConfigMap
|
|
metadata:
|
|
- namespace: {{ template "kube-prometheus-stack.namespace" . }}
|
|
+ namespace: {{ .Values.grafana.defaultDashboards.namespace }}
|
|
name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "namespace-by-pod" | trunc 63 | trimSuffix "-" }}
|
|
annotations:
|
|
{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
|
|
@@ -1295,14 +1295,14 @@
|
|
"datasource": "$datasource",
|
|
"hide": {{ if .Values.grafana.sidecar.dashboards.multicluster }}0{{ else }}2{{ end }},
|
|
"includeAll": false,
|
|
- "label": null,
|
|
+ "label": "cluster",
|
|
"multi": false,
|
|
"name": "cluster",
|
|
"options": [
|
|
|
|
],
|
|
"query": "label_values(kube_pod_info, cluster)",
|
|
- "refresh": 1,
|
|
+ "refresh": 2,
|
|
"regex": "",
|
|
"sort": 0,
|
|
"tagValuesQuery": "",
|
|
@@ -1333,7 +1333,7 @@
|
|
|
|
],
|
|
"query": "label_values(container_network_receive_packets_total{cluster=\"$cluster\"}, namespace)",
|
|
- "refresh": 1,
|
|
+ "refresh": 2,
|
|
"regex": "",
|
|
"skipUrlSync": false,
|
|
"sort": 1,
|
|
@@ -1461,4 +1461,4 @@
|
|
"uid": "8b7a8b326d7a6f1f04244066368c67af",
|
|
"version": 0
|
|
}
|
|
-{{- end }}
|
|
\ No newline at end of file
|
|
+{{- end }}
|