Observability Builder Upgrade

Author: elamaran11

lib/common/observability-builder.ts

@@ -86,7 +86,7 @@ export default class ExistingEksOpenSourceobservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns(ampEndpoint)
+            .enableOpenSourcePatternAddOns(ampAddOnProps)
             .clusterProvider(importClusterProvider)
             .resourceProvider(blueprints.GlobalResources.Vpc, new blueprints.VpcProvider(vpcId)) // this is required with import cluster provider
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))

lib/existing-eks-opensource-observability-pattern/index.ts

@@ -17,7 +17,7 @@ export default class SingleNewEksMixedobservabilityPattern {
             metricsNameSelectors: ['apiserver_request_.*', 'container_memory_.*', 'container_threads', 'otelcol_process_.*'],
         });
 
-        Reflect.defineMetadata("ordered", true, blueprints.addons.XrayAdotAddOn);
+        Reflect.defineMetadata("ordered", true, blueprints.addons.CloudWatchLogsAddon);
         const addOns: Array<blueprints.ClusterAddOn> = [
             cloudWatchAdotAddOn,
             new blueprints.addons.CloudWatchLogsAddon({

lib/single-new-eks-mixed-observability-pattern/index.ts

@@ -9,7 +9,7 @@ import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints';
 
 export default class SingleNewEksGravitonOpenSourceObservabilityPattern {
     constructor(scope: Construct, id: string) {
-        // AddOns for the cluster
+        
         const stackId = `${id}-observability-accelerator`;
 
         const account = process.env.COA_ACCOUNT_ID! || process.env.CDK_DEFAULT_ACCOUNT!;
@@ -53,12 +53,10 @@ export default class SingleNewEksGravitonOpenSourceObservabilityPattern {
 
         Reflect.defineMetadata("ordered", true, blueprints.addons.GrafanaOperatorAddon);
         const addOns: Array<blueprints.ClusterAddOn> = [
-            // new blueprints.addons.KubeProxyAddOn("v1.27.1-eksbuild.1"),
             new blueprints.addons.CloudWatchLogsAddon({
                 logGroupPrefix: `/aws/eks/${stackId}`,
                 logRetentionDays: 30
             }),
-            // new blueprints.addons.AmpAddOn(ampAddOnProps),
             new blueprints.addons.XrayAdotAddOn(),
             new blueprints.addons.FluxCDAddOn({"repositories": [fluxRepository]}),
             new GrafanaOperatorSecretAddon(),
@@ -74,7 +72,7 @@ export default class SingleNewEksGravitonOpenSourceObservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns(ampEndpoint)
+            .enableOpenSourcePatternAddOns(ampAddOnProps,"v1.27.1-eksbuild.1")
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .clusterProvider(new blueprints.MngClusterProvider(mngProps))
             .addOns(...addOns)

lib/single-new-eks-opensource-observability-pattern/graviton-index.ts

@@ -5,10 +5,9 @@ import { GrafanaOperatorSecretAddon } from './grafanaoperatorsecretaddon';
 import * as amp from 'aws-cdk-lib/aws-aps';
 import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints';
 
-
 export default class SingleNewEksOpenSourceobservabilityPattern {
     constructor(scope: Construct, id: string) {
-        // AddOns for the cluster
+        
         const stackId = `${id}-observability-accelerator`;
 
         const account = process.env.COA_ACCOUNT_ID! || process.env.CDK_DEFAULT_ACCOUNT!;
@@ -59,7 +58,6 @@ export default class SingleNewEksOpenSourceobservabilityPattern {
                 logGroupPrefix: `/aws/eks/${stackId}`,
                 logRetentionDays: 30
             }),
-            // new blueprints.addons.AmpAddOn(ampAddOnProps),
             new blueprints.addons.XrayAdotAddOn(),
             new blueprints.addons.FluxCDAddOn({"repositories": [fluxRepository]}),
             new GrafanaOperatorSecretAddon(),
@@ -69,7 +67,7 @@ export default class SingleNewEksOpenSourceobservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns(ampEndpoint)
+            .enableOpenSourcePatternAddOns(ampAddOnProps)
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .addOns(...addOns)
             .build(scope, stackId);

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

@@ -1,6 +1,6 @@
 {
   "name": "cdk-aws-observability-accelerator",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "scripts": {
     "build": "rm -rf dist && tsc --skipLibCheck",
     "watch": "tsc -w",
@@ -10,7 +10,7 @@
     "lint": "npx eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "devDependencies": {
-    "@aws-quickstart/eks-blueprints": "^1.11.2",
+    "@aws-quickstart/eks-blueprints": "^1.11.3",
     "@types/jest": "^29.5.1",
     "@types/node": "^18.15.12",
     "@typescript-eslint/eslint-plugin": "^5.59.0",
@@ -23,14 +23,14 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@aws-quickstart/eks-blueprints": "^1.11.2",
+    "@aws-quickstart/eks-blueprints": "^1.11.3",
     "constructs": "^10.0.0",
     "aws-cdk": "2.91.0",
     "eks-blueprints-cdk-kubeflow-ext": "0.1.9",
     "source-map-support": "^0.5.21"
   },
   "overrides": {
-    "@aws-quickstart/eks-blueprints": "^1.11.2",
+    "@aws-quickstart/eks-blueprints": "^1.11.3",
     "aws-cdk": "2.91.0",
     "xml2js": "0.5.0"
   }