diff --git a/charts/seed-monitoring/charts/grafana/dashboards/owners/apiserver-overview.json b/charts/seed-monitoring/charts/grafana/dashboards/owners/apiserver-overview.json index 918ca0eaf00..65c9bc97f17 100644 --- a/charts/seed-monitoring/charts/grafana/dashboards/owners/apiserver-overview.json +++ b/charts/seed-monitoring/charts/grafana/dashboards/owners/apiserver-overview.json @@ -2748,9 +2748,11 @@ "steppedLine": true, "targets": [ { - "expr": "sum(apiserver_registered_watchers{pod=~\"$apiserver\"})by(kind)", + "exemplar": true, + "expr": " sum by (resource) (apiserver_longrunning_requests{pod=~\"$apiserver\",verb=\"WATCH\"})\nor\n sum by (resource) (apiserver_registered_watchers{pod=~\"$apiserver\",resource!=\"\"})", + "hide": false, "interval": "", - "legendFormat": "{{kind}}", + "legendFormat": "{{resource}}", "refId": "A" } ], diff --git a/charts/seed-monitoring/charts/grafana/dashboards/owners/kubernetes-control-plane-status-dashboard.json b/charts/seed-monitoring/charts/grafana/dashboards/owners/kubernetes-control-plane-status-dashboard.json index 7e85e8349d9..3b25c3702a3 100644 --- a/charts/seed-monitoring/charts/grafana/dashboards/owners/kubernetes-control-plane-status-dashboard.json +++ b/charts/seed-monitoring/charts/grafana/dashboards/owners/kubernetes-control-plane-status-dashboard.json @@ -1319,14 +1319,14 @@ "steppedLine": false, "targets": [ { - "expr": "apiserver_registered_watchers", + "expr": " sum by (group, version, resource) (apiserver_longrunning_requests{verb=\"WATCH\"})\nor\n sum by (group, version, resource) (apiserver_registered_watchers{resource!=\"\"})", "format": "time_series", "intervalFactor": 1, - "legendFormat": "{{group}}/{{version}}/{{kind}}", + "legendFormat": "{{group}}/{{version}}/{{resource}}", "refId": "A" }, { - "expr": "count(apiserver_registered_watchers)\n", + "expr": " sum (apiserver_longrunning_requests{verb=\"WATCH\"})\nor\n sum (apiserver_registered_watchers{resource!=\"\"})", "format": "time_series", "intervalFactor": 1, "legendFormat": "total",