Merge pull request #3 from aws-observability/feature/allDashboards

Adding all Grafana Dashboards
aws-observability · Jun 5, 2023 · 6dad450 · 6dad450
2 parents 8df36a8 + 7471fc8
commit 6dad450
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 7 deletions.
diff --git a/artifacts/grafana-dashboards/cluster.json b/artifacts/grafana-dashboards/cluster.json
@@ -2901,7 +2901,7 @@
     ]
   },
   "timezone": "utc",
-  "title": "Grafana Operator - Kubernetes / Compute Resources / Cluster",
+  "title": "AWS Observability Accelerator - Kubernetes / Compute Resources / Cluster",
   "uid": "efa86fd1d0c121a26444b636a3f509a8",
   "version": 3,
   "weekStart": ""

diff --git a/artifacts/grafana-dashboards/kubelet.json b/artifacts/grafana-dashboards/kubelet.json
@@ -2229,7 +2229,7 @@
     ]
   },
   "timezone": "utc",
-  "title": "Grafana Operator - Kubernetes / Kubelet",
+  "title": "AWS Observability Accelerator - Kubernetes / Kubelet",
   "uid": "3138fa155d5915769fbded898ac09fd9",
   "version": 19,
   "weekStart": ""

diff --git a/artifacts/grafana-dashboards/namespace-workloads.json b/artifacts/grafana-dashboards/namespace-workloads.json
@@ -2653,7 +2653,7 @@
     ]
   },
   "timezone": "utc",
-  "title": "Grafana Operator - Kubernetes / Compute Resources / Namespace (Workloads)",
+  "title": "AWS Observability Accelerator - Kubernetes / Compute Resources / Namespace (Workloads)",
   "uid": "a87fb0d919ec0ea5f6543124e16c42a5",
   "version": 2,
   "weekStart": ""

diff --git a/artifacts/grafana-dashboards/nodeexporter-nodes.json b/artifacts/grafana-dashboards/nodeexporter-nodes.json
@@ -1275,7 +1275,7 @@
     ]
   },
   "timezone": "utc",
-  "title": "Grafana Operator - Node Exporter / Nodes",
+  "title": "AWS Observability Accelerator - Node Exporter / Nodes",
   "uid": "v8yDYJqnz",
   "version": 18,
   "weekStart": ""

diff --git a/artifacts/grafana-dashboards/nodes.json b/artifacts/grafana-dashboards/nodes.json
@@ -1476,7 +1476,7 @@
     ]
   },
   "timezone": "utc",
-  "title": "Grafana Operator - Kubernetes / Compute Resources / Node (Pods)",
+  "title": "AWS Observability Accelerator - Kubernetes / Compute Resources / Node (Pods)",
   "uid": "200ac8fdbfbb74b39aff88118e4d1c2c",
   "version": 7,
   "weekStart": ""

diff --git a/artifacts/grafana-dashboards/workloads.json b/artifacts/grafana-dashboards/workloads.json
@@ -2291,7 +2291,7 @@
     ]
   },
   "timezone": "utc",
-  "title": "Grafana Operator - Kubernetes / Compute Resources / Workload",
+  "title": "AWS Observability Accelerator - Kubernetes / Compute Resources / Workload",
   "uid": "a164a7f0339f99e89cea5cb47e9be617",
   "version": 7,
   "weekStart": ""

diff --git a/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml b/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml
@@ -1,10 +1,71 @@
 apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
-  name: external-grafanadashboard-url
+  name: cluster-grafanadashboard
   namespace: grafana-operator
 spec:
+  folder: "Observability Accelerator Dashboards"
+  instanceSelector:
+    matchLabels:
+      dashboards: "external-grafana"
+  url: ${GRAFANA_CLUSTER_DASH_URL}
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: kubelet-grafanadashboard
+  namespace: grafana-operator
+spec:
+  folder: "Observability Accelerator Dashboards"
+  instanceSelector:
+    matchLabels:
+      dashboards: "external-grafana"
+  url: ${GRAFANA_KUBELET_DASH_URL}
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: namespace-workloads-grafanadashboard
+  namespace: grafana-operator
+spec:
+  folder: "Observability Accelerator Dashboards"
+  instanceSelector:
+    matchLabels:
+      dashboards: "external-grafana"
+  url: ${GRAFANA_NSWRKLDS_DASH_URL}
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: node-exporter-grafanadashboard
+  namespace: grafana-operator
+spec:
+  folder: "Observability Accelerator Dashboards"
   instanceSelector:
     matchLabels:
       dashboards: "external-grafana"
   url: ${GRAFANA_NODEEXP_DASH_URL}
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: nodes-grafanadashboard
+  namespace: grafana-operator
+spec:
+  folder: "Observability Accelerator Dashboards"
+  instanceSelector:
+    matchLabels:
+      dashboards: "external-grafana"
+  url: ${GRAFANA_NODES_DASH_URL}
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: workloads-grafanadashboard
+  namespace: grafana-operator
+spec:
+  folder: "Observability Accelerator Dashboards"
+  instanceSelector:
+    matchLabels:
+      dashboards: "external-grafana"
+  url: ${GRAFANA_WORKLOADS_DASH_URL}