add ksh and kcm to operator

aws-observability · Nov 19, 2024 · 9e1d7ea · 9e1d7ea
1 parent f645d0e
commit 9e1d7ea
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 145 deletions.
diff --git a/artifacts/argocd-apps/grafana-operator-app/values.yaml b/artifacts/argocd-apps/grafana-operator-app/values.yaml
@@ -23,3 +23,5 @@ GRAFANA_NSWRKLDS_DASH_URL: "https://raw.githubusercontent.com/aws-observability/
 GRAFANA_NODEEXP_DASH_URL: "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/nodeexporter-nodes.json"
 GRAFANA_NODES_DASH_URL: "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/nodes.json"
 GRAFANA_WORKLOADS_DASH_URL: "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/workloads.json"
+GRAFANA_KSH_DASH_URL: "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/ksh.json"
+GRAFANA_KCM_DASH_URL: "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/kcm.json"
diff --git a/...na-dashboards/eks/cp-metrics/EKS-KCM.json → ...na-dashboards/eks/infrastructure/kcm.json b/...na-dashboards/eks/cp-metrics/EKS-KCM.json → ...na-dashboards/eks/infrastructure/kcm.json
@@ -1,41 +1,4 @@
 {
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "Prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
-  "__elements": {},
-  "__requires": [
-    {
-      "type": "panel",
-      "id": "barchart",
-      "name": "Bar chart",
-      "version": ""
-    },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "11.2.2+security-01"
-    },
-    {
-      "type": "datasource",
-      "id": "prometheus",
-      "name": "Prometheus",
-      "version": "1.0.0"
-    },
-    {
-      "type": "panel",
-      "id": "timeseries",
-      "name": "Time series",
-      "version": ""
-    }
-  ],
   "annotations": {
     "list": [
       {
@@ -55,7 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": null,
+  "id": 2,
   "links": [
     {
       "asDropdown": true,
@@ -86,7 +49,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "be3uzci243mdcf"
       },
       "fieldConfig": {
         "defaults": {
@@ -119,7 +82,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -168,7 +132,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "be3uzci243mdcf"
           },
           "editorMode": "code",
           "expr": "topk(5, rate(workqueue_queue_duration_seconds_sum{job=\"$job\"}[5m]) / rate(workqueue_queue_duration_seconds_count{job=\"$job\"}[5m]))",
@@ -186,7 +150,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "be3uzci243mdcf"
       },
       "fieldConfig": {
         "defaults": {
@@ -270,7 +234,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "be3uzci243mdcf"
           },
           "editorMode": "code",
           "expr": "topk(5, rate(workqueue_work_duration_seconds_sum{job=\"$job\"}[5m]) / rate(workqueue_work_duration_seconds_count{job=\"$job\"}[5m])) > 0",
@@ -324,8 +288,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -405,7 +368,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "be3uzci243mdcf"
       },
       "description": "Length of Time in Queue",
       "fieldConfig": {
@@ -421,7 +384,6 @@
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 89,
             "gradientMode": "none",
@@ -452,8 +414,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -492,7 +453,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "be3uzci243mdcf"
           },
           "editorMode": "code",
           "expr": "rate(workqueue_queue_duration_seconds_sum{job=\"$job\"}[5m]) / rate(workqueue_queue_duration_seconds_count{job=\"$job\"}[5m]) > 0",
@@ -526,7 +487,6 @@
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 85,
             "gradientMode": "none",
@@ -558,8 +518,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -633,7 +592,6 @@
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 88,
             "gradientMode": "none",
@@ -728,7 +686,11 @@
   "templating": {
     "list": [
       {
-        "current": {},
+        "current": {
+          "selected": false,
+          "text": "prometheus",
+          "value": "be3uzci243mdcf"
+        },
         "hide": 0,
         "includeAll": false,
         "label": "Data source",
@@ -743,7 +705,11 @@
         "type": "datasource"
       },
       {
-        "current": {},
+        "current": {
+          "selected": true,
+          "text": "kcm-metrics",
+          "value": "kcm-metrics"
+        },
         "datasource": {
           "type": "prometheus",
           "uid": "${datasource}"
@@ -780,7 +746,6 @@
   "timezone": "utc",
   "title": "EKS Controller Manager",
   "uid": "8675309",
-  "version": 16,
+  "version": 2,
   "weekStart": ""
-}
-
+}