diff --git a/artifacts/argocd-apps/grafana-operator-app/values.yaml b/artifacts/argocd-apps/grafana-operator-app/values.yaml index b69a94c..bac7bef 100644 --- 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" \ No newline at end of file diff --git a/artifacts/grafana-dashboards/eks/cp-metrics/EKS-KCM.json b/artifacts/grafana-dashboards/eks/infrastructure/kcm.json similarity index 93% rename from artifacts/grafana-dashboards/eks/cp-metrics/EKS-KCM.json rename to artifacts/grafana-dashboards/eks/infrastructure/kcm.json index e4c4f20..c299e01 100644 --- a/artifacts/grafana-dashboards/eks/cp-metrics/EKS-KCM.json +++ b/artifacts/grafana-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": "" -} - +} \ No newline at end of file diff --git a/artifacts/grafana-dashboards/eks/cp-metrics/EKS-KSH.json b/artifacts/grafana-dashboards/eks/infrastructure/ksh.json similarity index 86% rename from artifacts/grafana-dashboards/eks/cp-metrics/EKS-KSH.json rename to artifacts/grafana-dashboards/eks/infrastructure/ksh.json index f1064a0..0359b58 100644 --- a/artifacts/grafana-dashboards/eks/cp-metrics/EKS-KSH.json +++ b/artifacts/grafana-dashboards/eks/infrastructure/ksh.json @@ -1,35 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__elements": {}, - "__requires": [ - { - "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": [ { @@ -56,15 +25,14 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": null, + "id": 1, "links": [], "liveNow": false, "panels": [ { "datasource": { - "default": false, "type": "prometheus", - "uid": "$datasource" + "uid": "be3uzci243mdcf" }, "fieldConfig": { "defaults": { @@ -79,7 +47,6 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 76, "gradientMode": "none", @@ -148,7 +115,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "be3uzci243mdcf" }, "editorMode": "code", "expr": "sum(sum_over_time(scheduler_pending_pods[5m]))by (queue)", @@ -183,7 +150,6 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 75, "gradientMode": "none", @@ -225,23 +191,7 @@ ] } }, - "overrides": [ - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "{endpoint=\"https\", instance=\"10.14.150.11:443\", job=\"kubernetes\", namespace=\"default\", service=\"kubernetes\"}" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [] - } - ] + "overrides": [] }, "gridPos": { "h": 12, @@ -267,7 +217,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "be3uzci243mdcf" }, "editorMode": "code", "expr": "increase(scheduler_pod_scheduling_attempts_sum[5m]) / increase(scheduler_pod_scheduling_attempts_count[5m])", @@ -303,7 +253,6 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 76, "gradientMode": "none", @@ -334,8 +283,7 @@ "mode": "absolute", "steps": [ { - "color": "purple", - "value": null + "color": "purple" }, { "color": "red", @@ -373,7 +321,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "be3uzci243mdcf" }, "editorMode": "code", "expr": "rate(scheduler_scheduling_attempt_duration_seconds_sum{}[5m]) / rate(scheduler_scheduling_attempt_duration_seconds_count[5m])", @@ -408,7 +356,6 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 76, "gradientMode": "none", @@ -439,8 +386,7 @@ "mode": "absolute", "steps": [ { - "color": "purple", - "value": null + "color": "purple" }, { "color": "red", @@ -477,7 +423,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "be3uzci243mdcf" }, "editorMode": "code", "expr": "increase(scheduler_preemption_attempts_total[5m])", @@ -493,7 +439,7 @@ "type": "timeseries" } ], - "refresh": "auto", + "refresh": "5s", "schemaVersion": 39, "tags": [ "RiskyAdventure" @@ -501,16 +447,36 @@ "templating": { "list": [ { - "current": {}, + "current": { + "selected": false, + "text": "prometheus", + "value": "be3uzci243mdcf" + }, + "hide": 2, + "includeAll": false, + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "/prom./", + "skipUrlSync": false, + "type": "datasource" + }, + { + "current": { + "selected": false, + "text": "ksh-metrics", + "value": "ksh-metrics" + }, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "be3uzci243mdcf" }, "definition": "label_values(scheduler_pending_pods,job)", "hide": 0, "includeAll": false, - "label": "job", - "multi": true, + "multi": false, "name": "job", "options": [], "query": { @@ -523,25 +489,12 @@ "skipUrlSync": false, "sort": 0, "type": "query" - }, - { - "current": {}, - "hide": 2, - "includeAll": false, - "multi": false, - "name": "datasource", - "options": [], - "query": "prometheus", - "refresh": 1, - "regex": "/Prom.*/", - "skipUrlSync": false, - "type": "datasource" } ] }, "time": { - "from": "now-15m", - "to": "now" + "from": "now-1h", + "to": "now-4m" }, "timepicker": { "nowDelay": "4m", @@ -552,7 +505,6 @@ "timezone": "", "title": "EKS Scheduler", "uid": "CqT0Jg-nz", - "version": 17, + "version": 5, "weekStart": "" -} - +} \ No newline at end of file diff --git a/artifacts/grafana-operator-manifests/eks/infrastructure/amg_grafana-dashboards.yaml b/artifacts/grafana-operator-manifests/eks/infrastructure/amg_grafana-dashboards.yaml index 3a8f152..be9df50 100644 --- a/artifacts/grafana-operator-manifests/eks/infrastructure/amg_grafana-dashboards.yaml +++ b/artifacts/grafana-operator-manifests/eks/infrastructure/amg_grafana-dashboards.yaml @@ -69,3 +69,28 @@ spec: matchLabels: dashboards: "external-grafana" url: ${GRAFANA_WORKLOADS_DASH_URL} + +--- +apiVersion: grafana.integreatly.org/v1beta1 +kind: GrafanaDashboard +metadata: + name: ksh-grafanadashboard + namespace: grafana-operator +spec: + folder: "Observability Accelerator Dashboards" + instanceSelector: + matchLabels: + dashboards: "external-grafana" + url: ${GRAFANA_KSH_DASH_URL} +--- +apiVersion: grafana.integreatly.org/v1beta1 +kind: GrafanaDashboard +metadata: + name: kcm-grafanadashboard + namespace: grafana-operator +spec: + folder: "Observability Accelerator Dashboards" + instanceSelector: + matchLabels: + dashboards: "external-grafana" + url: ${GRAFANA_KCM_DASH_URL} \ No newline at end of file