From 3353c472169760a1e616484a69ea8abbb035f302 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Sun, 27 Aug 2023 18:15:01 -0400 Subject: [PATCH 1/5] Observability Builder Upgrade --- .../index.ts | 9 ++++----- .../index.ts | 5 ++--- .../index.ts | 11 +++-------- .../index.ts | 9 ++------- lib/single-new-eks-cluster-pattern/index.ts | 4 +--- .../index.ts | 14 +++++--------- .../graviton-index.ts | 15 ++++----------- .../index.ts | 14 +++----------- package.json | 6 +++--- 9 files changed, 27 insertions(+), 60 deletions(-) diff --git a/lib/existing-eks-awsnative-observability-pattern/index.ts b/lib/existing-eks-awsnative-observability-pattern/index.ts index 4658bda7..61583895 100644 --- a/lib/existing-eks-awsnative-observability-pattern/index.ts +++ b/lib/existing-eks-awsnative-observability-pattern/index.ts @@ -1,13 +1,13 @@ // import { Construct } from 'constructs'; import { ImportClusterProvider, utils } from '@aws-quickstart/eks-blueprints'; import * as blueprints from '@aws-quickstart/eks-blueprints'; -import { ObservabilityBuilder } from '../common/observability-builder'; +import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints'; import * as cdk from "aws-cdk-lib"; import * as eks from 'aws-cdk-lib/aws-eks'; export default class ExistingEksAwsNativeObservabilityPattern { async buildAsync(scope: cdk.App, id: string) { - // AddOns for the cluster + const stackId = `${id}-observability-accelerator`; const clusterName = utils.valueFromContext(scope, "existing.cluster.name", undefined); const kubectlRoleName = utils.valueFromContext(scope, "existing.kubectl.rolename", undefined); @@ -37,15 +37,14 @@ export default class ExistingEksAwsNativeObservabilityPattern { new blueprints.addons.CloudWatchLogsAddon({ logGroupPrefix: `/aws/eks/${stackId}`, logRetentionDays: 30 - }), - new blueprints.addons.ContainerInsightsAddOn(), + }) ]; ObservabilityBuilder.builder() .account(account) .region(region) .version('auto') - .addExistingClusterObservabilityBuilderAddOns() + .enableNativePatternAddOns() .clusterProvider(importClusterProvider) .resourceProvider(blueprints.GlobalResources.Vpc, new blueprints.VpcProvider(vpcId)) // this is required with import cluster provider .addOns(...addOns) diff --git a/lib/existing-eks-mixed-observability-pattern/index.ts b/lib/existing-eks-mixed-observability-pattern/index.ts index 7bf9f2a1..bfb30b7f 100644 --- a/lib/existing-eks-mixed-observability-pattern/index.ts +++ b/lib/existing-eks-mixed-observability-pattern/index.ts @@ -1,7 +1,7 @@ import { ImportClusterProvider, utils } from '@aws-quickstart/eks-blueprints'; import * as blueprints from '@aws-quickstart/eks-blueprints'; import { cloudWatchDeploymentMode } from '@aws-quickstart/eks-blueprints'; -import { ObservabilityBuilder } from '../common/observability-builder'; +import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints'; import * as cdk from "aws-cdk-lib"; import * as eks from 'aws-cdk-lib/aws-eks'; @@ -46,7 +46,6 @@ export default class ExistingEksMixedobservabilityPattern { logGroupPrefix: `/aws/eks/${stackId}`, logRetentionDays: 30 }), - new blueprints.addons.AdotCollectorAddOn(), cloudWatchAdotAddOn, new blueprints.addons.XrayAdotAddOn(), ]; @@ -55,7 +54,7 @@ export default class ExistingEksMixedobservabilityPattern { .account(account) .region(region) .version('auto') - .addExistingClusterObservabilityBuilderAddOns() + .enableMixedPatternAddOns() .clusterProvider(importClusterProvider) .resourceProvider(blueprints.GlobalResources.Vpc, new blueprints.VpcProvider(vpcId)) // this is required with import cluster provider .addOns(...addOns) diff --git a/lib/existing-eks-opensource-observability-pattern/index.ts b/lib/existing-eks-opensource-observability-pattern/index.ts index ed64b1c9..e8b4b706 100644 --- a/lib/existing-eks-opensource-observability-pattern/index.ts +++ b/lib/existing-eks-opensource-observability-pattern/index.ts @@ -3,7 +3,7 @@ import { ImportClusterProvider, utils } from '@aws-quickstart/eks-blueprints'; import * as blueprints from '@aws-quickstart/eks-blueprints'; import { GrafanaOperatorSecretAddon } from './grafanaoperatorsecretaddon'; import * as amp from 'aws-cdk-lib/aws-aps'; -import { ObservabilityBuilder } from '../common/observability-builder'; +import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints'; import * as cdk from "aws-cdk-lib"; import * as eks from 'aws-cdk-lib/aws-eks'; @@ -76,13 +76,8 @@ export default class ExistingEksOpenSourceobservabilityPattern { logGroupPrefix: `/aws/eks/${stackId}`, logRetentionDays: 30 }), - new blueprints.addons.AdotCollectorAddOn(), - new blueprints.addons.AmpAddOn(ampAddOnProps), + // new blueprints.addons.AmpAddOn(ampAddOnProps), new blueprints.addons.XrayAdotAddOn(), - new blueprints.addons.ExternalsSecretsAddOn(), - new blueprints.addons.GrafanaOperatorAddon({ - version: 'v5.0.0-rc3' - }), new blueprints.addons.FluxCDAddOn({"repositories": [fluxRepository]}), new GrafanaOperatorSecretAddon(), ]; @@ -91,7 +86,7 @@ export default class ExistingEksOpenSourceobservabilityPattern { .account(account) .region(region) .version('auto') - .addExistingClusterObservabilityBuilderAddOns() + .enableOpenSourcePatternAddOns(ampEndpoint) .clusterProvider(importClusterProvider) .resourceProvider(blueprints.GlobalResources.Vpc, new blueprints.VpcProvider(vpcId)) // this is required with import cluster provider .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName)) diff --git a/lib/single-new-eks-awsnative-observability-pattern/index.ts b/lib/single-new-eks-awsnative-observability-pattern/index.ts index 35b6f361..44933d4f 100644 --- a/lib/single-new-eks-awsnative-observability-pattern/index.ts +++ b/lib/single-new-eks-awsnative-observability-pattern/index.ts @@ -1,24 +1,19 @@ import { Construct } from 'constructs'; import * as blueprints from '@aws-quickstart/eks-blueprints'; -import { ObservabilityBuilder } from '../common/observability-builder'; +import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints'; export default class SingleNewEksClusterAWSNativeobservabilityPattern { 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!; const region = process.env.COA_AWS_REGION! || process.env.CDK_DEFAULT_REGION!; const addOns: Array = [ - new blueprints.addons.KubeProxyAddOn(), - new blueprints.addons.AwsLoadBalancerControllerAddOn(), - new blueprints.addons.CertManagerAddOn(), new blueprints.addons.CloudWatchLogsAddon({ logGroupPrefix: `/aws/eks/${stackId}`, logRetentionDays: 30 }), - new blueprints.addons.ContainerInsightsAddOn(), new blueprints.addons.XrayAddOn() ]; @@ -26,7 +21,7 @@ export default class SingleNewEksClusterAWSNativeobservabilityPattern { .account(account) .region(region) .version('auto') - .addNewClusterObservabilityBuilderAddOns() + .enableNativePatternAddOns() .addOns(...addOns) .build(scope, stackId); } diff --git a/lib/single-new-eks-cluster-pattern/index.ts b/lib/single-new-eks-cluster-pattern/index.ts index 581be31f..bf66c1be 100644 --- a/lib/single-new-eks-cluster-pattern/index.ts +++ b/lib/single-new-eks-cluster-pattern/index.ts @@ -1,6 +1,6 @@ import { Construct } from 'constructs'; import * as blueprints from '@aws-quickstart/eks-blueprints'; -import { ObservabilityBuilder } from '../common/observability-builder'; +import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints'; export default class SingleNewEksPattern { constructor(scope: Construct, id: string) { @@ -10,7 +10,6 @@ export default class SingleNewEksPattern { const region = process.env.COA_AWS_REGION! || process.env.CDK_DEFAULT_REGION!; const addOns: Array = [ - new blueprints.addons.KubeProxyAddOn(), new blueprints.addons.ClusterAutoScalerAddOn() ]; @@ -18,7 +17,6 @@ export default class SingleNewEksPattern { .account(account) .region(region) .version('auto') - .addNewClusterObservabilityBuilderAddOns() .addOns(...addOns) .build(scope, stackId); } diff --git a/lib/single-new-eks-mixed-observability-pattern/index.ts b/lib/single-new-eks-mixed-observability-pattern/index.ts index 4c3f5d5f..60f35e66 100644 --- a/lib/single-new-eks-mixed-observability-pattern/index.ts +++ b/lib/single-new-eks-mixed-observability-pattern/index.ts @@ -1,13 +1,12 @@ import { Construct } from 'constructs'; import * as blueprints from '@aws-quickstart/eks-blueprints'; import { cloudWatchDeploymentMode } from '@aws-quickstart/eks-blueprints'; -import { ObservabilityBuilder } from '../common/observability-builder'; +import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints'; export default class SingleNewEksMixedobservabilityPattern { constructor(scope: Construct, id: string) { - // AddOns for the cluster - const stackId = `${id}-observability-accelerator`; + const stackId = `${id}-observability-accelerator`; const account = process.env.COA_ACCOUNT_ID! || process.env.CDK_DEFAULT_ACCOUNT!; const region = process.env.COA_AWS_REGION! || process.env.CDK_DEFAULT_REGION!; @@ -18,16 +17,13 @@ export default class SingleNewEksMixedobservabilityPattern { metricsNameSelectors: ['apiserver_request_.*', 'container_memory_.*', 'container_threads', 'otelcol_process_.*'], }); + Reflect.defineMetadata("ordered", true, blueprints.addons.XrayAdotAddOn); const addOns: Array = [ - new blueprints.addons.KubeProxyAddOn(), - new blueprints.addons.AwsLoadBalancerControllerAddOn(), - new blueprints.addons.CertManagerAddOn(), + cloudWatchAdotAddOn, new blueprints.addons.CloudWatchLogsAddon({ logGroupPrefix: `/aws/eks/${stackId}`, logRetentionDays: 30 }), - new blueprints.addons.AdotCollectorAddOn(), - cloudWatchAdotAddOn, new blueprints.addons.XrayAdotAddOn(), ]; @@ -35,7 +31,7 @@ export default class SingleNewEksMixedobservabilityPattern { .account(account) .region(region) .version('auto') - .addNewClusterObservabilityBuilderAddOns() + .enableMixedPatternAddOns() .addOns(...addOns) .build(scope, stackId); } diff --git a/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts b/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts index 69222c70..f6fb8636 100644 --- a/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts +++ b/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts @@ -5,7 +5,7 @@ import { GrafanaOperatorSecretAddon } from './grafanaoperatorsecretaddon'; import * as amp from 'aws-cdk-lib/aws-aps'; import * as eks from 'aws-cdk-lib/aws-eks'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; -import { ObservabilityBuilder } from '../common/observability-builder'; +import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints'; export default class SingleNewEksGravitonOpenSourceObservabilityPattern { constructor(scope: Construct, id: string) { @@ -53,20 +53,13 @@ export default class SingleNewEksGravitonOpenSourceObservabilityPattern { Reflect.defineMetadata("ordered", true, blueprints.addons.GrafanaOperatorAddon); const addOns: Array = [ - new blueprints.addons.KubeProxyAddOn("v1.27.1-eksbuild.1"), - new blueprints.addons.AwsLoadBalancerControllerAddOn(), - new blueprints.addons.CertManagerAddOn(), + // new blueprints.addons.KubeProxyAddOn("v1.27.1-eksbuild.1"), new blueprints.addons.CloudWatchLogsAddon({ logGroupPrefix: `/aws/eks/${stackId}`, logRetentionDays: 30 }), - new blueprints.addons.AdotCollectorAddOn(), - new blueprints.addons.AmpAddOn(ampAddOnProps), + // new blueprints.addons.AmpAddOn(ampAddOnProps), new blueprints.addons.XrayAdotAddOn(), - new blueprints.addons.ExternalsSecretsAddOn(), - new blueprints.addons.GrafanaOperatorAddon({ - version: 'v5.0.0-rc3' - }), new blueprints.addons.FluxCDAddOn({"repositories": [fluxRepository]}), new GrafanaOperatorSecretAddon(), ]; @@ -81,7 +74,7 @@ export default class SingleNewEksGravitonOpenSourceObservabilityPattern { .account(account) .region(region) .version('auto') - .addNewClusterObservabilityBuilderAddOns() + .enableOpenSourcePatternAddOns(ampEndpoint) .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName)) .clusterProvider(new blueprints.MngClusterProvider(mngProps)) .addOns(...addOns) diff --git a/lib/single-new-eks-opensource-observability-pattern/index.ts b/lib/single-new-eks-opensource-observability-pattern/index.ts index 8cffa1f1..f8a942b1 100644 --- a/lib/single-new-eks-opensource-observability-pattern/index.ts +++ b/lib/single-new-eks-opensource-observability-pattern/index.ts @@ -3,7 +3,7 @@ import { utils } from '@aws-quickstart/eks-blueprints'; import * as blueprints from '@aws-quickstart/eks-blueprints'; import { GrafanaOperatorSecretAddon } from './grafanaoperatorsecretaddon'; import * as amp from 'aws-cdk-lib/aws-aps'; -import { ObservabilityBuilder } from '../common/observability-builder'; +import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints'; export default class SingleNewEksOpenSourceobservabilityPattern { @@ -55,20 +55,12 @@ export default class SingleNewEksOpenSourceobservabilityPattern { Reflect.defineMetadata("ordered", true, blueprints.addons.GrafanaOperatorAddon); const addOns: Array = [ - new blueprints.addons.KubeProxyAddOn(), - new blueprints.addons.AwsLoadBalancerControllerAddOn(), - new blueprints.addons.CertManagerAddOn(), new blueprints.addons.CloudWatchLogsAddon({ logGroupPrefix: `/aws/eks/${stackId}`, logRetentionDays: 30 }), - new blueprints.addons.AdotCollectorAddOn(), - new blueprints.addons.AmpAddOn(ampAddOnProps), + // new blueprints.addons.AmpAddOn(ampAddOnProps), new blueprints.addons.XrayAdotAddOn(), - new blueprints.addons.ExternalsSecretsAddOn(), - new blueprints.addons.GrafanaOperatorAddon({ - version: 'v5.0.0-rc3' - }), new blueprints.addons.FluxCDAddOn({"repositories": [fluxRepository]}), new GrafanaOperatorSecretAddon(), ]; @@ -77,7 +69,7 @@ export default class SingleNewEksOpenSourceobservabilityPattern { .account(account) .region(region) .version('auto') - .addNewClusterObservabilityBuilderAddOns() + .enableOpenSourcePatternAddOns(ampEndpoint) .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName)) .addOns(...addOns) .build(scope, stackId); diff --git a/package.json b/package.json index 9b656323..7a57da87 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "lint": "npx eslint . --ext .js,.jsx,.ts,.tsx" }, "devDependencies": { - "@aws-quickstart/eks-blueprints": "^1.11.0", + "@aws-quickstart/eks-blueprints": "^1.11.2", "@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.0", + "@aws-quickstart/eks-blueprints": "^1.11.2", "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.0", + "@aws-quickstart/eks-blueprints": "^1.11.2", "aws-cdk": "2.91.0", "xml2js": "0.5.0" } From c4be957384e5c65fa65b2af9b2ebac529ae0ebc0 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Mon, 28 Aug 2023 11:54:36 -0400 Subject: [PATCH 2/5] Observability Builder Upgrade --- lib/common/observability-builder.ts | 52 ------------------- .../index.ts | 2 +- .../index.ts | 2 +- .../graviton-index.ts | 6 +-- .../index.ts | 6 +-- package.json | 8 +-- 6 files changed, 10 insertions(+), 66 deletions(-) delete mode 100644 lib/common/observability-builder.ts diff --git a/lib/common/observability-builder.ts b/lib/common/observability-builder.ts deleted file mode 100644 index bdff473d..00000000 --- a/lib/common/observability-builder.ts +++ /dev/null @@ -1,52 +0,0 @@ -import * as blueprints from '@aws-quickstart/eks-blueprints'; -import * as utils from '@aws-quickstart/eks-blueprints/dist/utils'; -import { NestedStack, NestedStackProps } from 'aws-cdk-lib'; -import { Construct } from 'constructs'; - -export class ObservabilityBuilder extends blueprints.BlueprintBuilder { - - public addNewClusterObservabilityBuilderAddOns(): ObservabilityBuilder { - return this.addOns( - new blueprints.addons.VpcCniAddOn(), - new blueprints.addons.CoreDnsAddOn(), - new blueprints.addons.MetricsServerAddOn(), - new blueprints.addons.PrometheusNodeExporterAddOn(), - new blueprints.addons.KubeStateMetricsAddOn()); - } - - public addExistingClusterObservabilityBuilderAddOns(): ObservabilityBuilder { - return this.addOns( - new blueprints.addons.AwsLoadBalancerControllerAddOn(), - new blueprints.addons.CertManagerAddOn()); - } - - public static builder(): ObservabilityBuilder { - const builder = new ObservabilityBuilder(); - builder.addOns( - new blueprints.NestedStackAddOn({ - id: "usage-tracking-addon", - builder: UsageTrackingAddOn.builder(), - })); - return builder; - } -} - -/** - * Nested stack that is used as tracker for Observability Accelerator - */ -export class UsageTrackingAddOn extends NestedStack { - - static readonly USAGE_ID = "qs-1u9l12gj7"; - - public static builder(): blueprints.NestedStackBuilder { - return { - build(scope: Construct, id: string, props: NestedStackProps) { - return new UsageTrackingAddOn(scope, id, props); - } - }; - } - - constructor(scope: Construct, id: string, props: NestedStackProps) { - super(scope, id, utils.withUsageTracking(UsageTrackingAddOn.USAGE_ID, props)); - } -} diff --git a/lib/existing-eks-opensource-observability-pattern/index.ts b/lib/existing-eks-opensource-observability-pattern/index.ts index e8b4b706..4bdaa979 100644 --- a/lib/existing-eks-opensource-observability-pattern/index.ts +++ b/lib/existing-eks-opensource-observability-pattern/index.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)) diff --git a/lib/single-new-eks-mixed-observability-pattern/index.ts b/lib/single-new-eks-mixed-observability-pattern/index.ts index 60f35e66..abff2e44 100644 --- a/lib/single-new-eks-mixed-observability-pattern/index.ts +++ b/lib/single-new-eks-mixed-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 = [ cloudWatchAdotAddOn, new blueprints.addons.CloudWatchLogsAddon({ diff --git a/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts b/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts index f6fb8636..1969b1e9 100644 --- a/lib/single-new-eks-opensource-observability-pattern/graviton-index.ts +++ b/lib/single-new-eks-opensource-observability-pattern/graviton-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 = [ - // 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) diff --git a/lib/single-new-eks-opensource-observability-pattern/index.ts b/lib/single-new-eks-opensource-observability-pattern/index.ts index f8a942b1..af95f4a5 100644 --- a/lib/single-new-eks-opensource-observability-pattern/index.ts +++ b/lib/single-new-eks-opensource-observability-pattern/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); diff --git a/package.json b/package.json index 7a57da87..07fe11ef 100644 --- a/package.json +++ b/package.json @@ -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" } From 1a273c15b7fa8c09d6f8dd0938564f08b36405e8 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Mon, 28 Aug 2023 12:00:41 -0400 Subject: [PATCH 3/5] Observability Builder Upgrade --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 07fe11ef..cd4ebc93 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "lint": "npx eslint . --ext .js,.jsx,.ts,.tsx" }, "devDependencies": { - "@aws-quickstart/eks-blueprints": "^1.11.3", + "@aws-quickstart/eks-blueprints": "^1.11.2", "@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.3", + "@aws-quickstart/eks-blueprints": "^1.11.2", "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.3", + "@aws-quickstart/eks-blueprints": "^1.11.2", "aws-cdk": "2.91.0", "xml2js": "0.5.0" } From ca40b4b1927335ea7cfbeafe0e37fe15cd96013e Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Mon, 28 Aug 2023 15:24:50 -0400 Subject: [PATCH 4/5] Observability Builder Upgrade --- lib/existing-eks-mixed-observability-pattern/index.ts | 2 +- lib/existing-eks-opensource-observability-pattern/index.ts | 2 +- lib/single-new-eks-awsnative-observability-pattern/index.ts | 2 +- package.json | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/existing-eks-mixed-observability-pattern/index.ts b/lib/existing-eks-mixed-observability-pattern/index.ts index bfb30b7f..2efd356d 100644 --- a/lib/existing-eks-mixed-observability-pattern/index.ts +++ b/lib/existing-eks-mixed-observability-pattern/index.ts @@ -7,7 +7,7 @@ import * as eks from 'aws-cdk-lib/aws-eks'; export default class ExistingEksMixedobservabilityPattern { async buildAsync(scope: cdk.App, id: string) { - // AddOns for the cluster + const stackId = `${id}-observability-accelerator`; const clusterName = utils.valueFromContext(scope, "existing.cluster.name", undefined); diff --git a/lib/existing-eks-opensource-observability-pattern/index.ts b/lib/existing-eks-opensource-observability-pattern/index.ts index 4bdaa979..38df6e83 100644 --- a/lib/existing-eks-opensource-observability-pattern/index.ts +++ b/lib/existing-eks-opensource-observability-pattern/index.ts @@ -9,7 +9,7 @@ import * as eks from 'aws-cdk-lib/aws-eks'; export default class ExistingEksOpenSourceobservabilityPattern { async buildAsync(scope: cdk.App, id: string) { - // AddOns for the cluster + const stackId = `${id}-observability-accelerator`; const clusterName = utils.valueFromContext(scope, "existing.cluster.name", undefined); const kubectlRoleName = utils.valueFromContext(scope, "existing.kubectl.rolename", undefined); diff --git a/lib/single-new-eks-awsnative-observability-pattern/index.ts b/lib/single-new-eks-awsnative-observability-pattern/index.ts index 44933d4f..e8642d7e 100644 --- a/lib/single-new-eks-awsnative-observability-pattern/index.ts +++ b/lib/single-new-eks-awsnative-observability-pattern/index.ts @@ -4,7 +4,7 @@ import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints'; export default class SingleNewEksClusterAWSNativeobservabilityPattern { 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!; const region = process.env.COA_AWS_REGION! || process.env.CDK_DEFAULT_REGION!; diff --git a/package.json b/package.json index cd4ebc93..07fe11ef 100644 --- a/package.json +++ b/package.json @@ -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" } From fbfd97dd2637bd7fe9a0dffba95f4a1d65023840 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Mon, 28 Aug 2023 15:26:04 -0400 Subject: [PATCH 5/5] Observability Builder Upgrade --- lib/existing-eks-opensource-observability-pattern/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/existing-eks-opensource-observability-pattern/index.ts b/lib/existing-eks-opensource-observability-pattern/index.ts index 38df6e83..32bcec5b 100644 --- a/lib/existing-eks-opensource-observability-pattern/index.ts +++ b/lib/existing-eks-opensource-observability-pattern/index.ts @@ -76,7 +76,6 @@ export default class ExistingEksOpenSourceobservabilityPattern { logGroupPrefix: `/aws/eks/${stackId}`, logRetentionDays: 30 }), - // new blueprints.addons.AmpAddOn(ampAddOnProps), new blueprints.addons.XrayAdotAddOn(), new blueprints.addons.FluxCDAddOn({"repositories": [fluxRepository]}), new GrafanaOperatorSecretAddon(),