From 142e5bcaa6958655062fc7430f4f3b9578db36e9 Mon Sep 17 00:00:00 2001 From: Jiaqi Luo <6218999+jiaqiluo@users.noreply.github.com> Date: Tue, 12 Oct 2021 12:27:06 -0700 Subject: [PATCH] (dev-v2.6-archive) Rebase to 12699d2f (partially cherry picked from commit 8cdd6851ed735be89e7fd5ef649092b59c3c76da) --- .../servicemonitorThanosSidecar.yaml | 41 ++++ .../generated-changes/patch/Chart.yaml.patch | 2 +- .../generated-changes/patch/README.md.patch | 38 ++- .../patch/templates/_helpers.tpl.patch | 40 +++ .../alertmanager/alertmanager.yaml.patch | 8 +- .../templates/alertmanager/secret.yaml.patch | 13 +- .../serviceMonitor.yaml.patch | 43 +++- .../node-exporter/servicemonitor.yaml.patch | 21 +- .../grafana/configmap-dashboards.yaml.patch | 2 +- .../grafana/configmaps-datasources.yaml.patch | 11 +- .../alertmanager-overview.yaml.patch | 20 ++ .../dashboards-1.14/apiserver.yaml.patch | 11 +- .../dashboards-1.14/cluster-total.yaml.patch | 20 +- .../controller-manager.yaml.patch | 21 +- .../grafana/dashboards-1.14/etcd.yaml.patch | 9 +- .../dashboards-1.14/k8s-coredns.yaml.patch | 11 +- .../k8s-resources-cluster.yaml.patch | 92 ++++++- .../k8s-resources-namespace.yaml.patch | 47 +++- .../k8s-resources-node.yaml.patch | 11 +- .../k8s-resources-pod.yaml.patch | 11 +- .../k8s-resources-workload.yaml.patch | 38 ++- ...s-resources-workloads-namespace.yaml.patch | 38 ++- .../dashboards-1.14/kubelet.yaml.patch | 81 +++++- .../namespace-by-pod.yaml.patch | 20 +- .../namespace-by-workload.yaml.patch | 20 +- .../node-cluster-rsrc-use.yaml.patch | 11 +- .../dashboards-1.14/node-rsrc-use.yaml.patch | 11 +- .../grafana/dashboards-1.14/nodes.yaml.patch | 11 +- .../persistentvolumesusage.yaml.patch | 11 +- .../dashboards-1.14/pod-total.yaml.patch | 20 +- .../prometheus-remote-write.yaml.patch | 11 +- .../dashboards-1.14/prometheus.yaml.patch | 29 ++- .../grafana/dashboards-1.14/proxy.yaml.patch | 10 +- .../dashboards-1.14/scheduler.yaml.patch | 19 +- .../dashboards-1.14/statefulset.yaml.patch | 10 +- .../dashboards-1.14/workload-total.yaml.patch | 11 +- .../grafana/servicemonitor.yaml.patch | 20 ++ .../ingressThanosSidecar.yaml.patch | 10 + .../prometheus/prometheus.yaml.patch | 37 ++- .../serviceThanosSidecar.yaml.patch | 15 ++ .../serviceThanosSidecarExternal.yaml.patch | 15 ++ .../generated-changes/patch/values.yaml.patch | 232 +++++++++++++++--- 42 files changed, 1064 insertions(+), 88 deletions(-) create mode 100644 packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/servicemonitorThanosSidecar.yaml create mode 100644 packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/alertmanager-overview.yaml.patch create mode 100644 packages/rancher-monitoring/generated-changes/patch/templates/grafana/servicemonitor.yaml.patch create mode 100644 packages/rancher-monitoring/generated-changes/patch/templates/prometheus/ingressThanosSidecar.yaml.patch create mode 100644 packages/rancher-monitoring/generated-changes/patch/templates/prometheus/serviceThanosSidecar.yaml.patch create mode 100644 packages/rancher-monitoring/generated-changes/patch/templates/prometheus/serviceThanosSidecarExternal.yaml.patch diff --git a/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/servicemonitorThanosSidecar.yaml b/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/servicemonitorThanosSidecar.yaml new file mode 100644 index 000000000..580142553 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/servicemonitorThanosSidecar.yaml @@ -0,0 +1,41 @@ +{{- if and .Values.prometheus.thanosService.enabled .Values.prometheus.thanosServiceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ template "kube-prometheus-stack.fullname" . }}-thanos-discovery + namespace: {{ template "kube-prometheus-stack.namespace" . }} + labels: + app: {{ template "kube-prometheus-stack.name" . }}-thanos-discovery +{{ include "kube-prometheus-stack.labels" . | indent 4 }} +spec: + selector: + matchLabels: + app: {{ template "kube-prometheus-stack.name" . }}-thanos-discovery + release: {{ $.Release.Name | quote }} + namespaceSelector: + matchNames: + - {{ printf "%s" (include "kube-prometheus-stack.namespace" .) | quote }} + endpoints: + - port: {{ .Values.prometheus.thanosService.httpPortName }} + {{- if .Values.prometheus.thanosServiceMonitor.interval }} + interval: {{ .Values.prometheus.thanosServiceMonitor.interval }} + {{- end }} + {{- if .Values.prometheus.thanosServiceMonitor.scheme }} + scheme: {{ .Values.prometheus.thanosServiceMonitor.scheme }} + {{- end }} + {{- if .Values.prometheus.thanosServiceMonitor.tlsConfig }} + tlsConfig: {{ toYaml .Values.prometheus.thanosServiceMonitor.tlsConfig | nindent 6 }} + {{- end }} + {{- if .Values.prometheus.thanosServiceMonitor.bearerTokenFile }} + bearerTokenFile: {{ .Values.prometheus.thanosServiceMonitor.bearerTokenFile }} + {{- end }} + path: "/metrics" +{{- if .Values.prometheus.thanosServiceMonitor.metricRelabelings }} + metricRelabelings: +{{ tpl (toYaml .Values.prometheus.thanosServiceMonitor.metricRelabelings | indent 6) . }} +{{- end }} +{{- if .Values.prometheus.thanosServiceMonitor.relabelings }} + relabelings: +{{ toYaml .Values.prometheus.thanosServiceMonitor.relabelings | indent 6 }} +{{- end }} +{{- end }} diff --git a/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch index 9978235ca..dfdaa026b 100644 --- a/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch @@ -24,7 +24,7 @@ +sources: + - https://github.com/prometheus-community/helm-charts + - https://github.com/prometheus-operator/kube-prometheus -+version: 18.0.0 ++version: 19.0.0 +appVersion: 0.50.0 +kubeVersion: ">=1.16.0-0" +home: https://github.com/prometheus-operator/kube-prometheus diff --git a/packages/rancher-monitoring/generated-changes/patch/README.md.patch b/packages/rancher-monitoring/generated-changes/patch/README.md.patch index 61eb31f94..7344d6ad0 100644 --- a/packages/rancher-monitoring/generated-changes/patch/README.md.patch +++ b/packages/rancher-monitoring/generated-changes/patch/README.md.patch @@ -1,6 +1,42 @@ --- charts-original/README.md +++ charts/README.md -@@ -222,7 +222,39 @@ +@@ -83,7 +83,13 @@ + + A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. + ++### From 18.x to 19.x ++ ++`kubeStateMetrics.serviceMonitor.namespaceOverride` was removed. ++Please use `kube-state-metrics.namespaceOverride` instead. ++ + ### From 17.x to 18.x ++ + Version 18 upgrades prometheus-operator from 0.49.x to 0.50.x. Helm does not automatically upgrade or install new CRDs on a chart upgrade, so you have to install the CRDs manually before updating: + + ```console +@@ -98,6 +104,7 @@ + ``` + + ### From 16.x to 17.x ++ + Version 17 upgrades prometheus-operator from 0.48.x to 0.49.x. Helm does not automatically upgrade or install new CRDs on a chart upgrade, so you have to install the CRDs manually before updating: + + ```console +@@ -111,11 +118,12 @@ + kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.49.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml + ``` + +- + ### From 15.x to 16.x ++ + Version 16 upgrades kube-state-metrics to v2.0.0. This includes changed command-line arguments and removed metrics, see this [blog post](https://kubernetes.io/blog/2021/04/13/kube-state-metrics-v-2-0/). This version also removes Grafana dashboards that supported Kubernetes 1.14 or earlier. + + ### From 14.x to 15.x ++ + Version 15 upgrades prometheus-operator from 0.46.x to 0.47.x. Helm does not automatically upgrade or install new CRDs on a chart upgrade, so you have to install the CRDs manually before updating: + + ```console +@@ -222,7 +230,39 @@ helm show values prometheus-community/kube-prometheus-stack ``` diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rancher-monitoring/generated-changes/patch/templates/_helpers.tpl.patch index 3629a5519..d4742bc65 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/_helpers.tpl.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/_helpers.tpl.patch @@ -140,3 +140,43 @@ app.kubernetes.io/part-of: {{ template "kube-prometheus-stack.name" . }} chart: {{ template "kube-prometheus-stack.chartref" . }} release: {{ $.Release.Name | quote }} +@@ -96,6 +223,39 @@ + {{- end -}} + {{- end -}} + ++{{/* ++Use the grafana namespace override for multi-namespace deployments in combined charts ++*/}} ++{{- define "kube-prometheus-stack-grafana.namespace" -}} ++ {{- if .Values.grafana.namespaceOverride -}} ++ {{- .Values.grafana.namespaceOverride -}} ++ {{- else -}} ++ {{- .Release.Namespace -}} ++ {{- end -}} ++{{- end -}} ++ ++{{/* ++Use the kube-state-metrics namespace override for multi-namespace deployments in combined charts ++*/}} ++{{- define "kube-prometheus-stack-kube-state-metrics.namespace" -}} ++ {{- if index .Values "kube-state-metrics" "namespaceOverride" -}} ++ {{- index .Values "kube-state-metrics" "namespaceOverride" -}} ++ {{- else -}} ++ {{- .Release.Namespace -}} ++ {{- end -}} ++{{- end -}} ++ ++{{/* ++Use the prometheus-node-exporter namespace override for multi-namespace deployments in combined charts ++*/}} ++{{- define "kube-prometheus-stack-prometheus-node-exporter.namespace" -}} ++ {{- if index .Values "prometheus-node-exporter" "namespaceOverride" -}} ++ {{- index .Values "prometheus-node-exporter" "namespaceOverride" -}} ++ {{- else -}} ++ {{- .Release.Namespace -}} ++ {{- end -}} ++{{- end -}} ++ + {{/* Allow KubeVersion to be overridden. */}} + {{- define "kube-prometheus-stack.kubeVersion" -}} + {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride -}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/alertmanager/alertmanager.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/alertmanager/alertmanager.yaml.patch index 98457ddbe..15eef3e4a 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/alertmanager/alertmanager.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/alertmanager/alertmanager.yaml.patch @@ -24,8 +24,12 @@ {{ toYaml .Values.alertmanager.alertmanagerSpec.nodeSelector | indent 4 }} {{- end }} paused: {{ .Values.alertmanager.alertmanagerSpec.paused }} -@@ -104,8 +106,8 @@ - - {key: prometheus, operator: In, values: [{{ template "kube-prometheus-stack.fullname" . }}-alertmanager]} +@@ -101,11 +103,11 @@ + labelSelector: + matchExpressions: + - {key: app, operator: In, values: [alertmanager]} +- - {key: prometheus, operator: In, values: [{{ template "kube-prometheus-stack.fullname" . }}-alertmanager]} ++ - {key: alertmanager, operator: In, values: [{{ template "kube-prometheus-stack.fullname" . }}-alertmanager]} {{- end }} {{- end }} + tolerations: {{ include "linux-node-tolerations" . | nindent 4 }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/alertmanager/secret.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/alertmanager/secret.yaml.patch index bc412ea90..2b4fcccd4 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/alertmanager/secret.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/alertmanager/secret.yaml.patch @@ -20,7 +20,18 @@ {{ toYaml .Values.alertmanager.secret.annotations | indent 4 }} {{- end }} labels: -@@ -20,4 +26,4 @@ +@@ -13,11 +19,15 @@ + {{ include "kube-prometheus-stack.labels" . | indent 4 }} + data: + {{- if .Values.alertmanager.tplConfig }} ++{{- if eq (typeOf .Values.alertmanager.config) "string" }} ++ alertmanager.yaml: {{ tpl (.Values.alertmanager.config) . | b64enc | quote }} ++{{- else }} + alertmanager.yaml: {{ tpl (toYaml .Values.alertmanager.config) . | b64enc | quote }} ++{{- end }} + {{- else }} + alertmanager.yaml: {{ toYaml .Values.alertmanager.config | b64enc | quote }} + {{- end}} {{- range $key, $val := .Values.alertmanager.templateFiles }} {{ $key }}: {{ $val | b64enc | quote }} {{- end }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch index 84957f7d7..8f033ef4f 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch @@ -1,6 +1,14 @@ --- charts-original/templates/exporters/kube-state-metrics/serviceMonitor.yaml +++ charts/templates/exporters/kube-state-metrics/serviceMonitor.yaml -@@ -10,7 +10,7 @@ +@@ -3,21 +3,24 @@ + kind: ServiceMonitor + metadata: + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-state-metrics +- namespace: {{ template "kube-prometheus-stack.namespace" . }} ++ namespace: {{ template "kube-prometheus-stack-kube-state-metrics.namespace" . }} + labels: + app: {{ template "kube-prometheus-stack.name" . }}-kube-state-metrics + {{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: jobLabel: app.kubernetes.io/name endpoints: @@ -9,3 +17,36 @@ {{- if .Values.kubeStateMetrics.serviceMonitor.interval }} interval: {{ .Values.kubeStateMetrics.serviceMonitor.interval }} {{- end }} ++ {{- if .Values.kubeStateMetrics.serviceMonitor.scrapeTimeout }} ++ scrapeTimeout: {{ .Values.kubeStateMetrics.serviceMonitor.scrapeTimeout }} ++ {{- end }} + {{- if .Values.kubeStateMetrics.serviceMonitor.proxyUrl }} + proxyUrl: {{ .Values.kubeStateMetrics.serviceMonitor.proxyUrl}} + {{- end }} +- honorLabels: true ++ honorLabels: {{ .Values.kubeStateMetrics.serviceMonitor.honorLabels }} + {{- if .Values.kubeStateMetrics.serviceMonitor.metricRelabelings }} + metricRelabelings: + {{ tpl (toYaml .Values.kubeStateMetrics.serviceMonitor.metricRelabelings | indent 4) . }} +@@ -34,7 +37,7 @@ + {{- if .Values.kubeStateMetrics.serviceMonitor.proxyUrl }} + proxyUrl: {{ .Values.kubeStateMetrics.serviceMonitor.proxyUrl}} + {{- end }} +- honorLabels: true ++ honorLabels: {{ .Values.kubeStateMetrics.serviceMonitor.honorLabels }} + {{- if .Values.kubeStateMetrics.serviceMonitor.metricRelabelings }} + metricRelabelings: + {{ tpl (toYaml .Values.kubeStateMetrics.serviceMonitor.metricRelabelings | indent 4) . }} +@@ -44,11 +47,9 @@ + {{ toYaml .Values.kubeStateMetrics.serviceMonitor.relabelings | indent 4 }} + {{- end }} + {{- end }} +-{{- if .Values.kubeStateMetrics.serviceMonitor.namespaceOverride }} + namespaceSelector: + matchNames: +- - {{ .Values.kubeStateMetrics.serviceMonitor.namespaceOverride }} +-{{- end }} ++ - {{ printf "%s" (include "kube-prometheus-stack-kube-state-metrics.namespace" .) | quote }} + selector: + matchLabels: + {{- if .Values.kubeStateMetrics.serviceMonitor.selectorOverride }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/node-exporter/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/node-exporter/servicemonitor.yaml.patch index ea2734462..193fb9c58 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/node-exporter/servicemonitor.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/node-exporter/servicemonitor.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/templates/exporters/node-exporter/servicemonitor.yaml +++ charts/templates/exporters/node-exporter/servicemonitor.yaml -@@ -1,4 +1,7 @@ +@@ -1,9 +1,12 @@ -{{- if .Values.nodeExporter.enabled }} +{{- if (and (not .Values.nodeExporter.enabled) .Values.hardenedNodeExporter.enabled) }} +{{ required "Cannot set .Values.hardenedNodeExporter.enabled=true when .Values.nodeExporter.enabled=false" "" }} @@ -9,3 +9,22 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: + name: {{ template "kube-prometheus-stack.fullname" . }}-node-exporter +- namespace: {{ template "kube-prometheus-stack.namespace" . }} ++ namespace: {{ template "kube-prometheus-stack-prometheus-node-exporter.namespace" . }} + labels: + app: {{ template "kube-prometheus-stack.name" . }}-node-exporter + {{ include "kube-prometheus-stack.labels" . | indent 4 }} +@@ -13,11 +16,9 @@ + matchLabels: + app: prometheus-node-exporter + release: {{ $.Release.Name }} +- {{- if (index .Values "prometheus-node-exporter" "namespaceOverride") }} + namespaceSelector: + matchNames: +- - {{ index .Values "prometheus-node-exporter" "namespaceOverride" }} +- {{- end }} ++ - {{ printf "%s" (include "kube-prometheus-stack-prometheus-node-exporter.namespace" .) | quote }} + endpoints: + - port: metrics + {{- if .Values.nodeExporter.serviceMonitor.interval }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/configmap-dashboards.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/configmap-dashboards.yaml.patch index ebe82603c..85b4d0570 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/configmap-dashboards.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/configmap-dashboards.yaml.patch @@ -5,7 +5,7 @@ metadata: name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus-stack.namespace" $ }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" $ }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/configmaps-datasources.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/configmaps-datasources.yaml.patch index 149de4213..84d762518 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/configmaps-datasources.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/configmaps-datasources.yaml.patch @@ -5,7 +5,16 @@ metadata: name: {{ template "kube-prometheus-stack.fullname" . }}-grafana-datasource - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ default .Values.grafana.sidecar.datasources.searchNamespace (include "kube-prometheus-stack.namespace" .) }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} {{- if .Values.grafana.sidecar.datasources.annotations }} annotations: {{ toYaml .Values.grafana.sidecar.datasources.annotations | indent 4 }} +@@ -23,7 +23,7 @@ + {{- if .Values.grafana.sidecar.datasources.url }} + url: {{ .Values.grafana.sidecar.datasources.url }} + {{- else }} +- url: http://{{ template "kube-prometheus-stack.fullname" . }}-prometheus:{{ .Values.prometheus.service.port }}/{{ trimPrefix "/" .Values.prometheus.prometheusSpec.routePrefix }} ++ url: http://{{ template "kube-prometheus-stack.fullname" . }}-prometheus.{{ template "kube-prometheus-stack.namespace" . }}:{{ .Values.prometheus.service.port }}/{{ trimPrefix "/" .Values.prometheus.prometheusSpec.routePrefix }} + {{- end }} + access: proxy + isDefault: true diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/alertmanager-overview.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/alertmanager-overview.yaml.patch new file mode 100644 index 000000000..4e27e6efd --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/alertmanager-overview.yaml.patch @@ -0,0 +1,20 @@ +--- charts-original/templates/grafana/dashboards-1.14/alertmanager-overview.yaml ++++ charts/templates/grafana/dashboards-1.14/alertmanager-overview.yaml +@@ -8,7 +8,7 @@ + apiVersion: v1 + kind: ConfigMap + metadata: +- namespace: {{ template "kube-prometheus-stack.namespace" . }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "alertmanager-overview" | trunc 63 | trimSuffix "-" }} + annotations: + {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -602,7 +602,7 @@ + "30d" + ] + }, +- "timezone": "utc", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Alertmanager / Overview", + "uid": "alertmanager-overview", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/apiserver.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/apiserver.yaml.patch index 6a2e763ec..e398ef20e 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/apiserver.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/apiserver.yaml.patch @@ -5,7 +5,16 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "apiserver" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -1739,7 +1739,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / API server", + "uid": "09ec8aa1e996d6ffcd6817bbaff4db1b", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/cluster-total.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/cluster-total.yaml.patch index 6355241d7..528b5f24f 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/cluster-total.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/cluster-total.yaml.patch @@ -5,7 +5,25 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "cluster-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -1831,7 +1831,7 @@ + "options": [ + + ], +- "query": "label_values(kube_pod_info, cluster)", ++ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)", + "refresh": 2, + "regex": "", + "sort": 0, +@@ -1874,7 +1874,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Networking / Cluster", + "uid": "ff635a025bcfea7bc3dd4f508990a3e9", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/controller-manager.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/controller-manager.yaml.patch index c12f208c0..a7b9875b0 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/controller-manager.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/controller-manager.yaml.patch @@ -11,7 +11,7 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "controller-manager" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} @@ -133,16 +133,31 @@ "format": "time_series", "intervalFactor": 2, "legendFormat": "{{`{{`}}instance{{`}}`}}", +@@ -1100,7 +1105,7 @@ + "options": [ + + ], +- "query": "label_values(kube_pod_info, cluster)", ++ "query": "label_values(up{job=\"kube-controller-manager\"}, cluster)", + "refresh": 2, + "regex": "", + "sort": 1, @@ -1126,7 +1131,7 @@ "options": [ ], - "query": "label_values(process_cpu_seconds_total{cluster=\"$cluster\", job=\"kube-controller-manager\"}, instance)", -+ "query": "label_values(process_cpu_seconds_total{cluster=\"$cluster\", job=\"{{ include "exporter.kubeControllerManager.jobName" . }}\"}, instance)", ++ "query": "label_values(up{cluster=\"$cluster\", job=\"kube-controller-manager\"}, instance)", "refresh": 2, "regex": "", "sort": 1, -@@ -1174,4 +1179,5 @@ +@@ -1169,9 +1174,10 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Controller Manager", "uid": "72e0e05bef5099e5f049b05fdc429ed4", "version": 0 } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/etcd.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/etcd.yaml.patch index 2d2b35a18..44a5aee9e 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/etcd.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/etcd.yaml.patch @@ -11,11 +11,16 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} -@@ -1113,4 +1114,5 @@ +@@ -1109,8 +1110,9 @@ + "30d" + ] + }, +- "timezone": "browser", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", "title": "etcd", "version": 215 } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-coredns.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-coredns.yaml.patch index 35ee92b1b..51e64d34c 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-coredns.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-coredns.yaml.patch @@ -5,7 +5,16 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-coredns" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -1523,7 +1523,7 @@ + "1d" + ] + }, +- "timezone": "utc", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "CoreDNS", + "uid": "vkQ0UHxik", + "version": 2 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml.patch index d5119291a..18d600443 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml.patch @@ -5,7 +5,97 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -708,7 +708,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to pods", +- "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", ++ "linkUrl": "/d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", + "pattern": "Value #A", + "thresholds": [ + +@@ -727,7 +727,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to workloads", +- "linkUrl": "./d/a87fb0d919ec0ea5f6543124e16c42a5/k8s-resources-workloads-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", ++ "linkUrl": "/d/a87fb0d919ec0ea5f6543124e16c42a5/k8s-resources-workloads-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", + "pattern": "Value #B", + "thresholds": [ + +@@ -841,7 +841,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to pods", +- "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", ++ "linkUrl": "/d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", + "pattern": "namespace", + "thresholds": [ + +@@ -1135,7 +1135,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to pods", +- "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", ++ "linkUrl": "/d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", + "pattern": "Value #A", + "thresholds": [ + +@@ -1154,7 +1154,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to workloads", +- "linkUrl": "./d/a87fb0d919ec0ea5f6543124e16c42a5/k8s-resources-workloads-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", ++ "linkUrl": "/d/a87fb0d919ec0ea5f6543124e16c42a5/k8s-resources-workloads-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", + "pattern": "Value #B", + "thresholds": [ + +@@ -1268,7 +1268,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to pods", +- "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", ++ "linkUrl": "/d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", + "pattern": "namespace", + "thresholds": [ + +@@ -1579,7 +1579,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to pods", +- "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", ++ "linkUrl": "/d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", + "pattern": "namespace", + "thresholds": [ + +@@ -2805,7 +2805,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to pods", +- "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", ++ "linkUrl": "/d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", + "pattern": "namespace", + "thresholds": [ + +@@ -2973,7 +2973,7 @@ + "options": [ + + ], +- "query": "label_values(node_cpu_seconds_total, cluster)", ++ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)", + "refresh": 2, + "regex": "", + "sort": 1, +@@ -3016,7 +3016,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Compute Resources / Cluster", + "uid": "efa86fd1d0c121a26444b636a3f509a8", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml.patch index 3ce475b39..76e516bf5 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml.patch @@ -5,7 +5,52 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -671,7 +671,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down", +- "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", ++ "linkUrl": "/d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", + "pattern": "pod", + "thresholds": [ + +@@ -1136,7 +1136,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down", +- "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", ++ "linkUrl": "/d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", + "pattern": "pod", + "thresholds": [ + +@@ -1456,7 +1456,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to pods", +- "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", ++ "linkUrl": "/d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", + "pattern": "pod", + "thresholds": [ + +@@ -2498,7 +2498,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to pods", +- "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", ++ "linkUrl": "/d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", + "pattern": "pod", + "thresholds": [ + +@@ -2736,7 +2736,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Compute Resources / Namespace (Pods)", + "uid": "85a562078cdf77779eaa1add43ccec1e", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-node.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-node.yaml.patch index 262ac9081..2144f4527 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-node.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-node.yaml.patch @@ -5,7 +5,16 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -970,7 +970,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Compute Resources / Node (Pods)", + "uid": "200ac8fdbfbb74b39aff88118e4d1c2c", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml.patch index 68241b00b..1bbd3cdb1 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml.patch @@ -5,7 +5,16 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -2419,7 +2419,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Compute Resources / Pod", + "uid": "6581e46e4e5c7ba40a07646395ef7b23", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml.patch index 5d91141fc..2b4dde207 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml.patch @@ -5,7 +5,43 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -286,7 +286,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down", +- "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", ++ "linkUrl": "/d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", + "pattern": "pod", + "thresholds": [ + +@@ -657,7 +657,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down", +- "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", ++ "linkUrl": "/d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", + "pattern": "pod", + "thresholds": [ + +@@ -950,7 +950,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down", +- "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", ++ "linkUrl": "/d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", + "pattern": "pod", + "thresholds": [ + +@@ -1978,7 +1978,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Compute Resources / Workload", + "uid": "a164a7f0339f99e89cea5cb47e9be617", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml.patch index 2f7abde96..ca981e458 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml.patch @@ -5,7 +5,43 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -342,7 +342,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down", +- "linkUrl": "./d/a164a7f0339f99e89cea5cb47e9be617/k8s-resources-workload?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-workload=$__cell&var-type=$__cell_2", ++ "linkUrl": "/d/a164a7f0339f99e89cea5cb47e9be617/k8s-resources-workload?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-workload=$__cell&var-type=$__cell_2", + "pattern": "workload", + "thresholds": [ + +@@ -797,7 +797,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down", +- "linkUrl": "./d/a164a7f0339f99e89cea5cb47e9be617/k8s-resources-workload?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-workload=$__cell&var-type=$__cell_2", ++ "linkUrl": "/d/a164a7f0339f99e89cea5cb47e9be617/k8s-resources-workload?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-workload=$__cell&var-type=$__cell_2", + "pattern": "workload", + "thresholds": [ + +@@ -1118,7 +1118,7 @@ + "link": true, + "linkTargetBlank": false, + "linkTooltip": "Drill down to pods", +- "linkUrl": "./d/a164a7f0339f99e89cea5cb47e9be617/k8s-resources-workload?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-workload=$__cell&var-type=$type", ++ "linkUrl": "/d/a164a7f0339f99e89cea5cb47e9be617/k8s-resources-workload?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-workload=$__cell&var-type=$type", + "pattern": "workload", + "thresholds": [ + +@@ -2143,7 +2143,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Compute Resources / Namespace (Workloads)", + "uid": "a87fb0d919ec0ea5f6543124e16c42a5", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/kubelet.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/kubelet.yaml.patch index 6748744e8..c6e2397e6 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/kubelet.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/kubelet.yaml.patch @@ -11,11 +11,80 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "kubelet" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} -@@ -2197,7 +2198,7 @@ +@@ -81,7 +82,8 @@ + ], + "fields": "", + "values": false +- } ++ }, ++ "textMode": "auto" + }, + "pluginVersion": "7", + "targets": [ +@@ -137,7 +139,8 @@ + ], + "fields": "", + "values": false +- } ++ }, ++ "textMode": "auto" + }, + "pluginVersion": "7", + "targets": [ +@@ -193,7 +196,8 @@ + ], + "fields": "", + "values": false +- } ++ }, ++ "textMode": "auto" + }, + "pluginVersion": "7", + "targets": [ +@@ -249,7 +253,8 @@ + ], + "fields": "", + "values": false +- } ++ }, ++ "textMode": "auto" + }, + "pluginVersion": "7", + "targets": [ +@@ -305,7 +310,8 @@ + ], + "fields": "", + "values": false +- } ++ }, ++ "textMode": "auto" + }, + "pluginVersion": "7", + "targets": [ +@@ -361,7 +367,8 @@ + ], + "fields": "", + "values": false +- } ++ }, ++ "textMode": "auto" + }, + "pluginVersion": "7", + "targets": [ +@@ -2171,7 +2178,7 @@ + "options": [ + + ], +- "query": "label_values(kube_pod_info, cluster)", ++ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics\"}, cluster)", + "refresh": 2, + "regex": "", + "sort": 1, +@@ -2197,7 +2204,7 @@ "options": [ ], @@ -24,7 +93,13 @@ "refresh": 2, "regex": "", "sort": 1, -@@ -2245,4 +2246,5 @@ +@@ -2240,9 +2247,10 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Kubelet", "uid": "3138fa155d5915769fbded898ac09fd9", "version": 0 } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-pod.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-pod.yaml.patch index e2e2d07d0..e8209db5b 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-pod.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-pod.yaml.patch @@ -5,7 +5,25 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.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 }} +@@ -1301,7 +1301,7 @@ + "options": [ + + ], +- "query": "label_values(kube_pod_info, cluster)", ++ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)", + "refresh": 2, + "regex": "", + "sort": 0, +@@ -1456,7 +1456,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Networking / Namespace (Pods)", + "uid": "8b7a8b326d7a6f1f04244066368c67af", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-workload.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-workload.yaml.patch index 35ebc6fcf..f69483ff3 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-workload.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/namespace-by-workload.yaml.patch @@ -5,7 +5,25 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "namespace-by-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -1541,7 +1541,7 @@ + "options": [ + + ], +- "query": "label_values(kube_pod_info, cluster)", ++ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)", + "refresh": 2, + "regex": "", + "sort": 0, +@@ -1728,7 +1728,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Networking / Namespace (Workload)", + "uid": "bbb2a765a623ae38130206c7d94a160f", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml.patch index cd85c57ef..a7d3fac57 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml.patch @@ -5,7 +5,16 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "node-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -1056,7 +1056,7 @@ + "30d" + ] + }, +- "timezone": "utc", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Node Exporter / USE Method / Cluster", + "version": 0 + } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-rsrc-use.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-rsrc-use.yaml.patch index f514e83ec..899a2a652 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-rsrc-use.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/node-rsrc-use.yaml.patch @@ -5,7 +5,16 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "node-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -1082,7 +1082,7 @@ + "30d" + ] + }, +- "timezone": "utc", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Node Exporter / USE Method / Node", + "version": 0 + } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/nodes.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/nodes.yaml.patch index 263330bc3..db85b64f4 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/nodes.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/nodes.yaml.patch @@ -5,7 +5,16 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -984,7 +984,7 @@ + "30d" + ] + }, +- "timezone": "utc", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Node Exporter / Nodes", + "version": 0 + } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml.patch index e7c77d5e0..fd9d78070 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml.patch @@ -5,7 +5,7 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} @@ -79,3 +79,12 @@ "refresh": 2, "regex": "", "sort": 1, +@@ -569,7 +569,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Persistent Volumes", + "uid": "919b92a8e8041bd567af9edab12c840c", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/pod-total.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/pod-total.yaml.patch index 96bbe5747..5c546d1d6 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/pod-total.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/pod-total.yaml.patch @@ -5,7 +5,25 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "pod-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -1033,7 +1033,7 @@ + "options": [ + + ], +- "query": "label_values(kube_pod_info, cluster)", ++ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)", + "refresh": 2, + "regex": "", + "sort": 0, +@@ -1220,7 +1220,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Networking / Pod", + "uid": "7a18067ce943a40ae25454675c19ff5c", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml.patch index dc6c3bd10..d16be569a 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml.patch @@ -5,7 +5,16 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "prometheus-remote-write" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -1663,7 +1663,7 @@ + "30d" + ] + }, +- "timezone": "browser", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Prometheus / Remote Write", + "version": 0 + } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus.yaml.patch index 0971545bb..361c8f544 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/prometheus.yaml.patch @@ -5,7 +5,34 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "prometheus" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -1156,7 +1156,7 @@ + "options": [ + + ], +- "query": "label_values(prometheus_build_info, job)", ++ "query": "label_values(prometheus_build_info{job=\"prometheus-k8s\",namespace=\"monitoring\"}, job)", + "refresh": 1, + "regex": "", + "sort": 2, +@@ -1184,7 +1184,7 @@ + "options": [ + + ], +- "query": "label_values(prometheus_build_info, instance)", ++ "query": "label_values(prometheus_build_info{job=~\"$job\"}, instance)", + "refresh": 1, + "regex": "", + "sort": 2, +@@ -1227,7 +1227,7 @@ + "30d" + ] + }, +- "timezone": "utc", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Prometheus / Overview", + "uid": "", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/proxy.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/proxy.yaml.patch index 3d47af0fe..5ae622a57 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/proxy.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/proxy.yaml.patch @@ -11,7 +11,7 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "proxy" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} @@ -151,7 +151,13 @@ "refresh": 2, "regex": "", "sort": 1, -@@ -1254,4 +1259,4 @@ +@@ -1249,9 +1254,9 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Proxy", "uid": "632e265de029684c40b21cb76bca4f94", "version": 0 } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/scheduler.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/scheduler.yaml.patch index 9467247f5..dc8c967e6 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/scheduler.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/scheduler.yaml.patch @@ -11,7 +11,7 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "scheduler" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} @@ -172,6 +172,15 @@ "format": "time_series", "intervalFactor": 2, "legendFormat": "{{`{{`}}instance{{`}}`}}", +@@ -1023,7 +1028,7 @@ + "options": [ + + ], +- "query": "label_values(kube_pod_info, cluster)", ++ "query": "label_values(up{job=\"kube-scheduler\"}, cluster)", + "refresh": 2, + "regex": "", + "sort": 1, @@ -1049,7 +1054,7 @@ "options": [ @@ -181,7 +190,13 @@ "refresh": 2, "regex": "", "sort": 1, -@@ -1097,4 +1102,5 @@ +@@ -1092,9 +1097,10 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Scheduler", "uid": "2e6b6a3b4bddf1427b3a55aa1311c656", "version": 0 } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/statefulset.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/statefulset.yaml.patch index a607cdf2e..1611a156f 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/statefulset.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/statefulset.yaml.patch @@ -5,7 +5,7 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} @@ -36,7 +36,13 @@ "format": "time_series", "intervalFactor": 2, "legendFormat": "", -@@ -925,4 +925,4 @@ +@@ -920,9 +920,9 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / StatefulSets", "uid": "a31c1f46e6f727cb37c0d731a7245005", "version": 0 } diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/workload-total.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/workload-total.yaml.patch index b8a643abd..0ac7b30a8 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/workload-total.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/workload-total.yaml.patch @@ -5,7 +5,16 @@ kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus-stack.namespace" . }} -+ namespace: {{ .Values.grafana.defaultDashboards.namespace }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "workload-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} +@@ -1430,7 +1430,7 @@ + "30d" + ] + }, +- "timezone": "UTC", ++ "timezone": "{{ .Values.grafana.defaultDashboardsTimezone }}", + "title": "Kubernetes / Networking / Workload", + "uid": "728bf77cc1166d2f3133bf25846876cc", + "version": 0 diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/grafana/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/servicemonitor.yaml.patch new file mode 100644 index 000000000..ffaa0c53d --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/grafana/servicemonitor.yaml.patch @@ -0,0 +1,20 @@ +--- charts-original/templates/grafana/servicemonitor.yaml ++++ charts/templates/grafana/servicemonitor.yaml +@@ -3,7 +3,7 @@ + kind: ServiceMonitor + metadata: + name: {{ template "kube-prometheus-stack.fullname" . }}-grafana +- namespace: {{ template "kube-prometheus-stack.namespace" . }} ++ namespace: {{ template "kube-prometheus-stack-grafana.namespace" . }} + labels: + app: {{ template "kube-prometheus-stack.name" . }}-grafana + {{ include "kube-prometheus-stack.labels" . | indent 4 }} +@@ -14,7 +14,7 @@ + app.kubernetes.io/instance: {{ $.Release.Name | quote }} + namespaceSelector: + matchNames: +- - {{ printf "%s" (include "kube-prometheus-stack.namespace" .) | quote }} ++ - {{ printf "%s" (include "kube-prometheus-stack-grafana.namespace" .) | quote }} + endpoints: + - port: {{ .Values.grafana.service.portName }} + {{- if .Values.grafana.serviceMonitor.interval }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/ingressThanosSidecar.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/ingressThanosSidecar.yaml.patch new file mode 100644 index 000000000..ab71a25c5 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/ingressThanosSidecar.yaml.patch @@ -0,0 +1,10 @@ +--- charts-original/templates/prometheus/ingressThanosSidecar.yaml ++++ charts/templates/prometheus/ingressThanosSidecar.yaml +@@ -71,6 +71,6 @@ + {{- end -}} + {{- if .Values.prometheus.thanosIngress.tls }} + tls: +-{{ toYaml .Values.prometheus.thanosIngress.tls | indent 4 }} ++{{ tpl (toYaml .Values.prometheus.thanosIngress.tls | indent 4) . }} + {{- end -}} + {{- end -}} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/prometheus.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/prometheus.yaml.patch index 40ddcc60b..d3ec4604b 100644 --- a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/prometheus.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/prometheus.yaml.patch @@ -1,15 +1,23 @@ --- charts-original/templates/prometheus/prometheus.yaml +++ charts/templates/prometheus/prometheus.yaml -@@ -32,7 +32,7 @@ +@@ -32,7 +32,15 @@ {{ toYaml .Values.prometheus.prometheusSpec.apiserverConfig | indent 4}} {{- end }} {{- if .Values.prometheus.prometheusSpec.image }} - image: {{ .Values.prometheus.prometheusSpec.image.repository }}:{{ .Values.prometheus.prometheusSpec.image.tag }} -+ image: {{ template "system_default_registry" . }}{{ .Values.prometheus.prometheusSpec.image.repository }}:{{ .Values.prometheus.prometheusSpec.image.tag }} ++ {{- if and .Values.prometheus.prometheusSpec.image.tag .Values.prometheus.prometheusSpec.image.sha }} ++ image: "{{ .Values.prometheus.prometheusSpec.image.repository }}:{{ .Values.prometheus.prometheusSpec.image.tag }}@sha256:{{ .Values.prometheus.prometheusSpec.image.sha }}" ++ {{- else if .Values.prometheus.prometheusSpec.image.sha }} ++ image: "{{ .Values.prometheus.prometheusSpec.image.repository }}@sha256:{{ .Values.prometheus.prometheusSpec.image.sha }}" ++ {{- else if .Values.prometheus.prometheusSpec.image.tag }} ++ image: "{{ .Values.prometheus.prometheusSpec.image.repository }}:{{ .Values.prometheus.prometheusSpec.image.tag }}" ++ {{- else }} ++ image: "{{ .Values.prometheus.prometheusSpec.image.repository }}" ++ {{- end }} version: {{ .Values.prometheus.prometheusSpec.image.tag }} {{- if .Values.prometheus.prometheusSpec.image.sha }} sha: {{ .Values.prometheus.prometheusSpec.image.sha }} -@@ -56,11 +56,13 @@ +@@ -56,11 +64,13 @@ externalUrl: "{{ tpl .Values.prometheus.prometheusSpec.externalUrl . }}" {{- else if and .Values.prometheus.ingress.enabled .Values.prometheus.ingress.hosts }} externalUrl: "http://{{ tpl (index .Values.prometheus.ingress.hosts 0) . }}{{ .Values.prometheus.prometheusSpec.routePrefix }}" @@ -24,7 +32,7 @@ {{ toYaml .Values.prometheus.prometheusSpec.nodeSelector | indent 4 }} {{- end }} paused: {{ .Values.prometheus.prometheusSpec.paused }} -@@ -236,8 +238,8 @@ +@@ -236,8 +246,8 @@ - {key: prometheus, operator: In, values: [{{ template "kube-prometheus-stack.fullname" . }}-prometheus]} {{- end }} {{- end }} @@ -34,7 +42,7 @@ {{ toYaml .Values.prometheus.prometheusSpec.tolerations | indent 4 }} {{- end }} {{- if .Values.prometheus.prometheusSpec.topologySpreadConstraints }} -@@ -276,7 +278,7 @@ +@@ -276,7 +286,7 @@ {{- end }} {{- if .Values.prometheus.prometheusSpec.containers }} containers: @@ -43,7 +51,7 @@ {{- end }} {{- if .Values.prometheus.prometheusSpec.initContainers }} initContainers: -@@ -292,6 +294,7 @@ +@@ -292,6 +302,7 @@ {{- if .Values.prometheus.prometheusSpec.disableCompaction }} disableCompaction: {{ .Values.prometheus.prometheusSpec.disableCompaction }} {{- end }} @@ -51,7 +59,22 @@ portName: {{ .Values.prometheus.prometheusSpec.portName }} {{- end }} {{- if .Values.prometheus.prometheusSpec.volumes }} -@@ -336,3 +339,4 @@ +@@ -333,6 +344,19 @@ + {{- if .Values.prometheus.prometheusSpec.enforcedSampleLimit }} + enforcedSampleLimit: {{ .Values.prometheus.prometheusSpec.enforcedSampleLimit }} + {{- end }} ++{{- if .Values.prometheus.prometheusSpec.enforcedTargetLimit }} ++ enforcedTargetLimit: {{ .Values.prometheus.prometheusSpec.enforcedTargetLimit }} ++{{- end }} ++{{- if .Values.prometheus.prometheusSpec.enforcedLabelLimit }} ++ enforcedLabelLimit: {{ .Values.prometheus.prometheusSpec.enforcedLabelLimit }} ++{{- end }} ++{{- if .Values.prometheus.prometheusSpec.enforcedLabelNameLengthLimit }} ++ enforcedLabelNameLengthLimit: {{ .Values.prometheus.prometheusSpec.enforcedLabelNameLengthLimit }} ++{{- end }} ++{{- if .Values.prometheus.prometheusSpec.enforcedLabelValueLengthLimit}} ++ enforcedLabelValueLengthLimit: {{ .Values.prometheus.prometheusSpec.enforcedLabelValueLengthLimit }} ++{{- end }} {{- if .Values.prometheus.prometheusSpec.allowOverlappingBlocks }} allowOverlappingBlocks: {{ .Values.prometheus.prometheusSpec.allowOverlappingBlocks }} {{- end }} diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/serviceThanosSidecar.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/serviceThanosSidecar.yaml.patch new file mode 100644 index 000000000..0157c2a1d --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/serviceThanosSidecar.yaml.patch @@ -0,0 +1,15 @@ +--- charts-original/templates/prometheus/serviceThanosSidecar.yaml ++++ charts/templates/prometheus/serviceThanosSidecar.yaml +@@ -24,6 +24,12 @@ + {{- if eq .Values.prometheus.thanosService.type "NodePort" }} + nodePort: {{ .Values.prometheus.thanosService.nodePort }} + {{- end }} ++ - name: {{ .Values.prometheus.thanosService.httpPortName }} ++ port: {{ .Values.prometheus.thanosService.httpPort }} ++ targetPort: {{ .Values.prometheus.thanosService.targetHttpPort }} ++ {{- if eq .Values.prometheus.thanosService.type "NodePort" }} ++ nodePort: {{ .Values.prometheus.thanosService.httpNodePort }} ++ {{- end }} + selector: + app.kubernetes.io/name: prometheus + prometheus: {{ template "kube-prometheus-stack.fullname" . }}-prometheus diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/serviceThanosSidecarExternal.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/serviceThanosSidecarExternal.yaml.patch new file mode 100644 index 000000000..8e3c16647 --- /dev/null +++ b/packages/rancher-monitoring/generated-changes/patch/templates/prometheus/serviceThanosSidecarExternal.yaml.patch @@ -0,0 +1,15 @@ +--- charts-original/templates/prometheus/serviceThanosSidecarExternal.yaml ++++ charts/templates/prometheus/serviceThanosSidecarExternal.yaml +@@ -31,6 +31,12 @@ + {{- if eq .Values.prometheus.thanosServiceExternal.type "NodePort" }} + nodePort: {{ .Values.prometheus.thanosServiceExternal.nodePort }} + {{- end }} ++ - name: {{ .Values.prometheus.thanosServiceExternal.httpPortName }} ++ port: {{ .Values.prometheus.thanosServiceExternal.httpPort }} ++ targetPort: {{ .Values.prometheus.thanosServiceExternal.targetHttpPort }} ++ {{- if eq .Values.prometheus.thanosServiceExternal.type "NodePort" }} ++ nodePort: {{ .Values.prometheus.thanosServiceExternal.httpNodePort }} ++ {{- end }} + selector: + app.kubernetes.io/name: prometheus + prometheus: {{ template "kube-prometheus-stack.fullname" . }}-prometheus diff --git a/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch index 47406f7c1..3bae7158a 100644 --- a/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch @@ -528,26 +528,24 @@ ## ForceDeployDatasources Create datasource configmap even if grafana deployment has been disabled ## forceDeployDatasources: false -@@ -635,6 +1102,18 @@ +@@ -631,10 +1098,15 @@ + ## + forceDeployDashboards: false + +- ## Deploy default dashboards. ++ ## Deploy default dashboards ## defaultDashboardsEnabled: true -+ # Additional options for defaultDashboards -+ defaultDashboards: -+ # The default namespace to place defaultDashboards within -+ namespace: cattle-dashboards -+ # Whether to create the default namespace as a Helm managed namespace or use an existing namespace -+ # If false, the defaultDashboards.namespace will be created as a Helm managed namespace -+ useExistingNamespace: false -+ # Whether the Helm managed namespace created by this chart should be left behind on a Helm uninstall -+ # If you place other dashboards in this namespace, then they will be deleted on a helm uninstall -+ # Ignore if useExistingNamespace is true -+ cleanupOnUninstall: false ++ ## Timezone for the default dashboards ++ ## Other options are: browser or a specific timezone, i.e. Europe/Luxembourg ++ ## ++ defaultDashboardsTimezone: utc + adminPassword: prom-operator ingress: -@@ -674,6 +1153,7 @@ +@@ -674,6 +1146,7 @@ dashboards: enabled: true label: grafana_dashboard @@ -555,7 +553,16 @@ ## Annotations for Grafana dashboard configmaps ## -@@ -730,7 +1210,60 @@ +@@ -683,6 +1156,8 @@ + enabled: false + etcd: + enabled: false ++ provider: ++ allowUiUpdates: false + datasources: + enabled: true + defaultDatasourceEnabled: true +@@ -730,7 +1205,60 @@ ## Passed to grafana subchart and used by servicemonitor below ## service: @@ -617,7 +624,7 @@ ## If true, create a serviceMonitor for grafana ## -@@ -760,6 +1293,14 @@ +@@ -760,6 +1288,14 @@ # targetLabel: nodename # replacement: $1 # action: replace @@ -632,7 +639,7 @@ ## Component scraping the kube api server ## -@@ -921,7 +1462,7 @@ +@@ -921,7 +1457,7 @@ ## Component scraping the kube controller manager ## kubeControllerManager: @@ -641,7 +648,7 @@ ## If your kube controller manager is not deployed as a pod, specify IPs it can be found on ## -@@ -1068,7 +1609,7 @@ +@@ -1068,7 +1604,7 @@ ## Component scraping etcd ## kubeEtcd: @@ -650,7 +657,7 @@ ## If your etcd is not deployed as a pod, specify IPs it can be found on ## -@@ -1133,7 +1674,7 @@ +@@ -1133,7 +1669,7 @@ ## Component scraping kube scheduler ## kubeScheduler: @@ -659,7 +666,7 @@ ## If your kube scheduler is not deployed as a pod, specify IPs it can be found on ## -@@ -1191,7 +1732,7 @@ +@@ -1191,7 +1727,7 @@ ## Component scraping kube proxy ## kubeProxy: @@ -668,7 +675,36 @@ ## If your kube proxy is not deployed as a pod, specify IPs it can be found on ## -@@ -1284,6 +1825,13 @@ +@@ -1245,15 +1781,15 @@ + ## Scrape interval. If not set, the Prometheus default scrape interval is used. + ## + interval: "" ++ ## Scrape Timeout. If not set, the Prometheus default scrape timeout is used. ++ ## ++ scrapeTimeout: "" + ## proxyUrl: URL of a proxy that should be used for scraping. + ## + proxyUrl: "" + ## Override serviceMonitor selector + ## + selectorOverride: {} +- ## Override namespace selector +- ## +- namespaceOverride: "" + + ## Metric relabel configs to apply to samples before ingestion. + ## +@@ -1272,6 +1808,9 @@ + # replacement: $1 + # action: replace + ++ # Keep labels from scraped data, overriding server-side labels ++ honorLabels: true ++ + # Enable self metrics configuration for Service Monitor + selfMonitor: + enabled: false +@@ -1284,6 +1823,13 @@ create: true podSecurityPolicy: enabled: true @@ -682,7 +718,7 @@ ## Deploy node exporter as a daemonset to all nodes ## -@@ -1337,6 +1885,16 @@ +@@ -1337,6 +1883,16 @@ extraArgs: - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+)($|/) - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$ @@ -699,7 +735,7 @@ ## Manages Prometheus and Alertmanager components ## -@@ -1349,8 +1907,8 @@ +@@ -1349,8 +1905,8 @@ enabled: true # Value must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants tlsMinVersion: VersionTLS13 @@ -710,16 +746,20 @@ ## Admission webhook support for PrometheusRules resources added in Prometheus Operator 0.30 can be enabled to prevent incorrectly formatted ## rules from making their way into prometheus and potentially preventing the container from starting -@@ -1367,7 +1925,7 @@ +@@ -1367,9 +1923,9 @@ patch: enabled: true image: - repository: jettech/kube-webhook-certgen -+ repository: rancher/mirrored-jettech-kube-webhook-certgen - tag: v1.5.2 - sha: "" +- tag: v1.5.2 +- sha: "" ++ repository: rancher-mirrored-k8s.gcr.io-ingress-nginx-kube-webhook-certgen ++ tag: v1.0 ++ sha: "f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068" pullPolicy: IfNotPresent -@@ -1516,13 +2074,13 @@ + resources: {} + ## Provide a priority class name to the webhook patching job +@@ -1516,13 +2072,13 @@ ## Resource limits & requests ## @@ -740,7 +780,7 @@ # Required for use in managed kubernetes clusters (such as AWS EKS) with custom CNI (such as calico), # because control-plane managed by AWS cannot communicate with pods' IP CIDR and admission webhooks are not working -@@ -1575,7 +2133,7 @@ +@@ -1575,7 +2131,7 @@ ## Prometheus-operator image ## image: @@ -749,7 +789,7 @@ tag: v0.50.0 sha: "" pullPolicy: IfNotPresent -@@ -1591,7 +2149,7 @@ +@@ -1591,7 +2147,7 @@ ## Prometheus-config-reloader image to use for config and rule reloading ## prometheusConfigReloaderImage: @@ -758,7 +798,92 @@ tag: v0.50.0 sha: "" -@@ -1686,7 +2244,7 @@ +@@ -1641,18 +2197,50 @@ + enabled: false + annotations: {} + labels: {} +- portName: grpc +- port: 10901 +- targetPort: "grpc" +- clusterIP: "None" + + ## Service type + ## + type: ClusterIP + +- ## Port to expose on each node ++ ## gRPC port config ++ portName: grpc ++ port: 10901 ++ targetPort: "grpc" ++ ++ ## HTTP port config (for metrics) ++ httpPortName: http ++ httpPort: 10902 ++ targetHttpPort: "http" ++ ++ ## ClusterIP to assign ++ # Default is to make this a headless service ("None") ++ clusterIP: "None" ++ ++ ## Port to expose on each node, if service type is NodePort + ## + nodePort: 30901 ++ httpNodePort: 30902 ++ ++ # ServiceMonitor to scrape Sidecar metrics ++ # Needs thanosService to be enabled as well ++ thanosServiceMonitor: ++ enabled: false ++ interval: "" ++ ++ ## scheme: HTTP scheme to use for scraping. Can be used with `tlsConfig` for example if using istio mTLS. ++ scheme: "" ++ ++ ## tlsConfig: TLS configuration to use when scraping the endpoint. For example if using istio mTLS. ++ ## Of type: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#tlsconfig ++ tlsConfig: {} ++ ++ bearerTokenFile: ++ ++ ## Metric relabel configs to apply to samples before ingestion. ++ metricRelabelings: [] ++ ++ ## relabel configs to apply to samples before ingestion. ++ relabelings: [] + + # Service for external access to sidecar + # Enabling this creates a service to expose thanos-sidecar outside the cluster. +@@ -1660,11 +2248,18 @@ + enabled: false + annotations: {} + labels: {} ++ loadBalancerIP: "" ++ loadBalancerSourceRanges: [] ++ ++ ## gRPC port config + portName: grpc + port: 10901 + targetPort: "grpc" +- loadBalancerIP: "" +- loadBalancerSourceRanges: [] ++ ++ ## HTTP port config (for metrics) ++ httpPortName: http ++ httpPort: 10902 ++ targetHttpPort: "http" + + ## Service type + ## +@@ -1673,6 +2268,7 @@ + ## Port to expose on each node + ## + nodePort: 30901 ++ httpNodePort: 30902 + + ## Configuration for Prometheus service + ## +@@ -1686,7 +2282,7 @@ port: 9090 ## To be used with a proxy extraContainer port @@ -767,7 +892,7 @@ ## List of IP addresses at which the Prometheus server service is available ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips -@@ -1959,7 +2517,7 @@ +@@ -1959,7 +2555,7 @@ ## Image of Prometheus. ## image: @@ -776,7 +901,7 @@ tag: v2.28.1 sha: "" -@@ -2022,6 +2580,11 @@ +@@ -2022,6 +2618,11 @@ ## externalUrl: "" @@ -788,7 +913,7 @@ ## Define which Nodes the Pods are scheduled on. ## ref: https://kubernetes.io/docs/user-guide/node-selection/ ## -@@ -2054,7 +2617,7 @@ +@@ -2054,7 +2655,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the PrometheusRule resources created ## @@ -797,7 +922,7 @@ ## PrometheusRules to be selected for target discovery. ## If {}, select all PrometheusRules -@@ -2079,7 +2642,7 @@ +@@ -2079,7 +2680,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the servicemonitors created ## @@ -806,7 +931,7 @@ ## ServiceMonitors to be selected for target discovery. ## If {}, select all ServiceMonitors -@@ -2102,7 +2665,7 @@ +@@ -2102,7 +2703,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the podmonitors created ## @@ -815,7 +940,7 @@ ## PodMonitors to be selected for target discovery. ## If {}, select all PodMonitors -@@ -2233,9 +2796,13 @@ +@@ -2233,9 +2834,13 @@ ## Resource limits & requests ## @@ -832,7 +957,7 @@ ## Prometheus StorageSpec for persistent data ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md -@@ -2258,7 +2825,13 @@ +@@ -2258,7 +2863,13 @@ # medium: Memory # Additional volumes on the output StatefulSet definition. @@ -847,7 +972,7 @@ # Additional VolumeMounts on the output StatefulSet definition. volumeMounts: [] -@@ -2373,6 +2946,11 @@ +@@ -2373,6 +2984,11 @@ ## thanos: {} @@ -859,7 +984,7 @@ ## Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to a Prometheus pod. ## if using proxy extraContainer update targetPort with proxy container port containers: [] -@@ -2383,7 +2961,7 @@ +@@ -2383,7 +2999,7 @@ ## PortName to use for Prometheus. ## @@ -868,3 +993,32 @@ ## ArbitraryFSAccessThroughSMs configures whether configuration based on a service monitor can access arbitrary files ## on the file system of the Prometheus container e.g. bearer token files. +@@ -2420,6 +3036,28 @@ + ## number of samples/series under the desired limit. Note that if SampleLimit is lower that value will be taken instead. + enforcedSampleLimit: false + ++ ## EnforcedTargetLimit defines a global limit on the number of scraped targets. This overrides any TargetLimit set ++ ## per ServiceMonitor or/and PodMonitor. It is meant to be used by admins to enforce the TargetLimit to keep the overall ++ ## number of targets under the desired limit. Note that if TargetLimit is lower, that value will be taken instead, except ++ ## if either value is zero, in which case the non-zero value will be used. If both values are zero, no limit is enforced. ++ enforcedTargetLimit: false ++ ++ ++ ## Per-scrape limit on number of labels that will be accepted for a sample. If more than this number of labels are present ++ ## post metric-relabeling, the entire scrape will be treated as failed. 0 means no limit. Only valid in Prometheus versions ++ ## 2.27.0 and newer. ++ enforcedLabelLimit: false ++ ++ ## Per-scrape limit on length of labels name that will be accepted for a sample. If a label name is longer than this number ++ ## post metric-relabeling, the entire scrape will be treated as failed. 0 means no limit. Only valid in Prometheus versions ++ ## 2.27.0 and newer. ++ enforcedLabelNameLengthLimit: false ++ ++ ## Per-scrape limit on length of labels value that will be accepted for a sample. If a label value is longer than this ++ ## number post metric-relabeling, the entire scrape will be treated as failed. 0 means no limit. Only valid in Prometheus ++ ## versions 2.27.0 and newer. ++ enforcedLabelValueLengthLimit: false ++ + ## AllowOverlappingBlocks enables vertical compaction and vertical query merge in Prometheus. This is still experimental + ## in Prometheus so it may change in any upcoming release. + allowOverlappingBlocks: false