mirror of https://git.rancher.io/charts
114 lines
7.4 KiB
Diff
114 lines
7.4 KiB
Diff
--- charts-original/templates/grafana/dashboards-1.14/k8s-resources-node.yaml
|
|
+++ charts/templates/grafana/dashboards-1.14/k8s-resources-node.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" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }}
|
|
annotations:
|
|
{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
|
|
@@ -321,7 +321,7 @@
|
|
"step": 10
|
|
},
|
|
{
|
|
- "expr": "sum(kube_pod_container_resource_requests_cpu_cores{cluster=\"$cluster\", node=~\"$node\"}) by (pod)",
|
|
+ "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\", resource=\"cpu\"}) by (pod)",
|
|
"format": "table",
|
|
"instant": true,
|
|
"intervalFactor": 2,
|
|
@@ -330,7 +330,7 @@
|
|
"step": 10
|
|
},
|
|
{
|
|
- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", node=~\"$node\"}) by (pod) / sum(kube_pod_container_resource_requests_cpu_cores{cluster=\"$cluster\", node=~\"$node\"}) by (pod)",
|
|
+ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", node=~\"$node\"}) by (pod) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\", resource=\"cpu\"}) by (pod)",
|
|
"format": "table",
|
|
"instant": true,
|
|
"intervalFactor": 2,
|
|
@@ -339,7 +339,7 @@
|
|
"step": 10
|
|
},
|
|
{
|
|
- "expr": "sum(kube_pod_container_resource_limits_cpu_cores{cluster=\"$cluster\", node=~\"$node\"}) by (pod)",
|
|
+ "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\", resource=\"cpu\"}) by (pod)",
|
|
"format": "table",
|
|
"instant": true,
|
|
"intervalFactor": 2,
|
|
@@ -348,7 +348,7 @@
|
|
"step": 10
|
|
},
|
|
{
|
|
- "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", node=~\"$node\"}) by (pod) / sum(kube_pod_container_resource_limits_cpu_cores{cluster=\"$cluster\", node=~\"$node\"}) by (pod)",
|
|
+ "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", node=~\"$node\"}) by (pod) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\", resource=\"cpu\"}) by (pod)",
|
|
"format": "table",
|
|
"instant": true,
|
|
"intervalFactor": 2,
|
|
@@ -749,7 +749,7 @@
|
|
"step": 10
|
|
},
|
|
{
|
|
- "expr": "sum(kube_pod_container_resource_requests_memory_bytes{cluster=\"$cluster\", node=~\"$node\"}) by (pod)",
|
|
+ "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\", resource=\"memory\"}) by (pod)",
|
|
"format": "table",
|
|
"instant": true,
|
|
"intervalFactor": 2,
|
|
@@ -758,7 +758,7 @@
|
|
"step": 10
|
|
},
|
|
{
|
|
- "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{cluster=\"$cluster\", node=~\"$node\",container!=\"\"}) by (pod) / sum(kube_pod_container_resource_requests_memory_bytes{node=~\"$node\"}) by (pod)",
|
|
+ "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{cluster=\"$cluster\", node=~\"$node\",container!=\"\"}) by (pod) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", node=~\"$node\", resource=\"memory\"}) by (pod)",
|
|
"format": "table",
|
|
"instant": true,
|
|
"intervalFactor": 2,
|
|
@@ -767,7 +767,7 @@
|
|
"step": 10
|
|
},
|
|
{
|
|
- "expr": "sum(kube_pod_container_resource_limits_memory_bytes{cluster=\"$cluster\", node=~\"$node\"}) by (pod)",
|
|
+ "expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\", resource=\"memory\"}) by (pod)",
|
|
"format": "table",
|
|
"instant": true,
|
|
"intervalFactor": 2,
|
|
@@ -776,7 +776,7 @@
|
|
"step": 10
|
|
},
|
|
{
|
|
- "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{cluster=\"$cluster\", node=~\"$node\",container!=\"\"}) by (pod) / sum(kube_pod_container_resource_limits_memory_bytes{node=~\"$node\"}) by (pod)",
|
|
+ "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{cluster=\"$cluster\", node=~\"$node\",container!=\"\"}) by (pod) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", node=~\"$node\", resource=\"memory\"}) by (pod)",
|
|
"format": "table",
|
|
"instant": true,
|
|
"intervalFactor": 2,
|
|
@@ -901,7 +901,7 @@
|
|
|
|
],
|
|
"query": "label_values(kube_pod_info, cluster)",
|
|
- "refresh": 1,
|
|
+ "refresh": 2,
|
|
"regex": "",
|
|
"sort": 1,
|
|
"tagValuesQuery": "",
|
|
@@ -928,7 +928,7 @@
|
|
|
|
],
|
|
"query": "label_values(kube_pod_info{cluster=\"$cluster\"}, node)",
|
|
- "refresh": 1,
|
|
+ "refresh": 2,
|
|
"regex": "",
|
|
"sort": 1,
|
|
"tagValuesQuery": "",
|
|
@@ -975,4 +975,4 @@
|
|
"uid": "200ac8fdbfbb74b39aff88118e4d1c2c",
|
|
"version": 0
|
|
}
|
|
-{{- end }}
|
|
\ No newline at end of file
|
|
+{{- end }}
|