From 2a172463e69bf40195b1c561eae2f6ab7eb50987 Mon Sep 17 00:00:00 2001
From: Janos Laszlo Vasik <jvasik@redhat.com>
Date: Wed, 22 Jan 2025 11:55:12 +0100
Subject: [PATCH] refactor(Graphana): RHINENG-15507 replace kafka lag metric

---
 ...-insights-compliance-general.template.yaml | 89 +++++++++++--------
 1 file changed, 51 insertions(+), 38 deletions(-)

diff --git a/dashboards/grafana-dashboard-insights-compliance-general.template.yaml b/dashboards/grafana-dashboard-insights-compliance-general.template.yaml
index e5d69f154..2251b9bf2 100644
--- a/dashboards/grafana-dashboard-insights-compliance-general.template.yaml
+++ b/dashboards/grafana-dashboard-insights-compliance-general.template.yaml
@@ -100,7 +100,7 @@ objects:
         "editable": true,
         "fiscalYearStartMonth": 0,
         "graphTooltip": 0,
-        "id": 933908,
+        "id": 994234,
         "links": [],
         "liveNow": false,
         "panels": [
@@ -1406,7 +1406,7 @@ objects:
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "$datasource"
+              "uid": "${cloudwatch_datasource}"
             },
             "fieldConfig": {
               "defaults": {
@@ -1488,12 +1488,15 @@ objects:
             "targets": [
               {
                 "datasource": {
-                  "uid": "$datasource"
+                  "type": "prometheus",
+                  "uid": "${cloudwatch_datasource}"
                 },
-                "expr": "sum(kafka_consumergroup_group_topic_sum_lag{topic=~\".*platform.inventory.events\", group=\"complianceinventory-events-consumer\"}) by (topic)",
+                "editorMode": "code",
+                "expr": "sum by(topic) (aws_kafka_max_offset_lag_sum{consumer_group=\"complianceinventory-events-consumer\", topic=~\".*platform.inventory.events\"})",
                 "format": "time_series",
                 "intervalFactor": 1,
                 "legendFormat": "{{topic}}",
+                "range": true,
                 "refId": "B"
               }
             ],
@@ -1565,7 +1568,7 @@ objects:
               "h": 6,
               "w": 12,
               "x": 0,
-              "y": 30
+              "y": 24
             },
             "id": 35,
             "options": {
@@ -1675,7 +1678,7 @@ objects:
               "h": 6,
               "w": 12,
               "x": 12,
-              "y": 30
+              "y": 24
             },
             "id": 57,
             "options": {
@@ -1787,7 +1790,7 @@ objects:
               "h": 8,
               "w": 12,
               "x": 0,
-              "y": 36
+              "y": 30
             },
             "id": 23763572011,
             "options": {
@@ -1897,7 +1900,7 @@ objects:
               "h": 8,
               "w": 12,
               "x": 12,
-              "y": 36
+              "y": 30
             },
             "id": 23763572007,
             "options": {
@@ -2009,7 +2012,7 @@ objects:
               "h": 8,
               "w": 12,
               "x": 0,
-              "y": 44
+              "y": 38
             },
             "id": 23763572014,
             "options": {
@@ -2121,7 +2124,7 @@ objects:
               "h": 8,
               "w": 12,
               "x": 12,
-              "y": 44
+              "y": 38
             },
             "id": 23763572015,
             "options": {
@@ -2309,7 +2312,7 @@ objects:
               "h": 6,
               "w": 12,
               "x": 0,
-              "y": 52
+              "y": 46
             },
             "id": 42,
             "options": {
@@ -2492,7 +2495,7 @@ objects:
               "h": 6,
               "w": 12,
               "x": 12,
-              "y": 52
+              "y": 46
             },
             "id": 58,
             "options": {
@@ -2687,7 +2690,7 @@ objects:
               "h": 6,
               "w": 12,
               "x": 0,
-              "y": 58
+              "y": 52
             },
             "id": 53,
             "options": {
@@ -2871,7 +2874,7 @@ objects:
               "h": 6,
               "w": 12,
               "x": 12,
-              "y": 58
+              "y": 52
             },
             "id": 52,
             "options": {
@@ -3067,7 +3070,7 @@ objects:
               "h": 6,
               "w": 12,
               "x": 0,
-              "y": 64
+              "y": 58
             },
             "id": 60,
             "options": {
@@ -3275,7 +3278,7 @@ objects:
               "h": 6,
               "w": 12,
               "x": 12,
-              "y": 64
+              "y": 58
             },
             "id": 61,
             "options": {
@@ -3367,8 +3370,7 @@ objects:
                   "mode": "absolute",
                   "steps": [
                     {
-                      "color": "green",
-                      "value": null
+                      "color": "green"
                     },
                     {
                       "color": "red",
@@ -3460,7 +3462,7 @@ objects:
               "h": 6,
               "w": 12,
               "x": 0,
-              "y": 70
+              "y": 64
             },
             "id": 23763571993,
             "options": {
@@ -3539,8 +3541,7 @@ objects:
                   "mode": "absolute",
                   "steps": [
                     {
-                      "color": "green",
-                      "value": null
+                      "color": "green"
                     },
                     {
                       "color": "red",
@@ -3632,7 +3633,7 @@ objects:
               "h": 6,
               "w": 12,
               "x": 12,
-              "y": 70
+              "y": 64
             },
             "id": 23763571992,
             "options": {
@@ -3674,7 +3675,7 @@ objects:
               "h": 1,
               "w": 24,
               "x": 0,
-              "y": 76
+              "y": 70
             },
             "id": 34,
             "panels": [
@@ -4086,8 +4087,7 @@ objects:
                       "mode": "absolute",
                       "steps": [
                         {
-                          "color": "green",
-                          "value": null
+                          "color": "green"
                         },
                         {
                           "color": "red",
@@ -4159,8 +4159,7 @@ objects:
                       "mode": "absolute",
                       "steps": [
                         {
-                          "color": "green",
-                          "value": null
+                          "color": "green"
                         },
                         {
                           "color": "red",
@@ -4231,8 +4230,7 @@ objects:
                       "mode": "absolute",
                       "steps": [
                         {
-                          "color": "green",
-                          "value": null
+                          "color": "green"
                         },
                         {
                           "color": "red",
@@ -4412,8 +4410,7 @@ objects:
                       "mode": "absolute",
                       "steps": [
                         {
-                          "color": "green",
-                          "value": null
+                          "color": "green"
                         },
                         {
                           "color": "red",
@@ -4488,8 +4485,7 @@ objects:
                       "mode": "absolute",
                       "steps": [
                         {
-                          "color": "green",
-                          "value": null
+                          "color": "green"
                         },
                         {
                           "color": "red",
@@ -4564,8 +4560,7 @@ objects:
                       "mode": "absolute",
                       "steps": [
                         {
-                          "color": "green",
-                          "value": null
+                          "color": "green"
                         },
                         {
                           "color": "red",
@@ -4640,8 +4635,7 @@ objects:
                       "mode": "absolute",
                       "steps": [
                         {
-                          "color": "green",
-                          "value": null
+                          "color": "green"
                         },
                         {
                           "color": "red",
@@ -4826,6 +4820,25 @@ objects:
             {
               "current": {
                 "selected": true,
+                "text": "aws-resources-exporter-stage",
+                "value": "P80B3240D3DAB93EB"
+              },
+              "description": "CloudWatch provided aws metrics source.\nAt the time of writing it is only used to gain Kafka lag metrics.",
+              "hide": 0,
+              "includeAll": false,
+              "multi": false,
+              "name": "cloudwatch_datasource",
+              "options": [],
+              "query": "prometheus",
+              "queryValue": "",
+              "refresh": 1,
+              "regex": "/aws-resources-.*/",
+              "skipUrlSync": false,
+              "type": "datasource"
+            },
+            {
+              "current": {
+                "selected": false,
                 "text": "include",
                 "value": "1"
               },
@@ -4885,7 +4898,7 @@ objects:
         "timezone": "",
         "title": "Compliance",
         "uid": "compliance",
-        "version": 14,
+        "version": 1,
         "weekStart": ""
       }
   kind: ConfigMap