Skip to content

Commit 837c60b

Browse files
bonclay7bonclay7
authored
Merge pull request #12 from aws-observability/fixes-scrape-dashboard
Fixes scrape config / dashboard
2 parents 2615cac + 094f28c commit 837c60b

24 files changed

+2548
-2552
lines changed

‎modules/workloads/infra/dashboards/apiserver.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1582,4 +1582,4 @@
15821582
"uid": "09ec8aa1e996d6ffcd6817bbaff4db1b",
15831583
"version": 1,
15841584
"weekStart": ""
1585-
}
1585+
}

‎modules/workloads/infra/dashboards/cluster-networking.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,7 +1694,7 @@
16941694
"name": "cluster",
16951695
"options": [],
16961696
"query": {
1697-
"query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
1697+
"query": "label_values(up{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\"}, cluster)",
16981698
"refId": "Prometheus-cluster-Variable-Query"
16991699
},
17001700
"refresh": 2,
@@ -1742,4 +1742,4 @@
17421742
"uid": "ff635a025bcfea7bc3dd4f508990a3e9",
17431743
"version": 1,
17441744
"weekStart": ""
1745-
}
1745+
}

‎modules/workloads/infra/dashboards/cluster.json

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

‎modules/workloads/infra/dashboards/controller.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,4 +1023,4 @@
10231023
"uid": "72e0e05bef5099e5f049b05fdc429ed4",
10241024
"version": 1,
10251025
"weekStart": ""
1026-
}
1026+
}

‎modules/workloads/infra/dashboards/coredns.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1511,4 +1511,4 @@
15111511
"uid": "vkQ0UHxik",
15121512
"version": 1,
15131513
"weekStart": ""
1514-
}
1514+
}

‎modules/workloads/infra/dashboards/etcd.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,4 +1266,4 @@
12661266
"uid": "c2f4e12cdf69feb95caa41a5a1b423d9",
12671267
"version": 1,
12681268
"weekStart": ""
1269-
}
1269+
}

‎modules/workloads/infra/dashboards/kubelet.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1983,4 +1983,4 @@
19831983
"uid": "3138fa155d5915769fbded898ac09fd9",
19841984
"version": 1,
19851985
"weekStart": ""
1986-
}
1986+
}

‎modules/workloads/infra/dashboards/namespace-networking.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@
12451245
"name": "cluster",
12461246
"options": [],
12471247
"query": {
1248-
"query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
1248+
"query": "label_values(up{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\"}, cluster)",
12491249
"refId": "Prometheus-cluster-Variable-Query"
12501250
},
12511251
"refresh": 2,
@@ -1398,4 +1398,4 @@
13981398
"uid": "8b7a8b326d7a6f1f04244066368c67af",
13991399
"version": 1,
14001400
"weekStart": ""
1401-
}
1401+
}

‎modules/workloads/infra/dashboards/namespace-nw-workloads.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,7 +1447,7 @@
14471447
"name": "cluster",
14481448
"options": [],
14491449
"query": {
1450-
"query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
1450+
"query": "label_values(up{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\"}, cluster)",
14511451
"refId": "Prometheus-cluster-Variable-Query"
14521452
},
14531453
"refresh": 2,
@@ -1631,4 +1631,4 @@
16311631
"uid": "bbb2a765a623ae38130206c7d94a160f",
16321632
"version": 1,
16331633
"weekStart": ""
1634-
}
1634+
}

