mirror of https://git.rancher.io/charts
51 lines
4.0 KiB
Diff
51 lines
4.0 KiB
Diff
--- charts-original/templates/grafana/dashboards-1.14/statefulset.yaml
|
|
+++ charts/templates/grafana/dashboards-1.14/statefulset.yaml
|
|
@@ -4,11 +4,11 @@
|
|
https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack
|
|
*/ -}}
|
|
{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
|
|
-{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }}
|
|
+{{- if and (or .Values.grafana.enabled .Values.grafana.forceDeployDashboards) (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.defaultDashboardsEnabled }}
|
|
apiVersion: v1
|
|
kind: ConfigMap
|
|
metadata:
|
|
- namespace: {{ template "kube-prometheus-stack.namespace" . }}
|
|
+ namespace: {{ .Values.grafana.defaultDashboards.namespace }}
|
|
name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }}
|
|
annotations:
|
|
{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
|
|
@@ -106,7 +106,7 @@
|
|
"tableColumn": "",
|
|
"targets": [
|
|
{
|
|
- "expr": "sum(rate(container_cpu_usage_seconds_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", container!=\"\", namespace=\"$namespace\", pod=~\"$statefulset.*\"}[3m]))",
|
|
+ "expr": "sum(rate(container_cpu_usage_seconds_total{job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", container!=\"\", namespace=\"$namespace\", pod=~\"$statefulset.*\"}[3m]))",
|
|
"format": "time_series",
|
|
"intervalFactor": 2,
|
|
"legendFormat": "",
|
|
@@ -189,7 +189,7 @@
|
|
"tableColumn": "",
|
|
"targets": [
|
|
{
|
|
- "expr": "sum(container_memory_usage_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", container!=\"\", namespace=\"$namespace\", pod=~\"$statefulset.*\"}) / 1024^3",
|
|
+ "expr": "sum(container_memory_usage_bytes{job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", container!=\"\", namespace=\"$namespace\", pod=~\"$statefulset.*\"}) / 1024^3",
|
|
"format": "time_series",
|
|
"intervalFactor": 2,
|
|
"legendFormat": "",
|
|
@@ -272,7 +272,7 @@
|
|
"tableColumn": "",
|
|
"targets": [
|
|
{
|
|
- "expr": "sum(rate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$statefulset.*\"}[3m])) + sum(rate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"$statefulset.*\"}[3m]))",
|
|
+ "expr": "sum(rate(container_network_transmit_bytes_total{job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$statefulset.*\"}[3m])) + sum(rate(container_network_receive_bytes_total{job=\"{{ include "exporter.kubelet.jobName" . }}\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"$statefulset.*\"}[3m]))",
|
|
"format": "time_series",
|
|
"intervalFactor": 2,
|
|
"legendFormat": "",
|
|
@@ -925,4 +925,4 @@
|
|
"uid": "a31c1f46e6f727cb37c0d731a7245005",
|
|
"version": 0
|
|
}
|
|
-{{- end }}
|
|
\ No newline at end of file
|
|
+{{- end }}
|