From 47491eff12bb207fd13d78bed79bcd5c78e1466b Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Sat, 30 Dec 2023 23:10:18 +0000
Subject: [PATCH] Update port configurations for OpenTelemetry collector

---
 HelmChart/Public/oneuptime/templates/_helpers.tpl | 4 ----
 Nginx/default.conf.template                       | 4 ++--
 config.example.env                                | 1 -
 docker-compose.base.yml                           | 2 --
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl
index dda4fc9c0b..304874d58a 100644
--- a/HelmChart/Public/oneuptime/templates/_helpers.tpl
+++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl
@@ -68,10 +68,6 @@
   value: {{ $.Values.port.dashboard | squote }}
 - name: ADMIN_DASHBOARD_PORT
   value: {{ $.Values.port.adminDashboard | squote }}
-- name: OTEL_COLLECTOR_GRPC_PORT
-  value: {{ $.Values.port.otelCollectorGrpc | squote }}
-- name: OTEL_COLLECTOR_HTTP_PORT
-  value: {{ $.Values.port.otelCollectorHttp | squote }}
 {{- end }}
 
 
diff --git a/Nginx/default.conf.template b/Nginx/default.conf.template
index a3573c732d..ae672e646d 100644
--- a/Nginx/default.conf.template
+++ b/Nginx/default.conf.template
@@ -35,11 +35,11 @@ upstream workers {
 
 
 upstream opentelemetry-collector-http {
-    server ${SERVER_OTEL_COLLECTOR_HOSTNAME}:${OTEL_COLLECTOR_HTTP_PORT};
+    server ${SERVER_OTEL_COLLECTOR_HOSTNAME}:4318;
 }
 
 upstream opentelemetry-collector-grpc {
-    server ${SERVER_OTEL_COLLECTOR_HOSTNAME}:${OTEL_COLLECTOR_GRPC_PORT};
+    server ${SERVER_OTEL_COLLECTOR_HOSTNAME}:4317;
 }
 
 # Otel Collector
diff --git a/config.example.env b/config.example.env
index 4ac1c61390..d276326a1d 100644
--- a/config.example.env
+++ b/config.example.env
@@ -104,7 +104,6 @@ ACCOUNTS_PORT=3003
 STATUS_PAGE_PORT=3105
 DASHBOARD_PORT=3009
 ADMIN_DASHBOARD_PORT=3158
-OTEL_COLLECTOR_GRPC_PORT=4317
 OTEL_COLLECTOR_HTTP_PORT=4318
 
 
diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index 871f9b4701..e5d6998588 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -43,8 +43,6 @@ x-common-variables: &common-variables
     STATUS_PAGE_PORT: ${STATUS_PAGE_PORT}
     DASHBOARD_PORT: ${DASHBOARD_PORT}
     ADMIN_DASHBOARD_PORT: ${ADMIN_DASHBOARD_PORT}
-    OTEL_COLLECTOR_GRPC_PORT: ${OTEL_COLLECTOR_GRPC_PORT}
-    OTEL_COLLECTOR_HTTP_PORT: ${OTEL_COLLECTOR_HTTP_PORT}
 
 x-common-ui-variables: &common-ui-variables
     <<: *common-variables