Skip to content

Commit 67f3a1c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #13040 from sbueringer/pr-fix-cr-dashboard
🌱 Extend CR dashboard to handle capi_reconcile metrics
2 parents 9b038f5 + b62b736 commit 67f3a1c

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

‎hack/observability/grafana/dashboards/controller-runtime.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@
12801280
"uid": "prometheus"
12811281
},
12821282
"editorMode": "code",
1283-
"expr": "sum(rate(controller_runtime_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod)",
1283+
"expr": "sum(rate(capi_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod) or sum(rate(controller_runtime_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod)",
12841284
"legendFormat": "{{pod}}",
12851285
"range": true,
12861286
"refId": "A"
@@ -1373,7 +1373,7 @@
13731373
"uid": "prometheus"
13741374
},
13751375
"editorMode": "code",
1376-
"expr": "sum(rate(controller_runtime_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller)",
1376+
"expr": "sum(rate(capi_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller) or sum(rate(controller_runtime_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller)",
13771377
"legendFormat": "{{pod}}: {{controller}}",
13781378
"range": true,
13791379
"refId": "A"
@@ -1466,7 +1466,7 @@
14661466
"uid": "prometheus"
14671467
},
14681468
"editorMode": "code",
1469-
"expr": "sum(rate(controller_runtime_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,result)",
1469+
"expr": "sum(rate(capi_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,result) or sum(rate(controller_runtime_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,result)",
14701470
"legendFormat": "{{pod}}: {{result}}",
14711471
"range": true,
14721472
"refId": "A"
@@ -1559,7 +1559,7 @@
15591559
"uid": "prometheus"
15601560
},
15611561
"editorMode": "code",
1562-
"expr": "sum(rate(controller_runtime_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller,result)",
1562+
"expr": "sum(rate(capi_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller,result) or sum(rate(controller_runtime_reconcile_total{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller,result)",
15631563
"legendFormat": "{{pod}}: {{controller}}: {{result}}",
15641564
"range": true,
15651565
"refId": "A"
@@ -1852,7 +1852,7 @@
18521852
"uid": "prometheus"
18531853
},
18541854
"editorMode": "code",
1855-
"expr": "sum(rate(controller_runtime_reconcile_time_seconds_sum{pod=~\"$Pod\"}[5m])) by (pod) / sum(rate(controller_runtime_reconcile_time_seconds_count{pod=~\"$Pod\"}[5m])) by (pod)",
1855+
"expr": "sum(rate(capi_reconcile_time_seconds_sum{pod=~\"$Pod\"}[5m])) by (pod) / sum(rate(capi_reconcile_time_seconds_count{pod=~\"$Pod\"}[5m])) by (pod) or sum(rate(controller_runtime_reconcile_time_seconds_sum{pod=~\"$Pod\"}[5m])) by (pod) / sum(rate(controller_runtime_reconcile_time_seconds_count{pod=~\"$Pod\"}[5m])) by (pod)",
18561856
"legendFormat": "{{pod}}",
18571857
"range": true,
18581858
"refId": "A"
@@ -1946,7 +1946,7 @@
19461946
"uid": "prometheus"
19471947
},
19481948
"editorMode": "code",
1949-
"expr": "histogram_quantile(0.50, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\"}[5m])) by (pod, le))",
1949+
"expr": "histogram_quantile(0.50, sum(rate(capi_reconcile_time_seconds_bucket{pod=~\"$Pod\"}[5m])) by (pod, le)) or histogram_quantile(0.50, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\"}[5m])) by (pod, le))",
19501950
"hide": false,
19511951
"legendFormat": "P50 {{pod}}",
19521952
"range": true,
@@ -1958,7 +1958,7 @@
19581958
"uid": "prometheus"
19591959
},
19601960
"editorMode": "code",
1961-
"expr": "histogram_quantile(0.90, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\"}[5m])) by (pod, le))",
1961+
"expr": "histogram_quantile(0.90, sum(rate(capi_reconcile_time_seconds_bucket{pod=~\"$Pod\"}[5m])) by (pod, le)) or histogram_quantile(0.90, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\"}[5m])) by (pod, le))",
19621962
"hide": false,
19631963
"legendFormat": "P90 {{pod}}",
19641964
"range": true,
@@ -1970,7 +1970,7 @@
19701970
"uid": "prometheus"
19711971
},
19721972
"editorMode": "code",
1973-
"expr": "histogram_quantile(0.99, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\"}[5m])) by (pod, le))",
1973+
"expr": "histogram_quantile(0.99, sum(rate(capi_reconcile_time_seconds_bucket{pod=~\"$Pod\"}[5m])) by (pod, le)) or histogram_quantile(0.99, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\"}[5m])) by (pod, le))",
19741974
"hide": false,
19751975
"legendFormat": "P99 {{pod}}",
19761976
"range": true,
@@ -2064,7 +2064,7 @@
20642064
"uid": "prometheus"
20652065
},
20662066
"editorMode": "code",
2067-
"expr": "sum(rate(controller_runtime_reconcile_time_seconds_sum{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller) / sum(rate(controller_runtime_reconcile_time_seconds_count{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller)",
2067+
"expr": "sum(rate(capi_reconcile_time_seconds_sum{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller) / sum(rate(capi_reconcile_time_seconds_count{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller) or sum(rate(controller_runtime_reconcile_time_seconds_sum{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller) / sum(rate(controller_runtime_reconcile_time_seconds_count{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod,controller)",
20682068
"legendFormat": "{{pod}}: {{controller}}",
20692069
"range": true,
20702070
"refId": "A"
@@ -2158,7 +2158,7 @@
21582158
"uid": "prometheus"
21592159
},
21602160
"editorMode": "code",
2161-
"expr": "histogram_quantile(0.50, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod, controller, le))",
2161+
"expr": "histogram_quantile(0.50, sum(rate(capi_reconcile_time_seconds_bucket{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod, controller, le)) or histogram_quantile(0.50, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod, controller, le))",
21622162
"hide": false,
21632163
"legendFormat": "P50 {{pod}} {{controller}} ",
21642164
"range": true,
@@ -2170,7 +2170,7 @@
21702170
"uid": "prometheus"
21712171
},
21722172
"editorMode": "code",
2173-
"expr": "histogram_quantile(0.90, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod, controller, le))",
2173+
"expr": "histogram_quantile(0.90, sum(rate(capi_reconcile_time_seconds_bucket{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod, controller, le)) or histogram_quantile(0.90, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod, controller, le))",
21742174
"hide": false,
21752175
"legendFormat": "P90 {{pod}} {{controller}} ",
21762176
"range": true,
@@ -2182,7 +2182,7 @@
21822182
"uid": "prometheus"
21832183
},
21842184
"editorMode": "code",
2185-
"expr": "histogram_quantile(0.99, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod, controller, le))",
2185+
"expr": "histogram_quantile(0.99, sum(rate(capi_reconcile_time_seconds_bucket{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod, controller, le)) or histogram_quantile(0.99, sum(rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\",controller=~\"$Controller\"}[5m])) by (pod, controller, le))",
21862186
"hide": false,
21872187
"legendFormat": "P99 {{pod}} {{controller}} ",
21882188
"range": true,
@@ -2262,7 +2262,7 @@
22622262
},
22632263
"editorMode": "code",
22642264
"exemplar": true,
2265-
"expr": "rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\", controller=~\"$Controller\"}[$__rate_interval])",
2265+
"expr": "rate(capi_reconcile_time_seconds_bucket{pod=~\"$Pod\", controller=~\"$Controller\"}[$__rate_interval]) or rate(controller_runtime_reconcile_time_seconds_bucket{pod=~\"$Pod\", controller=~\"$Controller\"}[$__rate_interval])",
22662266
"format": "heatmap",
22672267
"legendFormat": "{{le}}",
22682268
"range": true,

0 commit comments

Comments
 (0)