From eaad48166bcc4dd4e2979428ba34048c6af8629b Mon Sep 17 00:00:00 2001 From: msvechla Date: Thu, 9 Jul 2020 12:18:02 +0200 Subject: [PATCH] [stable/prometheus-operator] possibility to add annotations to default dashboards (#22900) * adapt sync script to add annotations to dashboards Signed-off-by: Marius Svechla * run sync_grafana_dashboards, add new value to values.yaml Signed-off-by: Marius Svechla * update readme for new grafana.sidecar.dashboards.annotations variable Signed-off-by: Marius Svechla * rebase Signed-off-by: Marius Svechla * fix trailing spaces Signed-off-by: Marius Svechla * fix namespace template Signed-off-by: Marius Svechla * re-run sync_grafana_dashboards Signed-off-by: Marius Svechla --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/README.md | 1 + .../hack/sync_grafana_dashboards.py | 4 ++- .../grafana/dashboards-1.14/apiserver.yaml | 19 +++++++++++- .../dashboards-1.14/cluster-total.yaml | 16 +++++++++- .../dashboards-1.14/controller-manager.yaml | 13 +++++++- .../grafana/dashboards-1.14/etcd.yaml | 4 ++- .../k8s-resources-cluster.yaml | 31 ++----------------- .../k8s-resources-namespace.yaml | 4 ++- .../dashboards-1.14/k8s-resources-node.yaml | 4 ++- .../dashboards-1.14/k8s-resources-pod.yaml | 4 ++- .../k8s-resources-workload.yaml | 4 ++- .../k8s-resources-workloads-namespace.yaml | 4 ++- .../grafana/dashboards-1.14/kubelet.yaml | 22 ++++++++++++- .../dashboards-1.14/namespace-by-pod.yaml | 10 +++++- .../namespace-by-workload.yaml | 14 ++++++++- .../node-cluster-rsrc-use.yaml | 4 ++- .../dashboards-1.14/node-rsrc-use.yaml | 4 ++- .../grafana/dashboards-1.14/nodes.yaml | 11 ++++++- .../persistentvolumesusage.yaml | 6 +++- .../grafana/dashboards-1.14/pod-total.yaml | 10 +++++- .../prometheus-remote-write.yaml | 17 ++++++++++ .../grafana/dashboards-1.14/prometheus.yaml | 2 ++ .../grafana/dashboards-1.14/proxy.yaml | 14 ++++++++- .../grafana/dashboards-1.14/scheduler.yaml | 12 ++++++- .../grafana/dashboards-1.14/statefulset.yaml | 5 ++- .../dashboards-1.14/workload-total.yaml | 14 ++++++++- .../templates/grafana/dashboards/etcd.yaml | 4 ++- .../dashboards/k8s-cluster-rsrc-use.yaml | 2 ++ .../grafana/dashboards/k8s-node-rsrc-use.yaml | 2 ++ .../dashboards/k8s-resources-cluster.yaml | 2 ++ .../dashboards/k8s-resources-namespace.yaml | 2 ++ .../grafana/dashboards/k8s-resources-pod.yaml | 2 ++ .../dashboards/k8s-resources-workload.yaml | 2 ++ .../k8s-resources-workloads-namespace.yaml | 2 ++ .../templates/grafana/dashboards/nodes.yaml | 2 ++ .../dashboards/persistentvolumesusage.yaml | 2 ++ .../templates/grafana/dashboards/pods.yaml | 2 ++ .../grafana/dashboards/statefulset.yaml | 2 ++ stable/prometheus-operator/values.yaml | 4 +++ 40 files changed, 233 insertions(+), 52 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 7d03be0236..115c44691e 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -12,7 +12,7 @@ sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 8.15.14 +version: 8.16.0 appVersion: 0.38.1 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index 71177f4b4c..8a7893e839 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -468,6 +468,7 @@ For a full list of configurable values please refer to the [Grafana chart](https | `grafana.serviceMonitor.relabelings` | The `relabel_configs` for scraping the grafana instance. | `` | | `grafana.serviceMonitor.selfMonitor` | Create a `serviceMonitor` to automatically monitor the grafana instance | `true` | | `grafana.sidecar.dashboards.enabled` | Enable the Grafana sidecar to automatically load dashboards with a label `{{ grafana.sidecar.dashboards.label }}=1` | `true` | +| `grafana.sidecar.dashboards.annotations` | Create annotations on dashboard configmaps | `{}` | | `grafana.sidecar.dashboards.label` | If the sidecar is enabled, configmaps with this label will be loaded into Grafana as dashboards | `grafana_dashboard` | | `grafana.sidecar.datasources.annotations` | Create annotations on datasource configmaps | `{}` | | `grafana.sidecar.datasources.createPrometheusReplicasDatasources` | Create datasource for each Pod of Prometheus StatefulSet i.e. `Prometheus-0`, `Prometheus-1` | `false` | diff --git a/stable/prometheus-operator/hack/sync_grafana_dashboards.py b/stable/prometheus-operator/hack/sync_grafana_dashboards.py index 3e62f0ea8c..d899963591 100755 --- a/stable/prometheus-operator/hack/sync_grafana_dashboards.py +++ b/stable/prometheus-operator/hack/sync_grafana_dashboards.py @@ -78,8 +78,10 @@ https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ $.Release.Namespace }} + namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%%s-%%s" (include "prometheus-operator.fullname" $) "%(name)s" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml index c60b0acb0e..251214ef83 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "apiserver" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -171,6 +173,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -364,6 +367,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -471,6 +475,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -563,6 +568,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -862,6 +868,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -954,6 +961,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1058,6 +1066,7 @@ data: "min": false, "rightSide": false, "show": false, + "sideWidth": null, "total": false, "values": false }, @@ -1149,6 +1158,7 @@ data: "min": false, "rightSide": false, "show": false, + "sideWidth": null, "total": false, "values": false }, @@ -1240,6 +1250,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1344,6 +1355,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1435,6 +1447,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1533,6 +1546,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1644,6 +1658,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1735,6 +1750,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1826,6 +1842,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -2013,7 +2030,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / API server", "uid": "09ec8aa1e996d6ffcd6817bbaff4db1b", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml index ab5bc59e26..27ea3ba574 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "cluster-total" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -94,6 +96,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -195,6 +198,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -634,6 +638,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -735,6 +740,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -866,6 +872,7 @@ data: "min": true, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -965,6 +972,7 @@ data: "min": true, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1075,6 +1083,7 @@ data: "min": true, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1174,6 +1183,7 @@ data: "min": true, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1293,6 +1303,7 @@ data: "min": true, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1392,6 +1403,7 @@ data: "min": true, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1491,6 +1503,7 @@ data: "min": true, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1594,6 +1607,7 @@ data: "min": true, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1819,7 +1833,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Networking / Cluster", "uid": "ff635a025bcfea7bc3dd4f508990a3e9", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml index 985a7290e7..500f6c80c4 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "controller-manager" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -149,6 +151,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -253,6 +256,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -357,6 +361,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -461,6 +466,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -573,6 +579,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -677,6 +684,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -781,6 +789,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -872,6 +881,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -963,6 +973,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1123,7 +1134,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Controller Manager", "uid": "72e0e05bef5099e5f049b05fdc429ed4", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml index e0c5b74a6b..ba49364422 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -26,7 +28,6 @@ data: "editable": true, "gnetId": null, "hideControls": false, - "id": 6, "links": [], "refresh": "10s", "rows": [ @@ -1109,6 +1110,7 @@ data: }, "timezone": "browser", "title": "etcd", + "uid": "c2f4e12cdf69feb95caa41a5a1b423d9", "version": 215 } {{- end }} \ No newline at end of file diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml index df3bf8ae3c..f6093fcccb 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -2491,33 +2493,6 @@ data: "regex": "", "type": "datasource" }, - { - "allValue": null, - "current": { - "text": "prod", - "value": "prod" - }, - "datasource": "$datasource", - "hide": 2, - "includeAll": false, - "label": "cluster", - "multi": false, - "name": "cluster", - "options": [ - - ], - "query": "label_values(node_cpu_seconds_total, cluster)", - "refresh": 1, - "regex": "", - "sort": 2, - "tagValuesQuery": "", - "tags": [ - - ], - "tagsQuery": "", - "type": "query", - "useTags": false - }, { "allValue": null, "current": { @@ -2576,7 +2551,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Compute Resources / Cluster", "uid": "efa86fd1d0c121a26444b636a3f509a8", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml index 5855357704..70e27c85d2 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -2254,7 +2256,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Compute Resources / Namespace (Pods)", "uid": "85a562078cdf77779eaa1add43ccec1e", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml index b2c3752ed0..2dd1330ca7 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -953,7 +955,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Compute Resources / Node (Pods)", "uid": "200ac8fdbfbb74b39aff88118e4d1c2c", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml index 4716f79791..8ab4fcd854 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -1747,7 +1749,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Compute Resources / Pod", "uid": "6581e46e4e5c7ba40a07646395ef7b23", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml index 1fd37c1a4d..acbd2b4b3f 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -2005,7 +2007,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Compute Resources / Workload", "uid": "a164a7f0339f99e89cea5cb47e9be617", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml index 96faac364f..fb33bd4182 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -2161,7 +2163,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Compute Resources / Namespace (Workloads)", "uid": "a87fb0d919ec0ea5f6543124e16c42a5", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml index 9adb763d76..3fe19a93c2 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "kubelet" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -582,6 +584,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -673,6 +676,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -777,6 +781,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -881,6 +886,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -979,6 +985,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1092,6 +1099,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1185,6 +1193,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1291,6 +1300,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1395,6 +1405,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1486,6 +1497,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1591,6 +1603,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1682,6 +1695,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1786,6 +1800,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -1890,6 +1905,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -2015,6 +2031,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -2119,6 +2136,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -2210,6 +2228,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -2301,6 +2320,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -2487,7 +2507,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Kubelet", "uid": "3138fa155d5915769fbded898ac09fd9", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml index 1a7e962725..707e633d5f 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "namespace-by-pod" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -634,6 +636,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -733,6 +736,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -843,6 +847,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -942,6 +947,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1061,6 +1067,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1160,6 +1167,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1413,7 +1421,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Networking / Namespace (Pods)", "uid": "8b7a8b326d7a6f1f04244066368c67af", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml index 67f20234bf..d0ca33278a 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "namespace-by-workload" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -94,6 +96,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -195,6 +198,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -634,6 +638,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -735,6 +740,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -866,6 +872,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -965,6 +972,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1075,6 +1083,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1174,6 +1183,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1293,6 +1303,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1392,6 +1403,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1677,7 +1689,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Networking / Namespace (Workload)", "uid": "bbb2a765a623ae38130206c7d94a160f", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml index 0aca3933ac..175bf9078e 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "node-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -954,7 +956,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "USE Method / Cluster", "uid": "3e97d1d02672cdd0861f4c97c64f89b2", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml index 1cffc373bf..03ad9f7cca 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "node-rsrc-use" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -981,7 +983,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "USE Method / Node", "uid": "fac67cfbe174d3ef53eb473d73d9212f", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml index 4277340de7..c70474488f 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -65,6 +67,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -157,6 +160,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -282,6 +286,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -491,6 +496,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -606,6 +612,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -724,6 +731,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -816,6 +824,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -977,7 +986,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Nodes", "uid": "fa49a4706d07a042595b664c87fb33ea", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml index f5db115655..d61d5b776b 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -65,6 +67,7 @@ data: "min": true, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -260,6 +263,7 @@ data: "min": true, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -563,7 +567,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Persistent Volumes", "uid": "919b92a8e8041bd567af9edab12c840c", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml index a26cf9f0b1..9e46de1743 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "pod-total" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -369,6 +371,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -468,6 +471,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -578,6 +582,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -677,6 +682,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -796,6 +802,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -895,6 +902,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1180,7 +1188,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Networking / Pod", "uid": "7a18067ce943a40ae25454675c19ff5c", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml index 6af1b5bfc2..a0b64fdbc0 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "prometheus-remote-write" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -65,6 +67,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -156,6 +159,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -260,6 +264,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -364,6 +369,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -456,6 +462,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -547,6 +554,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -638,6 +646,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -742,6 +751,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -833,6 +843,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -937,6 +948,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1028,6 +1040,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1132,6 +1145,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1223,6 +1237,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1314,6 +1329,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1405,6 +1421,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml index ff7cc859fb..8728c40b8c 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "prometheus" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml index e64d85e7cf..9c56625b09 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "proxy" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -149,6 +151,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -240,6 +243,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -344,6 +348,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -435,6 +440,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -539,6 +545,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -651,6 +658,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -755,6 +763,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -859,6 +868,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -950,6 +960,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1041,6 +1052,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1201,7 +1213,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Proxy", "uid": "632e265de029684c40b21cb76bca4f94", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml index 54a9b4e872..2e2a63922e 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "scheduler" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -149,6 +151,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -261,6 +264,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -386,6 +390,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -498,6 +503,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -602,6 +608,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "total": false, "values": true }, @@ -706,6 +713,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -797,6 +805,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -888,6 +897,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1048,7 +1058,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Scheduler", "uid": "2e6b6a3b4bddf1427b3a55aa1311c656", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml index 75d930e190..694bd1f77c 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -677,6 +679,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -916,7 +919,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / StatefulSets", "uid": "a31c1f46e6f727cb37c0d731a7245005", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml index a2addf8c3a..1bea18b015 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "workload-total" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -94,6 +96,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -195,6 +198,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -307,6 +311,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -408,6 +413,7 @@ data: "min": false, "rightSide": true, "show": true, + "sideWidth": null, "sort": "current", "sortDesc": true, "total": false, @@ -539,6 +545,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -638,6 +645,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -748,6 +756,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -847,6 +856,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -966,6 +976,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1065,6 +1076,7 @@ data: "min": false, "rightSide": false, "show": true, + "sideWidth": null, "total": false, "values": false }, @@ -1382,7 +1394,7 @@ data: "30d" ] }, - "timezone": "", + "timezone": "UTC", "title": "Kubernetes / Networking / Workload", "uid": "728bf77cc1166d2f3133bf25846876cc", "version": 0 diff --git a/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml b/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml index f264e405cd..b634fb5840 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" @@ -26,7 +28,6 @@ data: "editable": true, "gnetId": null, "hideControls": false, - "id": 6, "links": [], "refresh": "10s", "rows": [ @@ -1109,6 +1110,7 @@ data: }, "timezone": "browser", "title": "etcd", + "uid": "c2f4e12cdf69feb95caa41a5a1b423d9", "version": 215 } {{- end }} \ No newline at end of file diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml index ea8b5c93df..1aebf9c661 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml index d70eaf8428..4dd0e85465 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-node-rsrc-use" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml index 2ceb1ebb7e..9ad60b4398 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml index 6b2f1124ad..8a6701360f 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml index 01a33e239a..32c8bbc77d 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml index 5fb05151ab..3c1c5910e2 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml index e0d7e32af9..362140e3e8 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml b/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml index 997c59d14d..cc1ae90d27 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml b/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml index ac0a0eebeb..66e8c99510 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml b/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml index dce3215569..9f7f5ac75f 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "pods" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml b/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml index 1d73658942..c6d943fff3 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml @@ -10,6 +10,8 @@ kind: ConfigMap metadata: namespace: {{ template "prometheus-operator.namespace" . }} name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} + annotations: +{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml index 068e080947..f322c8d553 100644 --- a/stable/prometheus-operator/values.yaml +++ b/stable/prometheus-operator/values.yaml @@ -528,6 +528,10 @@ grafana: dashboards: enabled: true label: grafana_dashboard + + ## Annotations for Grafana dashboard configmaps + ## + annotations: {} datasources: enabled: true defaultDatasourceEnabled: true