Merge pull request #117 from aws-observability/fix/issueAMPEndpoint

Fixing AMP Endpoint Issue

Author: elamaran11

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

@@ -118,8 +118,8 @@ export default class ExistingEksOpenSourceobservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns()
             .withAmpProps(ampAddOnProps)
+            .enableOpenSourcePatternAddOns()
             .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/multi-acc-new-eks-mixed-observability-pattern/amp-monitoring.ts

@@ -63,8 +63,8 @@ export default class AmpMonitoringConstruct {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns()
             .withAmpProps(ampAddOnProps)
+            .enableOpenSourcePatternAddOns()
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .addOns(...addOns)
             .teams(new team.TeamGeordi, new team.CorePlatformTeam);

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

@@ -75,8 +75,8 @@ export default class SingleNewEksGpuOpenSourceObservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns()
             .withAmpProps(ampAddOnProps)
+            .enableOpenSourcePatternAddOns()
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .clusterProvider(
                 new blueprints.GenericClusterProvider({

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

@@ -92,8 +92,8 @@ export default class SingleNewEksGravitonOpenSourceObservabilityPattern {
             .account(account)
             .region(region)
             .version('auto')
-            .enableOpenSourcePatternAddOns()
             .withAmpProps(ampAddOnProps)
+            .enableOpenSourcePatternAddOns()
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .clusterProvider(new blueprints.MngClusterProvider(mngProps))
             .addOns(...addOns)

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

@@ -99,11 +99,11 @@ export default class SingleNewEksOpenSourceobservabilityPattern {
         ObservabilityBuilder.builder()
             .account(account)
             .region(region)
+            .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .version('auto')
-            .enableOpenSourcePatternAddOns()
             .withAmpProps(ampAddOnProps)
-            .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
+            .enableOpenSourcePatternAddOns()
             .addOns(...addOns)
             .build(scope, stackId);
     }
-}
+}