‎modules/workloads/infra/dashboards/namespace-pods.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
"datasource": {
244244
"uid": "$datasource"
245245
},
246-
"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\"})",
246+
"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\"})",
247247
"format": "time_series",
248248
"instant": true,
249249
"intervalFactor": 2,
@@ -309,7 +309,7 @@
309309
"datasource": {
310310
"uid": "$datasource"
311311
},
312-
"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\"})",
312+
"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\"})",
313313
"format": "time_series",
314314
"instant": true,
315315
"intervalFactor": 2,
@@ -853,7 +853,7 @@
853853
"datasource": {
854854
"uid": "$datasource"
855855
},
856-
"expr": "sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}) by (pod)",
856+
"expr": "sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\", image!=\"\"}) by (pod)",
857857
"format": "time_series",
858858
"intervalFactor": 2,
859859
"legendFormat": "{{pod}}",
@@ -1140,7 +1140,7 @@
11401140
"datasource": {
11411141
"uid": "$datasource"
11421142
},
1143-
"expr": "sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod)",
1143+
"expr": "sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\", image!=\"\"}) by (pod)",
11441144
"format": "table",
11451145
"instant": true,
11461146
"intervalFactor": 2,
@@ -1164,7 +1164,7 @@
11641164
"datasource": {
11651165
"uid": "$datasource"
11661166
},
1167-
"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)",
1167+
"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)",
11681168
"format": "table",
11691169
"instant": true,
11701170
"intervalFactor": 2,
@@ -1188,7 +1188,7 @@
11881188
"datasource": {
11891189
"uid": "$datasource"
11901190
},
1191-
"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)",
1191+
"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)",
11921192
"format": "table",
11931193
"instant": true,
11941194
"intervalFactor": 2,
@@ -1200,7 +1200,7 @@
12001200
"datasource": {
12011201
"uid": "$datasource"
12021202
},
1203-
"expr": "sum(container_memory_rss{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
1203+
"expr": "sum(container_memory_rss{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
12041204
"format": "table",
12051205
"instant": true,
12061206
"intervalFactor": 2,
@@ -1212,7 +1212,7 @@
12121212
"datasource": {
12131213
"uid": "$datasource"
12141214
},
1215-
"expr": "sum(container_memory_cache{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
1215+
"expr": "sum(container_memory_cache{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
12161216
"format": "table",
12171217
"instant": true,
12181218
"intervalFactor": 2,
@@ -1224,7 +1224,7 @@
12241224
"datasource": {
12251225
"uid": "$datasource"
12261226
},
1227-
"expr": "sum(container_memory_swap{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
1227+
"expr": "sum(container_memory_swap{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\",container!=\"\"}) by (pod)",
12281228
"format": "table",
12291229
"instant": true,
12301230
"intervalFactor": 2,
@@ -1457,7 +1457,7 @@
14571457
"datasource": {
14581458
"uid": "$datasource"
14591459
},
1460-
"expr": "sum(irate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1460+
"expr": "sum(irate(container_network_receive_bytes_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
14611461
"format": "table",
14621462
"instant": true,
14631463
"intervalFactor": 2,
@@ -1469,7 +1469,7 @@
14691469
"datasource": {
14701470
"uid": "$datasource"
14711471
},
1472-
"expr": "sum(irate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1472+
"expr": "sum(irate(container_network_transmit_bytes_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
14731473
"format": "table",
14741474
"instant": true,
14751475
"intervalFactor": 2,
@@ -1481,7 +1481,7 @@
14811481
"datasource": {
14821482
"uid": "$datasource"
14831483
},
1484-
"expr": "sum(irate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1484+
"expr": "sum(irate(container_network_receive_packets_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
14851485
"format": "table",
14861486
"instant": true,
14871487
"intervalFactor": 2,
@@ -1493,7 +1493,7 @@
14931493
"datasource": {
14941494
"uid": "$datasource"
14951495
},
1496-
"expr": "sum(irate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1496+
"expr": "sum(irate(container_network_transmit_packets_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
14971497
"format": "table",
14981498
"instant": true,
14991499
"intervalFactor": 2,
@@ -1505,7 +1505,7 @@
15051505
"datasource": {
15061506
"uid": "$datasource"
15071507
},
1508-
"expr": "sum(irate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1508+
"expr": "sum(irate(container_network_receive_packets_dropped_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
15091509
"format": "table",
15101510
"instant": true,
15111511
"intervalFactor": 2,
@@ -1517,7 +1517,7 @@
15171517
"datasource": {
15181518
"uid": "$datasource"
15191519
},
1520-
"expr": "sum(irate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
1520+
"expr": "sum(irate(container_network_transmit_packets_dropped_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval])) by (pod)",
15211521
"format": "table",
15221522
"instant": true,
15231523
"intervalFactor": 2,
@@ -2499,7 +2499,7 @@
24992499
"datasource": {
25002500
"uid": "$datasource"
25012501
},
2502-
"expr": "sum by(pod) (rate(container_fs_reads_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
2502+
"expr": "sum by(pod) (rate(container_fs_reads_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
25032503
"format": "table",
25042504
"instant": true,
25052505
"intervalFactor": 2,
@@ -2511,7 +2511,7 @@
25112511
"datasource": {
25122512
"uid": "$datasource"
25132513
},
2514-
"expr": "sum by(pod) (rate(container_fs_writes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
2514+
"expr": "sum by(pod) (rate(container_fs_writes_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
25152515
"format": "table",
25162516
"instant": true,
25172517
"intervalFactor": 2,
@@ -2523,7 +2523,7 @@
25232523
"datasource": {
25242524
"uid": "$datasource"
25252525
},
2526-
"expr": "sum by(pod) (rate(container_fs_reads_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]) + rate(container_fs_writes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
2526+
"expr": "sum by(pod) (rate(container_fs_reads_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]) + rate(container_fs_writes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
25272527
"format": "table",
25282528
"instant": true,
25292529
"intervalFactor": 2,
@@ -2535,7 +2535,7 @@
25352535
"datasource": {
25362536
"uid": "$datasource"
25372537
},
2538-
"expr": "sum by(pod) (rate(container_fs_reads_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
2538+
"expr": "sum by(pod) (rate(container_fs_reads_bytes_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
25392539
"format": "table",
25402540
"instant": true,
25412541
"intervalFactor": 2,
@@ -2547,7 +2547,7 @@
25472547
"datasource": {
25482548
"uid": "$datasource"
25492549
},
2550-
"expr": "sum by(pod) (rate(container_fs_writes_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
2550+
"expr": "sum by(pod) (rate(container_fs_writes_bytes_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
25512551
"format": "table",
25522552
"instant": true,
25532553
"intervalFactor": 2,
@@ -2559,7 +2559,7 @@
25592559
"datasource": {
25602560
"uid": "$datasource"
25612561
},
2562-
"expr": "sum by(pod) (rate(container_fs_reads_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]) + rate(container_fs_writes_bytes_total{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
2562+
"expr": "sum by(pod) (rate(container_fs_reads_bytes_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]) + rate(container_fs_writes_bytes_total{job=\"kubelet\", metrics_path=~\".*/metrics/cadvisor\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\", container!=\"\", cluster=\"$cluster\", namespace=\"$namespace\"}[$__rate_interval]))",
25632563
"format": "table",
25642564
"instant": true,
25652565
"intervalFactor": 2,
@@ -2718,4 +2718,4 @@
27182718
"uid": "85a562078cdf77779eaa1add43ccec1e",
27192719
"version": 1,
27202720
"weekStart": ""
2721-
}
2721+
}

0 commit comments

Comments
 (0)