Merge branch 'main' into main

aws-observability · Oct 8, 2023 · 633850b · 633850b
2 parents 1fd56ca + 5960e95
commit 633850b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/lib/existing-eks-opensource-observability-pattern/index.ts b/lib/existing-eks-opensource-observability-pattern/index.ts
@@ -118,8 +118,8 @@ export default class ExistingEksOpenSourceobservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .withAmpProps(ampAddOnProps)
             .enableOpenSourcePatternAddOns()
+            .withAmpProps(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/multi-acc-new-eks-mixed-observability-pattern/amp-monitoring.ts b/lib/multi-acc-new-eks-mixed-observability-pattern/amp-monitoring.ts
@@ -63,8 +63,8 @@ export default class AmpMonitoringConstruct {
             .account(account)
             .region(region)
             .version('auto')
-            .withAmpProps(ampAddOnProps)
             .enableOpenSourcePatternAddOns()
+            .withAmpProps(ampAddOnProps)
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .addOns(...addOns)
             .teams(new team.TeamGeordi, new team.CorePlatformTeam);

diff --git a/lib/multi-acc-new-eks-mixed-observability-pattern/central-monitoring.ts b/lib/multi-acc-new-eks-mixed-observability-pattern/central-monitoring.ts
@@ -24,7 +24,6 @@ export default class GrafanaOperatorConstruct {
         Reflect.defineMetadata("ordered", true, blueprints.addons.GrafanaOperatorAddon); //sets metadata ordered to true for GrafanaOperatorAddon
 
         const addOns: Array<blueprints.ClusterAddOn> = [
-            new blueprints.addons.XrayAdotAddOn(),
             new blueprints.addons.ClusterAutoScalerAddOn(),
             new blueprints.addons.SecretsStoreAddOn(),
             new blueprints.addons.ExternalsSecretsAddOn(),

diff --git a/lib/single-new-eks-opensource-observability-pattern/gpu-index.ts b/lib/single-new-eks-opensource-observability-pattern/gpu-index.ts
@@ -75,8 +75,8 @@ export default class SingleNewEksGpuOpenSourceObservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .withAmpProps(ampAddOnProps)
             .enableOpenSourcePatternAddOns()
+            .withAmpProps(ampAddOnProps)
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .clusterProvider(
                 new blueprints.GenericClusterProvider({

diff --git a/lib/single-new-eks-opensource-observability-pattern/index.ts b/lib/single-new-eks-opensource-observability-pattern/index.ts
@@ -100,8 +100,8 @@ export default class SingleNewEksOpenSourceobservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .withAmpProps(ampAddOnProps)
             .enableOpenSourcePatternAddOns()
+            .withAmpProps(ampAddOnProps)
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .addOns(...addOns)
             .build(scope, stackId);

diff --git a/package.json b/package.json
@@ -35,4 +35,4 @@
     "aws-cdk": "2.99.1",
     "xml2js": "0.5.0"
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,4 @@ @@
         "aws-cdk": "2.99.1",
         "xml2js": "0.5.0"
       }
-    }
+    }