Merge remote-tracking branch 'upstream/main' into fix-dashboards

Author: zjaco13

README.md

@@ -5,7 +5,7 @@ Welcome to the AWS Observability Accelerator for CDK!
 The AWS Observability Accelerator for CDK is a set of opinionated modules
 to help you set up observability for your AWS environments with AWS Native services and AWS-managed observability services such as Amazon Managed Service for Prometheus,Amazon Managed Grafana, AWS Distro for OpenTelemetry (ADOT) and Amazon CloudWatch.
 
-We provide curated metrics, logs, traces collection, alerting rules and Grafana dashboards for your EKS infrastructure, Java/JMX, NGINX based workloads and your custom applications.
+We provide curated metrics, logs, traces collection, cloudwatch dashboard, alerting rules and Grafana dashboards for your EKS infrastructure, Java/JMX, NGINX based workloads and your custom applications.
 
 ## Single EKS Cluster AWS Native Observability Accelerator
 

cdk.json

@@ -50,7 +50,7 @@
     "cluster.dashboard.url": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/cluster.json",
     "kubelet.dashboard.url": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/kubelet.json",
     "namespaceworkloads.dashboard.url": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/namespace-workloads.json",
-    "nodexporter.dashboard.url": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/nodeexporter-nodes.json",
+    "nodeexporter.dashboard.url": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/nodeexporter-nodes.json",
     "nodes.dashboard.url": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/nodes.json",
     "workloads.dashboard.url": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/workloads.json"
   }

docs/patterns/single-new-eks-observability-accelerators/single-new-eks-opensource-observability.md

@@ -75,11 +75,13 @@ export AMG_API_KEY=$(aws grafana create-workspace-api-key \
 5. AWS Secrets Manager for GRAFANA API KEY: Update the Grafana API key secret in AWS Secrets using the above new Grafana API key. This will be referenced by Grafana Operator deployment of our solution to access Amazon Managed Grafana from Amazon EKS Cluster
 
 ```bash
-export API_KEY_SECRET_NAME="grafana-api-key"
-aws secretsmanager update-secret \
-    --secret-id $API_KEY_SECRET_NAME \
+aws secretsmanager create-secret \
+    --name grafana-api-key \
+    --description "API Key of your Grafana Instance" \
     --secret-string "${AMG_API_KEY}" \
-    --region $AWS_REGION
+    --region $AWS_REGION \
+    --query ARN \
+    --output text
 ```
 
 6. Install project dependencies by running `npm install` in the main folder of this cloned repository. 

lib/single-new-eks-opensource-observability-construct/index.ts

@@ -25,7 +25,7 @@ export default class SingleNewEksOpenSourceobservabilityConstruct {
         const clusterDashUrl: string = utils.valueFromContext(scope, "cluster.dashboard.url", undefined);
         const kubeletDashUrl: string = utils.valueFromContext(scope, "kubelet.dashboard.url", undefined);
         const namespaceWorkloadsDashUrl: string = utils.valueFromContext(scope, "namespaceworkloads.dashboard.url", undefined);
-        const nodeExporterDashUrl: string = utils.valueFromContext(scope, "nodexporter.dashboard.url", undefined);
+        const nodeExporterDashUrl: string = utils.valueFromContext(scope, "nodeexporter.dashboard.url", undefined);
         const nodesDashUrl: string = utils.valueFromContext(scope, "nodes.dashboard.url", undefined);
         const workloadsDashUrl: string = utils.valueFromContext(scope, "workloads.dashboard.url", undefined);