included latest changes from agus

aws-observability · Mar 13, 2024 · cbaeb0d · cbaeb0d
1 parent c42d45f
commit cbaeb0d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 23 deletions.
diff --git a/aws-quickstart-eks-blueprints-1.13.1.tgz b/aws-quickstart-eks-blueprints-1.13.1.tgz
diff --git a/cdk.json b/cdk.json
@@ -21,19 +21,19 @@
       "name": "grafana-dashboards",
       "namespace": "grafana-operator",
       "repository": {
-        "repoUrl": "https://github.com/freschri/aws-observability-accelerator",
+        "repoUrl": "https://github.com/aws-observability/aws-observability-accelerator",
         "name": "grafana-dashboards",
-        "targetRevision": "neuron-dashboard",
+        "targetRevision": "main",
         "path": "./artifacts/grafana-operator-manifests/eks/infrastructure"
       },
       "values": {
-        "GRAFANA_CLUSTER_DASH_URL" : "https://raw.githubusercontent.com/freschri/aws-observability-accelerator/neuron-dashboard/artifacts/grafana-dashboards/eks/infrastructure/cluster.json",
-        "GRAFANA_KUBELET_DASH_URL" : "https://raw.githubusercontent.com/freschri/aws-observability-accelerator/neuron-dashboard/artifacts/grafana-dashboards/eks/infrastructure/kubelet.json",
-        "GRAFANA_NSWRKLDS_DASH_URL" : "https://raw.githubusercontent.com/freschri/aws-observability-accelerator/neuron-dashboard/artifacts/grafana-dashboards/eks/infrastructure/namespace-workloads.json",
-        "GRAFANA_NODEEXP_DASH_URL" : "https://raw.githubusercontent.com/freschri/aws-observability-accelerator/neuron-dashboard/artifacts/grafana-dashboards/eks/infrastructure/nodeexporter-nodes.json",
-        "GRAFANA_NODES_DASH_URL" : "https://raw.githubusercontent.com/freschri/aws-observability-accelerator/neuron-dashboard/artifacts/grafana-dashboards/eks/infrastructure/nodes.json",
-        "GRAFANA_WORKLOADS_DASH_URL" : "https://raw.githubusercontent.com/freschri/aws-observability-accelerator/neuron-dashboard/artifacts/grafana-dashboards/eks/infrastructure/workloads.json",
-        "GRAFANA_NEURON_DASH_URL" : "https://raw.githubusercontent.com/freschri/aws-observability-accelerator/neuron-dashboard/artifacts/grafana-dashboards/eks/neuron/neuron-monitor.json"
+        "GRAFANA_CLUSTER_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/cluster.json",
+        "GRAFANA_KUBELET_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/kubelet.json",
+        "GRAFANA_NSWRKLDS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/namespace-workloads.json",
+        "GRAFANA_NODEEXP_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/nodeexporter-nodes.json",
+        "GRAFANA_NODES_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/nodes.json",
+        "GRAFANA_WORKLOADS_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/workloads.json",
+        "GRAFANA_NEURON_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/neuron/neuron-monitor.json"
       },
       "kustomizations": [
         {

diff --git a/lib/single-new-eks-awsnative-fargate-observability-construct/index.ts b/lib/single-new-eks-awsnative-fargate-observability-construct/index.ts
@@ -12,12 +12,6 @@ export default class SingleNewEksAWSNativeFargateobservabilityConstruct {
         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 versionMap: Map<eks.KubernetesVersion, string> = new Map([
-            [eks.KubernetesVersion.V1_28, "v1.10.1-eksbuild.6"],
-            [eks.KubernetesVersion.V1_27, "v1.10.1-eksbuild.6"],
-            [eks.KubernetesVersion.V1_26, "v1.10.1-eksbuild.6"],
-        ]);
-
         const cloudWatchAdotAddOn = new blueprints.addons.CloudWatchAdotAddOn({
             deploymentMode: blueprints.cloudWatchDeploymentMode.DEPLOYMENT,
             namespace: 'default',
@@ -56,7 +50,6 @@ export default class SingleNewEksAWSNativeFargateobservabilityConstruct {
         };
 
         const coreDnsAddOnProps : blueprints.CoreDnsAddOnProps = {
-            versionMap,
             configurationValues:{
                 computeType: "Fargate" 
             }

diff --git a/lib/single-new-eks-opensource-observability-pattern/neuron/inferentia-index.ts b/lib/single-new-eks-opensource-observability-pattern/neuron/inferentia-index.ts
@@ -6,10 +6,9 @@ import * as amp from 'aws-cdk-lib/aws-aps';
 import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints';
 import * as eks from "aws-cdk-lib/aws-eks";
 import * as ec2 from "aws-cdk-lib/aws-ec2";
-import { NeuronMonitorAddOn } from '@aws-quickstart/eks-blueprints';
 
 interface NeuronNodeGroupProps {
-    instanceClass: "inf2"
+    instanceClass: "inf1" | "inf2"
     instanceSize: "xlarge" | "2xlarge" | "6xlarge" | "24xlarge",
     desiredSize: number, 
     minSize: number, 
@@ -64,7 +63,7 @@ export default class SingleNewEksNeuronOpenSourceObservabilityPattern {
             new GrafanaOperatorSecretAddon(),
             new blueprints.addons.VpcCniAddOn(),
             new blueprints.NeuronDevicePluginAddOn(),
-            new NeuronMonitorAddOn()
+            new blueprints.NeuronMonitorAddOn()
         ];
 
         ObservabilityBuilder.builder()

diff --git a/package.json b/package.json
@@ -33,11 +33,7 @@
   },
   "overrides": {
     "@aws-quickstart/eks-blueprints": "^1.14.0",
-<<<<<<< HEAD
-    "aws-cdk": "2.114.1",
-=======
     "aws-cdk": "2.130.0",
->>>>>>> 0f4a727 (new blueprints version and core addon deps fixes)
     "xml2js": "0.5.0"
   }
 }