From d0bda7c4e01d6e909464a58ebe3fc9782b4d69ab Mon Sep 17 00:00:00 2001
From: Raphael Silva <rapphil@gmail.com>
Date: Thu, 17 Aug 2023 17:57:31 +0000
Subject: [PATCH] Use ecr images across all templates

---
 ...tel-ec2-instance-metrics-daemon-deployment-cfn.yaml |  8 ++++----
 .../ecs/aws-otel-ec2-sidecar-deployment-cfn.yaml       | 10 +++++-----
 .../ecs/aws-otel-fargate-sidecar-deployment-cfn.yaml   |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/deployment-template/ecs/aws-otel-ec2-instance-metrics-daemon-deployment-cfn.yaml b/deployment-template/ecs/aws-otel-ec2-instance-metrics-daemon-deployment-cfn.yaml
index b996a1566..5df6814a3 100644
--- a/deployment-template/ecs/aws-otel-ec2-instance-metrics-daemon-deployment-cfn.yaml
+++ b/deployment-template/ecs/aws-otel-ec2-instance-metrics-daemon-deployment-cfn.yaml
@@ -2,7 +2,7 @@ AWSTemplateFormatVersion: 2010-09-09
 Parameters:
   ClusterName:
     Type: String
-    Description: Enter the name of your ECS cluster from which you want to collect metrics
+    Description: Enter the name of your preexisting EC2 based ECS cluster from which you want to collect metrics
   CreateIAMRoles:
     Type: String
     Default: 'False'
@@ -22,7 +22,7 @@ Parameters:
   command:
     Type: String
     Description: Using the right command to choose the config file you want to config your AOC
-    Default: Default
+    Default: '--config=/etc/ecs/otel-instance-metrics-config.yaml'
 Conditions:
   CreateRoles: !Equals
     - !Ref CreateIAMRoles
@@ -59,7 +59,7 @@ Resources:
       NetworkMode: bridge
       ContainerDefinitions:
         - Name: aws-collector
-          Image: 'amazon/aws-otel-collector'
+          Image: 'public.ecr.aws/aws-observability/aws-otel-collector:latest'
           MountPoints:
             - ReadOnly: true
               ContainerPath: /rootfs/proc
@@ -82,7 +82,7 @@ Resources:
           Environment:
             - Name: USE_DEFAULT_CONFIG
               Value: 'True'
-          command: [ !Ref command ]
+          Command: [ !Ref command ]
           LogConfiguration:
             LogDriver: awslogs
             Options:
diff --git a/deployment-template/ecs/aws-otel-ec2-sidecar-deployment-cfn.yaml b/deployment-template/ecs/aws-otel-ec2-sidecar-deployment-cfn.yaml
index 9ab69fbb1..0cffca4d6 100644
--- a/deployment-template/ecs/aws-otel-ec2-sidecar-deployment-cfn.yaml
+++ b/deployment-template/ecs/aws-otel-ec2-sidecar-deployment-cfn.yaml
@@ -22,7 +22,7 @@ Parameters:
   command:
     Type: String
     Description: Using the right command to choose the config file you want to config your AOC
-    Default: Default
+    Default: '--config=/etc/ecs/ecs-default-config.yaml'
 Conditions:
   CreateRoles: !Equals
     - !Ref CreateIAMRoles
@@ -112,7 +112,7 @@ Resources:
             - ContainerName: aws-collector
               Condition: START
         - Name: aoc-statsd-emitter
-          Image: 'alpine/socat:latest'
+          Image: 'public.ecr.aws/amazonlinux/amazonlinux:latest'
           Essential: false
           LogConfiguration:
             LogDriver: awslogs
@@ -127,11 +127,11 @@ Resources:
           EntryPoint:
             - "/bin/sh"
             - "-c"
-            - "while true; do echo 'statsdTestMetric:1|c' | socat -v -t 0 - UDP:aws-collector:8125; sleep 1; done"
+            - "yum install -y socat; while true; do echo 'statsdTestMetric:1|c' | socat -v -t 0 - UDP:aws-collector:8125; sleep 1; done"
           Links:
             - aws-collector
         - Name: traffic-generator-xray
-          Image: 'curlimages/curl:latest'
+          Image: 'public.ecr.aws/amazonlinux/amazonlinux:latest'
           Essential: false
           LogConfiguration:
             LogDriver: awslogs
@@ -217,4 +217,4 @@ Resources:
         - 'arn:aws:iam::aws:policy/CloudWatchLogsFullAccess'
         - 'arn:aws:iam::aws:policy/AmazonSSMReadOnlyAccess'
         - 'arn:aws:iam::aws:policy/AmazonS3ReadOnlyAccess'
-      RoleName: AWSOTelExecutionRole
\ No newline at end of file
+      RoleName: AWSOTelExecutionRole
diff --git a/deployment-template/ecs/aws-otel-fargate-sidecar-deployment-cfn.yaml b/deployment-template/ecs/aws-otel-fargate-sidecar-deployment-cfn.yaml
index 8267bfed6..bc24655a9 100644
--- a/deployment-template/ecs/aws-otel-fargate-sidecar-deployment-cfn.yaml
+++ b/deployment-template/ecs/aws-otel-fargate-sidecar-deployment-cfn.yaml
@@ -30,7 +30,7 @@ Parameters:
   command:
     Type: String
     Description: Using the right command to choose the config file you want to config your AOC
-    Default: Default
+    Default: '--config=/etc/ecs/ecs-default-config.yaml'
 Conditions:
   CreateRoles: !Equals
     - !Ref CreateIAMRoles
@@ -115,7 +115,7 @@ Resources:
             - ContainerName: aws-collector
               Condition: START
         - Name: aoc-statsd-emitter
-          Image: 'alpine/socat:latest'
+          Image: 'public.ecr.aws/amazonlinux/amazonlinux:latest'
           Essential: false
           Cpu: '256'
           Memory: '512'
@@ -132,7 +132,7 @@ Resources:
           EntryPoint:
             - "/bin/sh"
             - "-c"
-            - "while true; do echo 'statsdTestMetric:1|c' | socat -v -t 0 - UDP:127.0.0.1:8125; sleep 1; done"
+            - "yum install -y socat; while true; do echo 'statsdTestMetric:1|c' | socat -v -t 0 - UDP:127.0.0.1:8125; sleep 1; done"
       RequiresCompatibilities:
         - FARGATE
       Cpu: '1024'