diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index f75462139b70d5ad24c5fef83ab112760b269b89..88a61ac8e7ae43bdb88ac5f2a2ac8b56120ad98a 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "7c4b660febf68b4b0930f761c7c0a992330d3935"
+ "version": "94b30526f43d589912a38193b69dce19b4fa1893"
},
{
"name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": ""
}
},
- "version": "a16ec1d098eb45e7cfb44d7e4b73ba7b766f0e0a"
+ "version": "5525c8cc8a4a52d272bdaf481dd77b53a0c0f051"
},
{
"name": "grafonnet",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "24590e90dcfc9d581c4208b4bb3d15df50f1328e"
+ "version": "403b7d0120d2903d21854eae217b4e4863c454d1"
},
{
"name": "grafana",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "3546c4868cec93e1587471b42fd815684a7dd439"
+ "version": "4cd0bf8ea846a0d158761d55899f631eb2a423cf"
}
]
}
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 92fdc805e0c2a2afc2330bf9baa4e5ef9d069208..c4ff59b08abda47a658e0e7d1efaa711e7bc6357 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -60,7 +60,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "node:node_cpu_utilisation:avg1m * node:node_num_cpu:sum / scalar(sum(node:node_num_cpu:sum))",
+ "expr": "node:cluster_cpu_utilisation:ratio",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{node}}",
@@ -244,7 +244,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "node:node_memory_utilisation:ratio",
+ "expr": "node:cluster_memory_utilisation:ratio",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{node}}",
@@ -856,7 +856,7 @@ items:
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -908,7 +908,7 @@ items:
]
},
"timezone": "",
- "title": "K8s / USE Method / Cluster",
+ "title": "Kubernetes / USE Method / Cluster",
"uid": "a6e7d1362e1ddbb79db21d5bb40d7137",
"version": 0
}
@@ -1772,7 +1772,7 @@ items:
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -1851,7 +1851,7 @@ items:
]
},
"timezone": "",
- "title": "K8s / USE Method / Node",
+ "title": "Kubernetes / USE Method / Node",
"uid": "4ac4f123aae0ff6dbaf4f4f66120033b",
"version": 0
}
@@ -3127,7 +3127,7 @@ items:
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -3179,7 +3179,7 @@ items:
]
},
"timezone": "",
- "title": "K8s / Compute Resources / Cluster",
+ "title": "Kubernetes / Compute Resources / Cluster",
"uid": "efa86fd1d0c121a26444b636a3f509a8",
"version": 0
}
@@ -3939,7 +3939,7 @@ items:
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -4018,7 +4018,7 @@ items:
]
},
"timezone": "",
- "title": "K8s / Compute Resources / Namespace",
+ "title": "Kubernetes / Compute Resources / Namespace",
"uid": "85a562078cdf77779eaa1add43ccec1e",
"version": 0
}
@@ -4778,7 +4778,7 @@ items:
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -4884,7 +4884,7 @@ items:
]
},
"timezone": "",
- "title": "K8s / Compute Resources / Pod",
+ "title": "Kubernetes / Compute Resources / Pod",
"uid": "6581e46e4e5c7ba40a07646395ef7b23",
"version": 0
}
@@ -6124,7 +6124,7 @@ items:
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -6202,7 +6202,7 @@ items:
]
},
"timezone": "",
- "title": "Nodes",
+ "title": "Kubernetes / Nodes",
"uid": "fa49a4706d07a042595b664c87fb33ea",
"version": 0
}
@@ -6447,7 +6447,7 @@ items:
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -6551,7 +6551,7 @@ items:
]
},
"timezone": "",
- "title": "Persistent Volumes",
+ "title": "Kubernetes / Persistent Volumes",
"uid": "919b92a8e8041bd567af9edab12c840c",
"version": 0
}
@@ -6911,7 +6911,7 @@ items:
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -7041,7 +7041,7 @@ items:
]
},
"timezone": "",
- "title": "Pods",
+ "title": "Kubernetes / Pods",
"uid": "ab4f13a9892a76a4d21ce8c2445bf4ea",
"version": 0
}
@@ -7800,7 +7800,7 @@ items:
"schemaVersion": 14,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -7904,7 +7904,7 @@ items:
]
},
"timezone": "",
- "title": "StatefulSets",
+ "title": "Kubernetes / StatefulSets",
"uid": "a31c1f46e6f727cb37c0d731a7245005",
"version": 0
}
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index e0696adee62b7f69499bc643ce96446e5aa91951..19432b5f396f581aef94961720c5d8a71b1fd307 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -136,6 +136,13 @@ spec:
* on (namespace, pod) group_left(node)
node_namespace_pod:kube_pod_info:)
record: node:node_cpu_utilisation:avg1m
+ - expr: |
+ node:node_cpu_utilisation:avg1m
+ *
+ node:node_num_cpu:sum
+ /
+ scalar(sum(node:node_num_cpu:sum))
+ record: node:cluster_cpu_utilisation:ratio
- expr: |
sum(node_load1{job="node-exporter"})
/
@@ -179,8 +186,13 @@ spec:
- expr: |
(node:node_memory_bytes_total:sum - node:node_memory_bytes_available:sum)
/
- scalar(sum(node:node_memory_bytes_total:sum))
+ node:node_memory_bytes_total:sum
record: node:node_memory_utilisation:ratio
+ - expr: |
+ (node:node_memory_bytes_total:sum - node:node_memory_bytes_available:sum)
+ /
+ scalar(sum(node:node_memory_bytes_total:sum))
+ record: node:cluster_memory_utilisation:ratio
- expr: |
1e3 * sum(
(rate(node_vmstat_pgpgin{job="node-exporter"}[1m])