From 86a181d4c1a058ca25ff9d223d4210197ff751c0 Mon Sep 17 00:00:00 2001 From: Ashok Srirama Date: Wed, 8 Jan 2025 07:21:10 -0500 Subject: [PATCH] Updates to documentation --- cdk.json | 4 +++- ...sting-eks-adotmetrics-collection-observability.md | 4 +++- .../existing-eks-apiserver-observability.md | 4 +++- .../existing-eks-nginx-observability.md | 4 +++- .../existing-eks-opensource-observability.md | 12 +++++++++--- ...dotmetrics-collection-opensource-observability.md | 4 +++- ...gle-new-eks-apiserver-opensource-observability.md | 4 +++- ...ew-eks-container-logs-opensource-observability.md | 4 +++- .../single-new-eks-gpu-opensource-observability.md | 4 +++- ...ngle-new-eks-graviton-opensource-observability.md | 12 +++++++++--- ...le-new-eks-inferentia-opensource-observability.md | 4 +++- .../single-new-eks-istio-opensource-observability.md | 4 +++- .../single-new-eks-java-opensource-observability.md | 4 +++- .../single-new-eks-nginx-opensource-observability.md | 4 +++- .../single-new-eks-opensource-observability.md | 4 +++- .../argocd-addon-config.ts | 6 +++++- .../pipeline.ts | 4 +++- 17 files changed, 65 insertions(+), 21 deletions(-) diff --git a/cdk.json b/cdk.json index 53b9b239..612bb0f8 100644 --- a/cdk.json +++ b/cdk.json @@ -32,7 +32,9 @@ "GRAFANA_NSWRKLDS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/namespace-workloads.json", "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_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" }, "kustomizations": [ { diff --git a/docs/patterns/existing-eks-observability-accelerators/existing-eks-adotmetrics-collection-observability.md b/docs/patterns/existing-eks-observability-accelerators/existing-eks-adotmetrics-collection-observability.md index c851b51f..46a39a5d 100644 --- a/docs/patterns/existing-eks-observability-accelerators/existing-eks-adotmetrics-collection-observability.md +++ b/docs/patterns/existing-eks-observability-accelerators/existing-eks-adotmetrics-collection-observability.md @@ -122,7 +122,9 @@ Example settings: Update the context in `cdk.json` file located in `cdk-eks-blue "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_ADOTHEALTH_DASH_URL": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/adot/adothealth.json" + "GRAFANA_ADOTHEALTH_DASH_URL": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/adot/adothealth.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" }, "kustomizations": [ { diff --git a/docs/patterns/existing-eks-observability-accelerators/existing-eks-apiserver-observability.md b/docs/patterns/existing-eks-observability-accelerators/existing-eks-apiserver-observability.md index b14df121..8f431f44 100644 --- a/docs/patterns/existing-eks-observability-accelerators/existing-eks-apiserver-observability.md +++ b/docs/patterns/existing-eks-observability-accelerators/existing-eks-apiserver-observability.md @@ -135,7 +135,9 @@ Example settings: Update the context in `cdk.json` file located in `cdk-eks-blue "GRAFANA_WORKLOADS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/workloads.json", "GRAFANA_APISERVER_BASIC_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-basic.json", "GRAFANA_APISERVER_ADVANCED_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-advanced.json", - "GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-troubleshooting.json" + "GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-troubleshooting.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" }, "kustomizations": [ { diff --git a/docs/patterns/existing-eks-observability-accelerators/existing-eks-nginx-observability.md b/docs/patterns/existing-eks-observability-accelerators/existing-eks-nginx-observability.md index a41386ae..8d6dc2a9 100644 --- a/docs/patterns/existing-eks-observability-accelerators/existing-eks-nginx-observability.md +++ b/docs/patterns/existing-eks-observability-accelerators/existing-eks-nginx-observability.md @@ -140,7 +140,9 @@ Example settings: Update the context in `cdk.json` file located in `cdk-eks-blue "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_NGINX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/nginx/nginx.json" + "GRAFANA_NGINX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/nginx/nginx.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" }, "kustomizations": [ { diff --git a/docs/patterns/existing-eks-observability-accelerators/existing-eks-opensource-observability.md b/docs/patterns/existing-eks-observability-accelerators/existing-eks-opensource-observability.md index 53516d82..4f3c721c 100644 --- a/docs/patterns/existing-eks-observability-accelerators/existing-eks-opensource-observability.md +++ b/docs/patterns/existing-eks-observability-accelerators/existing-eks-opensource-observability.md @@ -147,7 +147,9 @@ Example settings: Update the context in `cdk.json` file located in `cdk-eks-blue "GRAFANA_NSWRKLDS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/namespace-workloads.json", "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_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" }, "kustomizations": [ { @@ -178,7 +180,9 @@ If you need Java observability you can instead use: "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_JAVA_JMX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/java/default.json" + "GRAFANA_JAVA_JMX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/java/default.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" }, "kustomizations": [ { @@ -216,7 +220,9 @@ If you want to deploy API Server dashboards along with Java observability you ca "GRAFANA_JAVA_JMX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/java/default.json", "GRAFANA_APISERVER_BASIC_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-basic.json", "GRAFANA_APISERVER_ADVANCED_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-advanced.json", - "GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-troubleshooting.json" + "GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-troubleshooting.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" }, "kustomizations": [ { diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-adotmetrics-collection-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-adotmetrics-collection-opensource-observability.md index 2f72f840..01462031 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-adotmetrics-collection-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-adotmetrics-collection-opensource-observability.md @@ -35,7 +35,9 @@ Please follow the _Deploying_ instructions of the [New EKS Cluster Open Source O "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_ADOTHEALTH_DASH_URL": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/adot/adothealth.json" + "GRAFANA_ADOTHEALTH_DASH_URL": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/adot/adothealth.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" }, "kustomizations": [ { diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-apiserver-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-apiserver-opensource-observability.md index a737d0cf..0176066e 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-apiserver-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-apiserver-opensource-observability.md @@ -37,7 +37,9 @@ Please follow the _Deploying_ instructions of the [New EKS Cluster Open Source O "GRAFANA_WORKLOADS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/workloads.json", "GRAFANA_APISERVER_BASIC_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-basic.json", "GRAFANA_APISERVER_ADVANCED_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-advanced.json", - "GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-troubleshooting.json" + "GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-troubleshooting.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" }, "kustomizations": [ { diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-container-logs-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-container-logs-opensource-observability.md index 7084bb7d..f602a13b 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-container-logs-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-container-logs-opensource-observability.md @@ -34,7 +34,9 @@ Please follow the _Deploying_ instructions of the [New EKS Cluster Open Source O "GRAFANA_NSWRKLDS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/namespace-workloads.json", "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_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" }, "kustomizations": [ { diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-gpu-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-gpu-opensource-observability.md index 24a4c968..03847c52 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-gpu-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-gpu-opensource-observability.md @@ -131,7 +131,9 @@ Example settings: Update the context in `cdk.json` file located in `cdk-eks-blue "GRAFANA_NSWRKLDS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/namespace-workloads.json", "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_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" }, "kustomizations": [ { diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-graviton-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-graviton-opensource-observability.md index b62aeae5..595c0160 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-graviton-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-graviton-opensource-observability.md @@ -137,7 +137,9 @@ Example settings: Update the context in `cdk.json` file located in `cdk-eks-blue "GRAFANA_NSWRKLDS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/namespace-workloads.json", "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_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" }, "kustomizations": [ { @@ -168,7 +170,9 @@ If you need Java observability you can instead use: "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_JAVA_JMX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/java/default.json" + "GRAFANA_JAVA_JMX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/java/default.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" }, "kustomizations": [ { @@ -206,7 +210,9 @@ If you want to deploy API Server dashboards along with Java observability you ca "GRAFANA_JAVA_JMX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/java/default.json", "GRAFANA_APISERVER_BASIC_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-basic.json", "GRAFANA_APISERVER_ADVANCED_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-advanced.json", - "GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-troubleshooting.json" + "GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/apiserver/apiserver-troubleshooting.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" }, "kustomizations": [ { diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-inferentia-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-inferentia-opensource-observability.md index 4b8e1b9c..96393fe5 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-inferentia-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-inferentia-opensource-observability.md @@ -141,7 +141,9 @@ Example settings: Update the context in `cdk.json` file located in `cdk-eks-blue "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_NEURON_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/neuron/neuron-monitor.json" + "GRAFANA_NEURON_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/neuron/neuron-monitor.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" }, "kustomizations": [ { diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-istio-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-istio-opensource-observability.md index b1e99c77..0c7eacc0 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-istio-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-istio-opensource-observability.md @@ -45,7 +45,9 @@ Please follow the _Deploying_ instructions of the [New EKS Cluster Open Source O "GRAFANA_ISTIO_CP_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/v0.2.0/artifacts/grafana-dashboards/eks/istio/istio-control-plane-dashboard.json", "GRAFANA_ISTIO_MESH_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/v0.2.0/artifacts/grafana-dashboards/eks/istio/istio-mesh-dashboard.json", "GRAFANA_ISTIO_PERF_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/v0.2.0/artifacts/grafana-dashboards/eks/istio/istio-performance-dashboard.json", - "GRAFANA_ISTIO_SERVICE_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/v0.2.0/artifacts/grafana-dashboards/eks/istio/istio-service-dashboard.json" + "GRAFANA_ISTIO_SERVICE_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/v0.2.0/artifacts/grafana-dashboards/eks/istio/istio-service-dashboard.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" }, "kustomizations": [ { diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-java-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-java-opensource-observability.md index 0bc25cdf..91d4f459 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-java-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-java-opensource-observability.md @@ -37,7 +37,9 @@ Please follow the _Deploying_ instructions of the [New EKS Cluster Open Source O "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_JAVA_JMX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/java/default.json" + "GRAFANA_JAVA_JMX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/java/default.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" }, "kustomizations": [ { diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-nginx-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-nginx-opensource-observability.md index 3c22fcb3..6a2b6829 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-nginx-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-nginx-opensource-observability.md @@ -37,7 +37,9 @@ Please follow the _Deploying_ instructions of the [New EKS Cluster Open Source O "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_NGINX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/nginx/nginx.json" + "GRAFANA_NGINX_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/nginx/nginx.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" }, "kustomizations": [ { diff --git a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-opensource-observability.md b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-opensource-observability.md index a60edeac..0e6db6ad 100644 --- a/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-opensource-observability.md +++ b/docs/patterns/single-new-eks-observability-accelerators/single-new-eks-opensource-observability.md @@ -129,7 +129,9 @@ Example settings: Update the context in `cdk.json` file located in `cdk-eks-blue "GRAFANA_NSWRKLDS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/namespace-workloads.json", "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_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" }, "kustomizations": [ { diff --git a/lib/multi-acc-new-eks-mixed-observability-pattern/argocd-addon-config.ts b/lib/multi-acc-new-eks-mixed-observability-pattern/argocd-addon-config.ts index 548a4fa5..8786c9f5 100644 --- a/lib/multi-acc-new-eks-mixed-observability-pattern/argocd-addon-config.ts +++ b/lib/multi-acc-new-eks-mixed-observability-pattern/argocd-addon-config.ts @@ -16,6 +16,8 @@ export interface GrafanaOperatorProps { nodeExporterDashUrl: string; nodesDashUrl: string; workloadsDashUrl: string; + kshDashUrl: string; + kcmDashUrl: string; } @@ -71,7 +73,9 @@ export function createArgoCDAddonConfig(props: ArgoCDAddOnConfigProps) : bluepri GRAFANA_NSWRKLDS_DASH_URL: props.goProps.namespaceWorkloadsDashUrl, GRAFANA_NODEEXP_DASH_URL: props.goProps.nodeExporterDashUrl, GRAFANA_NODES_DASH_URL: props.goProps.nodesDashUrl, - GRAFANA_WORKLOADS_DASH_URL: props.goProps.workloadsDashUrl + GRAFANA_WORKLOADS_DASH_URL: props.goProps.workloadsDashUrl, + GRAFANA_KSH_DASH_URL: props.goProps.kshDashUrl, + GRAFANA_KCM_DASH_URL: props.goProps.kcmDashUrl }; // By default argocd-server is not publicaly exposed. uncomment this section, if you need to expose using ALB diff --git a/lib/multi-acc-new-eks-mixed-observability-pattern/pipeline.ts b/lib/multi-acc-new-eks-mixed-observability-pattern/pipeline.ts index 0fd8e8e4..1c2ff60e 100644 --- a/lib/multi-acc-new-eks-mixed-observability-pattern/pipeline.ts +++ b/lib/multi-acc-new-eks-mixed-observability-pattern/pipeline.ts @@ -163,7 +163,9 @@ export class PipelineMultiEnvMonitoring { namespaceWorkloadsDashUrl: utils.valueFromContext(scope, "namespaceworkloads.dashboard.url", undefined), nodeExporterDashUrl: utils.valueFromContext(scope, "nodeexporter.dashboard.url", undefined), nodesDashUrl: utils.valueFromContext(scope, "nodes.dashboard.url", undefined), - workloadsDashUrl: utils.valueFromContext(scope, "workloads.dashboard.url", undefined) + workloadsDashUrl: utils.valueFromContext(scope, "workloads.dashboard.url", undefined), + kshDashUrl: utils.valueFromContext(scope, "ksh.dashboard.url", undefined), + kcmDashUrl: utils.valueFromContext(scope, "kcm.dashboard.url", undefined), }; const monArgoCDAddOnConfigProps: ArgoCDAddOnConfigProps = { repoUrl: 'https://github.com/aws-observability/aws-observability-accelerator.git',