From 075780a1608480247c5dfe9885013440a764ab06 Mon Sep 17 00:00:00 2001
From: Rodrigue Koffi <bonclay7@users.noreply.github.com>
Date: Fri, 2 Sep 2022 15:50:58 +0200
Subject: [PATCH] Dynamic values

---
 modules/workloads/infra/main.tf                 |  7 ++++++-
 .../templates/opentelemetrycollector.yaml       | 17 +++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/modules/workloads/infra/main.tf b/modules/workloads/infra/main.tf
index da97bd8..4ebc7b6 100644
--- a/modules/workloads/infra/main.tf
+++ b/modules/workloads/infra/main.tf
@@ -85,7 +85,12 @@ module "helm_addon" {
     {
       name  = "scrapeSampleLimit"
       value = 1000
-    }
+    },
+    {
+      name  = "ekscluster"
+      value = local.context.eks_cluster_id
+    },
+
   ]
 
   irsa_config = {
diff --git a/modules/workloads/infra/otel-config/templates/opentelemetrycollector.yaml b/modules/workloads/infra/otel-config/templates/opentelemetrycollector.yaml
index 083ec6a..23d1a53 100644
--- a/modules/workloads/infra/otel-config/templates/opentelemetrycollector.yaml
+++ b/modules/workloads/infra/otel-config/templates/opentelemetrycollector.yaml
@@ -3,7 +3,7 @@ kind: OpenTelemetryCollector
 metadata:
   name: adot
 spec:
-  image: public.ecr.aws/aws-observability/aws-otel-collector:latest
+  image: public.ecr.aws/aws-observability/aws-otel-collector:v0.20.0
   mode: deployment
   serviceAccount: adot-collector-kubeprometheus
   config: |
@@ -1565,24 +1565,25 @@ spec:
             - job_name: 'node-exporter'
               kubernetes_sd_configs:
                 - role: endpoints
-
     exporters:
-      awsprometheusremotewrite:
+      prometheusremotewrite:
         endpoint: {{ .Values.ampurl }}
-        aws_auth:
-          region: {{ .Values.region }}
-          service: "aps"
+        auth:
+          authenticator: sigv4auth
       logging:
         loglevel: info
     extensions:
+      sigv4auth:
+        region: {{ .Values.region }}
+        service: aps
       health_check:
       pprof:
         endpoint: :1888
       zpages:
         endpoint: :55679
     service:
-      extensions: [pprof, zpages, health_check]
+      extensions: [pprof, zpages, health_check, sigv4auth]
       pipelines:
         metrics:
           receivers: [prometheus]
-          exporters: [logging, awsprometheusremotewrite]
+          exporters: [logging, prometheusremotewrite]