From 4467cfad82f5d454922640f7da02f5f4075780ae Mon Sep 17 00:00:00 2001
From: Istvan Zoltan Ballok <istvan.zoltan.ballok@sap.com>
Date: Tue, 14 Mar 2023 15:33:52 +0100
Subject: [PATCH] Fix the "Dropped Requests" panel of Kubernetes API Server
 Details

This panel was not showing any data in different Kubernetes versions for 2
reasons:

- apiserver_dropped_requests_total was not allow listed by mistake, see #3502.
  This means that this panel was not showing any data in any Kubernetes version.

- apiserver_dropped_requests_total is deprecated in 1.24 and removed in 1.25. So
  in Kubernetes clusters >= 1.25, this panel would have been empty for this
  reason as well.

In a previous commit we allow listed apiserver_dropped_requests_total for older
clusters and in this commit we add a semantically similar query with the metric
apiserver_request_terminations_total.

Co-authored-by: Istvan Zoltan Ballok <istvan.zoltan.ballok@sap.com>
Co-authored-by: Jeremy Rickards <jeremy.rickards@sap.com>
---
 .../owners/kubernetes-api-server-details.json  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/charts/seed-monitoring/charts/grafana/dashboards/owners/kubernetes-api-server-details.json b/charts/seed-monitoring/charts/grafana/dashboards/owners/kubernetes-api-server-details.json
index 09824e448a9..cc67b0ff364 100644
--- a/charts/seed-monitoring/charts/grafana/dashboards/owners/kubernetes-api-server-details.json
+++ b/charts/seed-monitoring/charts/grafana/dashboards/owners/kubernetes-api-server-details.json
@@ -902,13 +902,17 @@
       "hiddenSeries": false,
       "id": 55,
       "legend": {
+        "alignAsTable": true,
         "avg": false,
         "current": false,
-        "max": false,
+        "max": true,
         "min": false,
+        "rightSide": true,
         "show": true,
+        "sort": "max",
+        "sortDesc": true,
         "total": false,
-        "values": false
+        "values": true
       },
       "lines": true,
       "linewidth": 1,
@@ -931,6 +935,14 @@
           "legendFormat": "{{ requestKind }}",
           "interval": "",
           "refId": "A"
+        },
+        {
+          "exemplar": true,
+          "expr": "sum(rate(apiserver_request_terminations_total{code=\"429\"}[$__rate_interval])) by (verb, group, version, resource, subresource)",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "{{verb}} {{group}}/{{version}}/{{resource}} {{subresource}}",
+          "refId": "B"
         }
       ],
       "thresholds": [],
@@ -939,7 +951,7 @@
       "timeShift": null,
       "title": "Dropped Requests",
       "tooltip": {
-        "shared": true,
+        "shared": false,
         "sort": 0,
         "value_type": "individual"
       },