rancher-charts/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus.yaml.patch

132 lines
5.4 KiB
Diff
Raw Normal View History

--- charts-original/templates/grafana/dashboards-1.14/prometheus.yaml
+++ charts/templates/grafana/dashboards-1.14/prometheus.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" $) "prometheus" | trunc 63 | trimSuffix "-" }}
annotations:
{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
@@ -220,7 +220,7 @@
"timeShift": null,
"title": "Prometheus Stats",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -319,7 +319,7 @@
"timeShift": null,
"title": "Target Sync",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -405,7 +405,7 @@
"timeShift": null,
"title": "Targets",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -503,7 +503,7 @@
"timeShift": null,
"title": "Average Scrape Interval Duration",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -613,7 +613,7 @@
"timeShift": null,
"title": "Scrape failures",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -699,7 +699,7 @@
"timeShift": null,
"title": "Appended Samples",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -797,7 +797,7 @@
"timeShift": null,
"title": "Head Series",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -883,7 +883,7 @@
"timeShift": null,
"title": "Head Chunks",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -981,7 +981,7 @@
"timeShift": null,
"title": "Query Rate",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -1067,7 +1067,7 @@
"timeShift": null,
"title": "Stage Duration",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -1133,7 +1133,7 @@
"type": "datasource"
},
{
- "allValue": null,
+ "allValue": ".+",
"current": {
"selected": true,
"text": "All",
@@ -1161,7 +1161,7 @@
"useTags": false
},
{
- "allValue": null,
+ "allValue": ".+",
"current": {
"selected": true,
"text": "All",
@@ -1224,4 +1224,4 @@
"uid": "",
"version": 0
}
-{{- end }}
\ No newline at end of file
+{{- end }}