From 1d731aca31cdeb26e9fe9d017e609a5ba1621a30 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Fri, 2 Jun 2023 16:58:43 -0400 Subject: [PATCH 1/5] Adding all Grafana Dashboards --- artifacts/grafana-dashboards/cluster.json | 2 +- artifacts/grafana-dashboards/kubelet.json | 2 +- .../namespace-workloads.json | 2 +- .../nodeexporter-nodes.json | 2 +- artifacts/grafana-dashboards/nodes.json | 2 +- artifacts/grafana-dashboards/workloads.json | 2 +- .../amg_grafana-dashboard.yaml | 57 ++++++++++++++++++- 7 files changed, 62 insertions(+), 7 deletions(-) diff --git a/artifacts/grafana-dashboards/cluster.json b/artifacts/grafana-dashboards/cluster.json index 7ca1e3e..afdc92e 100644 --- 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 index 47e6750..d96e136 100644 --- 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 index 306e078..a99e4f1 100644 --- 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 index 0d01759..0901c9d 100644 --- 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 index 0f74d1e..37fb075 100644 --- 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 index 31223d6..7a0e53e 100644 --- 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 index 73df951..6bcbcc4 100644 --- a/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml +++ b/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml @@ -1,10 +1,65 @@ apiVersion: grafana.integreatly.org/v1beta1 kind: GrafanaDashboard metadata: - name: external-grafanadashboard-url + name: cluster-grafanadashboard + namespace: grafana-operator +spec: + 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: + 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: + 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: 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: + 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: + instanceSelector: + matchLabels: + dashboards: "external-grafana" + url: ${GRAFANA_WORKLOADS_DASH_URL} \ No newline at end of file From db233193fbcb470ff98acbf94eefe07c2585dc01 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Sat, 3 Jun 2023 08:49:24 -0400 Subject: [PATCH 2/5] Adding all Grafana Dashboards with folders --- .../grafana-operator-manifests/amg_grafana-dashboard.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml b/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml index 6bcbcc4..3c33577 100644 --- a/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml +++ b/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml @@ -4,6 +4,7 @@ metadata: name: cluster-grafanadashboard namespace: grafana-operator spec: + folder: "Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -15,6 +16,7 @@ metadata: name: kubelet-grafanadashboard namespace: grafana-operator spec: + folder: "Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -26,6 +28,7 @@ metadata: name: namespace-workloads-grafanadashboard namespace: grafana-operator spec: + folder: "Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -37,6 +40,7 @@ metadata: name: node-exporter-grafanadashboard namespace: grafana-operator spec: + folder: "Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -48,6 +52,7 @@ metadata: name: nodes-grafanadashboard namespace: grafana-operator spec: + folder: "Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -59,6 +64,7 @@ metadata: name: workloads-grafanadashboard namespace: grafana-operator spec: + folder: "Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" From e621250095282c3bed686043151283757de1e0fe Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Sat, 3 Jun 2023 08:57:08 -0400 Subject: [PATCH 3/5] Adding all Grafana Dashboards with folders --- .../amg_grafana-dashboard.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml b/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml index 3c33577..b944eb8 100644 --- a/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml +++ b/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml @@ -4,7 +4,7 @@ metadata: name: cluster-grafanadashboard namespace: grafana-operator spec: - folder: "Observability Accelerator" + folder: "AWS Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -16,7 +16,7 @@ metadata: name: kubelet-grafanadashboard namespace: grafana-operator spec: - folder: "Observability Accelerator" + folder: "AWS Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -28,7 +28,7 @@ metadata: name: namespace-workloads-grafanadashboard namespace: grafana-operator spec: - folder: "Observability Accelerator" + folder: "AWS Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -40,7 +40,7 @@ metadata: name: node-exporter-grafanadashboard namespace: grafana-operator spec: - folder: "Observability Accelerator" + folder: "AWS Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -52,7 +52,7 @@ metadata: name: nodes-grafanadashboard namespace: grafana-operator spec: - folder: "Observability Accelerator" + folder: "AWS Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -64,7 +64,7 @@ metadata: name: workloads-grafanadashboard namespace: grafana-operator spec: - folder: "Observability Accelerator" + folder: "AWS Observability Accelerator" instanceSelector: matchLabels: dashboards: "external-grafana" From b66f0b4f9225e386771664d023fee68bc8ed18d5 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Sat, 3 Jun 2023 11:56:54 -0400 Subject: [PATCH 4/5] Fixing Grafana Operator Version and cleaning full boards and PR Issues --- .../amg_grafana-dashboard.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml b/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml index b944eb8..a0c55c8 100644 --- a/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml +++ b/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml @@ -4,7 +4,7 @@ metadata: name: cluster-grafanadashboard namespace: grafana-operator spec: - folder: "AWS Observability Accelerator" + folder: "Observability Accelerator Dashboards" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -16,7 +16,7 @@ metadata: name: kubelet-grafanadashboard namespace: grafana-operator spec: - folder: "AWS Observability Accelerator" + folder: "Observability Accelerator Dashboards" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -28,7 +28,7 @@ metadata: name: namespace-workloads-grafanadashboard namespace: grafana-operator spec: - folder: "AWS Observability Accelerator" + folder: "Observability Accelerator Dashboards" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -40,7 +40,7 @@ metadata: name: node-exporter-grafanadashboard namespace: grafana-operator spec: - folder: "AWS Observability Accelerator" + folder: "Observability Accelerator Dashboards" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -52,7 +52,7 @@ metadata: name: nodes-grafanadashboard namespace: grafana-operator spec: - folder: "AWS Observability Accelerator" + folder: "Observability Accelerator Dashboards" instanceSelector: matchLabels: dashboards: "external-grafana" @@ -64,7 +64,7 @@ metadata: name: workloads-grafanadashboard namespace: grafana-operator spec: - folder: "AWS Observability Accelerator" + folder: "Observability Accelerator Dashboards" instanceSelector: matchLabels: dashboards: "external-grafana" From 7471fc814393fa271438bac52c5db51386947c0f Mon Sep 17 00:00:00 2001 From: Rodrigue Koffi Date: Mon, 5 Jun 2023 10:51:12 +0200 Subject: [PATCH 5/5] Pre-commit --- artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml b/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml index a0c55c8..3a8f152 100644 --- a/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml +++ b/artifacts/grafana-operator-manifests/amg_grafana-dashboard.yaml @@ -68,4 +68,4 @@ spec: instanceSelector: matchLabels: dashboards: "external-grafana" - url: ${GRAFANA_WORKLOADS_DASH_URL} \ No newline at end of file + url: ${GRAFANA_WORKLOADS_DASH_URL}