Skip to content

Commit 6195854

Browse files
solssonsolsson
committed
With overrides restored
1 parent 9190a00 commit 6195854

12 files changed

+129
-129
lines changed

‎kubernetes-mixin-dashboards/cluster-total.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1637,7 +1637,7 @@
16371637
"multi": false,
16381638
"name": "cluster",
16391639
"options": [ ],
1640-
"query": "label_values(up{job=\"cadvisor\"}, cluster)",
1640+
"query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
16411641
"refresh": 2,
16421642
"regex": "",
16431643
"sort": 0,

‎kubernetes-mixin-dashboards/k8s-resources-cluster.json

Lines changed: 27 additions & 27 deletions
Large diffs are not rendered by default.

‎kubernetes-mixin-dashboards/k8s-resources-namespace.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
"steppedLine": false,
208208
"targets": [
209209
{
210-
"expr": "sum(container_memory_working_set_bytes{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) / sum(kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"})",
210+
"expr": "sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) / sum(kube_pod_container_resource_requests{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"})",
211211
"format": "time_series",
212212
"instant": true,
213213
"intervalFactor": 2,
@@ -286,7 +286,7 @@
286286
"steppedLine": false,
287287
"targets": [
288288
{
289-
"expr": "sum(container_memory_working_set_bytes{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) / sum(kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"})",
289+
"expr": "sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) / sum(kube_pod_container_resource_limits{job=\"kube-state-metrics\", cluster=\"$cluster\", namespace=\"$namespace\", resource=\"memory\"})",
290290
"format": "time_series",
291291
"instant": true,
292292
"intervalFactor": 2,
@@ -767,7 +767,7 @@
767767
"steppedLine": false,
768768
"targets": [
769769
{
770-
"expr": "sum(container_memory_working_set_bytes{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}) by (pod)",
770+
"expr": "sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}) by (pod)",
771771
"format": "time_series",
772772
"intervalFactor": 2,
773773
"legendFormat": "{{pod}}",
@@ -1028,7 +1028,7 @@
10281028
],
10291029
"targets": [
10301030
{
1031-
"expr": "sum(container_memory_working_set_bytes{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod)",
1031+
"expr": "sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod)",
10321032
"format": "table",
10331033
"instant": true,
10341034
"intervalFactor": 2,
@@ -1046,7 +1046,7 @@
10461046
"step": 10
10471047
},
10481048
{
1049-
"expr": "sum(container_memory_working_set_bytes{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)",
1049+
"expr": "sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_requests{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)",
10501050
"format": "table",
10511051
"instant": true,
10521052
"intervalFactor": 2,
@@ -1064,7 +1064,7 @@
10641064
"step": 10
10651065
},
10661066
{
1067-
"expr": "sum(container_memory_working_set_bytes{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)",
1067+
"expr": "sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_limits{cluster=\"$cluster\", namespace=\"$namespace\"}) by (pod)",
10681068
"format": "table",
10691069
"instant": true,
10701070
"intervalFactor": 2,
@@ -1073,7 +1073,7 @@
10731073
"step": 10
10741074
},
10751075
{
1076-
"expr": "sum(container_memory_rss{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
1076+
"expr": "sum(container_memory_rss{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
10771077
"format": "table",
10781078
"instant": true,
10791079
"intervalFactor": 2,
@@ -1082,7 +1082,7 @@
10821082
"step": 10
10831083
},
10841084
{
1085-
"expr": "sum(container_memory_cache{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
1085+
"expr": "sum(container_memory_cache{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
10861086
"format": "table",
10871087
"instant": true,
10881088
"intervalFactor": 2,
@@ -1091,7 +1091,7 @@
10911091
"step": 10
10921092
},
10931093
{
1094-
"expr": "sum(container_memory_swap{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
1094+
"expr": "sum(container_memory_swap{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
10951095
"format": "table",
10961096
"instant": true,
10971097
"intervalFactor": 2,
@@ -1308,7 +1308,7 @@
13081308
],
13091309
"targets": [
13101310
{
1311-
"expr": "sum(irate(container_network_receive_bytes_total{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1311+
"expr": "sum(irate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
13121312
"format": "table",
13131313
"instant": true,
13141314
"intervalFactor": 2,
@@ -1317,7 +1317,7 @@
13171317
"step": 10
13181318
},
13191319
{
1320-
"expr": "sum(irate(container_network_transmit_bytes_total{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1320+
"expr": "sum(irate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
13211321
"format": "table",
13221322
"instant": true,
13231323
"intervalFactor": 2,
@@ -1326,7 +1326,7 @@
13261326
"step": 10
13271327
},
13281328
{
1329-
"expr": "sum(irate(container_network_receive_packets_total{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1329+
"expr": "sum(irate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
13301330
"format": "table",
13311331
"instant": true,
13321332
"intervalFactor": 2,
@@ -1335,7 +1335,7 @@
13351335
"step": 10
13361336
},
13371337
{
1338-
"expr": "sum(irate(container_network_transmit_packets_total{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1338+
"expr": "sum(irate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
13391339
"format": "table",
13401340
"instant": true,
13411341
"intervalFactor": 2,
@@ -1344,7 +1344,7 @@
13441344
"step": 10
13451345
},
13461346
{
1347-
"expr": "sum(irate(container_network_receive_packets_dropped_total{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1347+
"expr": "sum(irate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
13481348
"format": "table",
13491349
"instant": true,
13501350
"intervalFactor": 2,
@@ -1353,7 +1353,7 @@
13531353
"step": 10
13541354
},
13551355
{
1356-
"expr": "sum(irate(container_network_transmit_packets_dropped_total{job=\"cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1356+
"expr": "sum(irate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
13571357
"format": "table",
13581358
"instant": true,
13591359
"intervalFactor": 2,
@@ -2255,7 +2255,7 @@
22552255
],
22562256
"targets": [
22572257
{
2258-
"expr": "sum by(pod) (rate(container_fs_reads_total{job=\"cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
2258+
"expr": "sum by(pod) (rate(container_fs_reads_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
22592259
"format": "table",
22602260
"instant": true,
22612261
"intervalFactor": 2,
@@ -2264,7 +2264,7 @@
22642264
"step": 10
22652265
},
22662266
{
2267-
"expr": "sum by(pod) (rate(container_fs_writes_total{job=\"cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
2267+
"expr": "sum by(pod) (rate(container_fs_writes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
22682268
"format": "table",
22692269
"instant": true,
22702270
"intervalFactor": 2,
@@ -2273,7 +2273,7 @@
22732273
"step": 10
22742274
},
22752275
{
2276-
"expr": "sum by(pod) (rate(container_fs_reads_total{job=\"cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]) + rate(container_fs_writes_total{job=\"cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
2276+
"expr": "sum by(pod) (rate(container_fs_reads_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]) + rate(container_fs_writes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
22772277
"format": "table",
22782278
"instant": true,
22792279
"intervalFactor": 2,
@@ -2282,7 +2282,7 @@
22822282
"step": 10
22832283
},
22842284
{
2285-
"expr": "sum by(pod) (rate(container_fs_reads_bytes_total{job=\"cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
2285+
"expr": "sum by(pod) (rate(container_fs_reads_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
22862286
"format": "table",
22872287
"instant": true,
22882288
"intervalFactor": 2,
@@ -2291,7 +2291,7 @@
22912291
"step": 10
22922292
},
22932293
{
2294-
"expr": "sum by(pod) (rate(container_fs_writes_bytes_total{job=\"cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
2294+
"expr": "sum by(pod) (rate(container_fs_writes_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
22952295
"format": "table",
22962296
"instant": true,
22972297
"intervalFactor": 2,
@@ -2300,7 +2300,7 @@
23002300
"step": 10
23012301
},
23022302
{
2303-
"expr": "sum by(pod) (rate(container_fs_reads_bytes_total{job=\"cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]) + rate(container_fs_writes_bytes_total{job=\"cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
2303+
"expr": "sum by(pod) (rate(container_fs_reads_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]) + rate(container_fs_writes_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", container!=\"\", cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval]))",
23042304
"format": "table",
23052305
"instant": true,
23062306
"intervalFactor": 2,

0 commit comments

Comments
 (0)