Merge pull request #136 from aws-observability/acceleratorUpgrade1.3

Upgrade Packages
aws-observability · Dec 18, 2023 · 3b9c55d · 3b9c55d
2 parents 0f9c53a + b247c8c
commit 3b9c55d
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -70,9 +70,9 @@ Check the installed version of npm:
 npm -v
 ```
 
-The output should be a version greater than `9.7.x`.
+The output should be a version greater than `10.1.x`.
 
-If your npm version is not `9.7.x` or above, update npm with the following command:
+If your npm version is not `10.1.x` or above, update npm with the following command:
 
 ```bash
 sudo npm install -g npm@latest
@@ -118,23 +118,23 @@ sudo n stable
 
 3. Make sure the following pre-requisites are met:
 
-- Node version is a current stable node version 18.x.
+- Node version is a current stable node version 20.x.x
 
 ```bash
 $ node -v
-v20.3.1
+v20.8.0
 ```
 
 Update (provided Node version manager is installed): `n stable`. May require `sudo`.
 
-- NPM version must be 8.4 or above:
+- NPM version must be 10.1 or above:
 
 ```bash
 $ npm -v
-9.7.2
+10.1.0
 ```
 
-Updating npm: `sudo n stable` where stable can also be a specific version above 8.4. May require `sudo`.
+Updating npm: `sudo n stable` where stable can also be a specific version above 10.1. May require `sudo`.
 
 ### Repo setup
 
@@ -177,16 +177,17 @@ Example:
 Patterns:
 
 	existing-eks-awsnative-observability
-    existing-eks-mixed-observability
-    existing-eks-opensource-observability
-    multi-acc-new-eks-mixed-observability
-    single-new-eks-awsnative-fargate-observability
-    single-new-eks-awsnative-observability
-    single-new-eks-cluster
-    single-new-eks-gpu-opensource-observability
-    single-new-eks-graviton-opensource-observability
-    single-new-eks-mixed-observability
-    single-new-eks-opensource-observability
+	existing-eks-mixed-observability
+	existing-eks-opensource-observability
+	multi-acc-new-eks-mixed-observability
+	single-new-eks-awsnative-fargate-observability
+	single-new-eks-awsnative-observability
+	single-new-eks-cluster
+	single-new-eks-fargate-opensource-observability
+	single-new-eks-gpu-opensource-observability
+	single-new-eks-graviton-opensource-observability
+	single-new-eks-mixed-observability
+	single-new-eks-opensource-observability
 ```
 
 - Bootstrap your CDK environment.

diff --git a/...existing-eks-observability-accelerators/existing-eks-awsnative-observability.md b/...existing-eks-observability-accelerators/existing-eks-awsnative-observability.md
@@ -85,14 +85,13 @@ kubectl get ns # Output shows all namespace
 Output:
 ```
 NAME                       STATUS   AGE
-amazon-metrics             Active   4m31s
-aws-for-fluent-bit         Active   4m31s
-cert-manager               Active   4m31s
-default                    Active   24m
-kube-node-lease            Active   24m
-kube-public                Active   24m
-kube-system                Active   24m
-prometheus-node-exporter   Active   13m
+amazon-cloudwatch          Active   5h36m
+cert-manager               Active   5h36m
+default                    Active   5h46m
+kube-node-lease            Active   5h46m
+kube-public                Active   5h46m
+kube-system                Active   5h46m
+prometheus-node-exporter   Active   5h36m
 ```
 
 ## Visualization

diff --git a/...le-new-eks-observability-accelerators/single-new-eks-awsnative-observability.md b/...le-new-eks-observability-accelerators/single-new-eks-awsnative-observability.md
@@ -85,14 +85,13 @@ Output:
 
 ```console
 NAME                       STATUS   AGE
-amazon-metrics             Active   10m
-aws-for-fluent-bit         Active   10m
-cert-manager               Active   10m
-default                    Active   16m
-kube-node-lease            Active   16m
-kube-public                Active   16m
-kube-system                Active   16m
-prometheus-node-exporter   Active   10m
+amazon-cloudwatch          Active   5h36m
+cert-manager               Active   5h36m
+default                    Active   5h46m
+kube-node-lease            Active   5h46m
+kube-public                Active   5h46m
+kube-system                Active   5h46m
+prometheus-node-exporter   Active   5h36m
 ```
 
 ## Visualization

diff --git a/lib/existing-eks-awsnative-observability-pattern/index.ts b/lib/existing-eks-awsnative-observability-pattern/index.ts
@@ -34,10 +34,7 @@ export default class ExistingEksAwsNativeObservabilityPattern {
         });
 
         const addOns: Array<blueprints.ClusterAddOn> = [
-            new blueprints.addons.CloudWatchLogsAddon({
-                logGroupPrefix: `/aws/eks/${stackId}`,
-                logRetentionDays: 30
-            })
+            new blueprints.addons.XrayAddOn()
         ];
 
         ObservabilityBuilder.builder()

diff --git a/lib/single-new-eks-awsnative-observability-pattern/index.ts b/lib/single-new-eks-awsnative-observability-pattern/index.ts
@@ -10,10 +10,6 @@ export default class SingleNewEksClusterAWSNativeobservabilityPattern {
         const region = process.env.COA_AWS_REGION! || process.env.CDK_DEFAULT_REGION!;
 
         const addOns: Array<blueprints.ClusterAddOn> = [
-            new blueprints.addons.CloudWatchLogsAddon({
-                logGroupPrefix: `/aws/eks/${stackId}`,
-                logRetentionDays: 30
-            }),
             new blueprints.addons.XrayAddOn()
         ];
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cdk-aws-observability-accelerator",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "scripts": {
     "build": "rm -rf dist && tsc --skipLibCheck",
     "watch": "tsc -w",
@@ -10,29 +10,30 @@
     "lint": "npx eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "devDependencies": {
-    "@aws-quickstart/eks-blueprints": "^1.12.0",
-    "@types/jest": "^29.5.1",
-    "@types/node": "^18.17.5",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
+    "@aws-quickstart/eks-blueprints": "^1.13.1",
+    "@types/jest": "^29.5.11",
+    "@types/node": "^20.10.4",
+    "@typescript-eslint/eslint-plugin": "^6.14.0",
+    "@typescript-eslint/parser": "^6.14.0",
+    "aws-cdk": "2.114.1",
     "copyfiles": "^2.4.1",
-    "eslint": "^8.38.0",
-    "jest": "^29.6.2",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
+    "eslint": "^8.55.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@aws-quickstart/eks-blueprints": "^1.12.0",
-    "aws-cdk": "2.99.1",
+    "@aws-quickstart/eks-blueprints": "^1.13.1",
+    "aws-cdk": "2.114.1",
     "aws-sdk": "^2.1455.0",
-    "constructs": "^10.2.33",
+    "constructs": "^10.3.0",
     "eks-blueprints-cdk-kubeflow-ext": "0.1.9",
     "source-map-support": "^0.5.21"
   },
   "overrides": {
-    "@aws-quickstart/eks-blueprints": "^1.12.0",
-    "aws-cdk": "2.99.1",
+    "@aws-quickstart/eks-blueprints": "^1.13.1",
+    "aws-cdk": "2.114.1",
     "xml2js": "0.5.0"
   }
 }