From e355c408bb3c4fc7ee1b843dc38b7633e059700c Mon Sep 17 00:00:00 2001
From: Diego Luisi <diego.luisi@shieldfc.com>
Date: Mon, 24 Jun 2024 14:23:32 +0100
Subject: [PATCH] :zap: add OTEL_LOGS_EXPORTER

---
 app/app-config.production.yaml | 44 +++++++++++++++++-------------
 app/app-config.yaml            | 49 +++++++++++++++++++---------------
 docker-compose.yml             |  6 ++---
 3 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/app/app-config.production.yaml b/app/app-config.production.yaml
index 4fca40952..6d9252ee3 100644
--- a/app/app-config.production.yaml
+++ b/app/app-config.production.yaml
@@ -32,6 +32,14 @@ integrations:
   github:
     - host: github.com
       token: ${GITHUB_TOKEN}
+  aws:
+    mainAccount:
+      profile: development
+    accounts:
+      - accountId: ${AWS_ACCOUNT_ID}
+        accessKeyId: ${AWS_ACCESS_KEY_ID}
+        secretAccessKey: ${AWS_SECRET_ACCESS_KEY}
+        profile: development
 
 kubernetes:
   serviceLocatorMethod:
@@ -73,29 +81,29 @@ techdocs:
     type: "awsS3"
     awsS3:
       bucketName: ${TECHDOCS_BUCKET}
+      accountId: ${AWS_ACCOUNT_ID}
       region: ${AWS_REGION}
-      credentials:
-        roleArn: ${AWS_ROLE}
 
 proxy:
-  "/argocd/api":
-    target: https://argocd.devxp-tech.io/api/v1/
-    changeOrigin: true
-    # only if your argocd api has self-signed cert
-    secure: true
-    headers:
-      Cookie:
-        $env: ARGOCD_AUTH_TOKEN
+  endpoints:
+    "/argocd/api":
+      target: https://argocd.devxp-tech.io/api/v1/
+      changeOrigin: true
+      # only if your argocd api has self-signed cert
+      secure: true
+      headers:
+        Cookie:
+          $env: ARGOCD_AUTH_TOKEN
 
-  "/grafana/api":
-    # May be an internal DNS
-    target: http://grafana.monitoring.svc/
-    headers:
-      Authorization: Bearer ${GRAFANA_TOKEN}
+    "/grafana/api":
+      # May be an internal DNS
+      target: http://grafana.monitoring.svc/
+      headers:
+        Authorization: Bearer ${GRAFANA_TOKEN}
 
-  "/prometheus/api":
-    # url to the api and path of your hosted prometheus instance
-    target: http://prometheus-community-kube-prometheus.monitoring.svc.cluster.local:9090/api/v1/
+    "/prometheus/api":
+      # url to the api and path of your hosted prometheus instance
+      target: http://prometheus-community-kube-prometheus.monitoring.svc.cluster.local:9090/api/v1/
 
 auth:
   environment: production
diff --git a/app/app-config.yaml b/app/app-config.yaml
index 4589f5086..d31a3ebaf 100644
--- a/app/app-config.yaml
+++ b/app/app-config.yaml
@@ -74,10 +74,14 @@ integrations:
       # This is a Personal Access Token or PAT from GitHub. You can find out how to generate this token, and more information
       # about setting up the GitHub integration here: https://backstage.io/docs/getting-started/configuration#setting-up-a-github-integration
       token: ${GITHUB_TOKEN}
-    ### Example for how to add your GitHub Enterprise instance using the API:
-    # - host: ghe.example.net
-    #   apiBaseUrl: https://ghe.example.net/api/v3
-    #   token: ${GHE_TOKEN}
+  aws:
+    mainAccount:
+      profile: development
+    accounts:
+      - accountId: ${AWS_ACCOUNT_ID}
+        accessKeyId: ${AWS_ACCESS_KEY_ID}
+        secretAccessKey: ${AWS_SECRET_ACCESS_KEY}
+        profile: development
 
 # Reference documentation http://backstage.io/docs/features/techdocs/configuration
 # Note: After experimenting with basic setup, use CI/CD to generate docs
@@ -97,24 +101,25 @@ techdocs:
         secretAccessKey: ${AWS_SECRET_ACCESS_KEY}
 
 proxy:
-  "/argocd/api":
-    target: https://argocd.devxp-tech.io/api/v1/
-    changeOrigin: true
-    # only if your argocd api has self-signed cert
-    secure: true
-    headers:
-      Cookie:
-        $env: ARGOCD_AUTH_TOKEN
-
-  "/grafana/api":
-    # May be an internal DNS
-    target: https://grafana.devxp-tech.io/
-    headers:
-      Authorization: Bearer ${GRAFANA_TOKEN}
-
-  "/prometheus/api":
-    # url to the api and path of your hosted prometheus instance
-    target: https://prometheus.devxp-tech.io/api/v1/
+  endpoints:
+    "/argocd/api":
+      target: https://argocd.devxp-tech.io/api/v1/
+      changeOrigin: true
+      # only if your argocd api has self-signed cert
+      secure: true
+      headers:
+        Cookie:
+          $env: ARGOCD_AUTH_TOKEN
+
+    "/grafana/api":
+      # May be an internal DNS
+      target: https://grafana.devxp-tech.io/
+      headers:
+        Authorization: Bearer ${GRAFANA_TOKEN}
+
+    "/prometheus/api":
+      # url to the api and path of your hosted prometheus instance
+      target: https://prometheus.devxp-tech.io/api/v1/
 
   # '/snyk':
   #   target: https://snyk.io/api/v1
diff --git a/docker-compose.yml b/docker-compose.yml
index f97a254ad..f3a45148f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,9 +33,9 @@ services:
       - POSTGRES_USER=postgres
       - SONARQUBE_TOKEN=$SONARQUBE_TOKEN
       - TECHDOCS_BUCKET=$TECHDOCS_BUCKET
-      # - AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
-      # - AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
-      # - AWS_REGION=$AWS_REGION
+      - AWS_ACCESS_KEY_ID=$TECHDOCS_AWS_ACCESS_KEY_ID
+      - AWS_SECRET_ACCESS_KEY=$TECHDOCS_AWS_SECRET_ACCESS_KEY
+      - AWS_REGION=us-east-1
     depends_on:
       - postgres