diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl index 877485ada5..08db5c5323 100644 --- a/HelmChart/Public/oneuptime/templates/_helpers.tpl +++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl @@ -113,28 +113,16 @@ Usage: value: {{ $.Release.Name }}-telemetry.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_TELEMETRY_HOSTNAME value: {{ $.Release.Name }}-telemetry.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} -- name: SERVER_TEST_SERVER_HOSTNAME - value: {{ $.Release.Name }}-test-server.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_OTEL_COLLECTOR_HOSTNAME value: {{ $.Release.Name }}-otel-collector.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: APP_PORT value: {{ $.Values.app.ports.http | squote }} - name: TELEMETRY_PORT value: {{ $.Values.telemetry.ports.http | squote }} -- name: TEST_SERVER_PORT - value: {{ $.Values.testServer.ports.http | squote }} -- name: ACCOUNTS_PORT - value: {{ $.Values.accounts.ports.http | squote }} - name: HOME_PORT value: {{ $.Values.home.ports.http | squote }} - name: WORKER_PORT value: {{ $.Values.worker.ports.http | squote }} -- name: STATUS_PAGE_PORT - value: {{ $.Values.statusPage.ports.http | squote }} -- name: DASHBOARD_PORT - value: {{ $.Values.dashboard.ports.http | squote }} -- name: ADMIN_DASHBOARD_PORT - value: {{ $.Values.adminDashboard.ports.http | squote }} {{- end }} diff --git a/config.example.env b/config.example.env index d599da93db..263e882d81 100644 --- a/config.example.env +++ b/config.example.env @@ -96,7 +96,6 @@ TELEMETRY_HOSTNAME=telemetry:3403 SERVER_APP_HOSTNAME=app SERVER_TELEMETRY_HOSTNAME=telemetry -SERVER_TEST_SERVER_HOSTNAME=test-server SERVER_OTEL_COLLECTOR_HOSTNAME=otel-collector SERVER_WORKER_HOSTNAME=worker #Ports. Usually they don't need to change. @@ -104,10 +103,6 @@ SERVER_WORKER_HOSTNAME=worker APP_PORT=3002 TELEMETRY_PORT=3403 TEST_SERVER_PORT=3800 -ACCOUNTS_PORT=3003 -STATUS_PAGE_PORT=3105 -DASHBOARD_PORT=3009 -ADMIN_DASHBOARD_PORT=3158 OTEL_COLLECTOR_HTTP_PORT=4318 HOME_PORT=1444 WORKER_PORT=1445 diff --git a/docker-compose.base.yml b/docker-compose.base.yml index ad003c8640..66996b5136 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -29,21 +29,14 @@ x-common-variables: &common-variables ALLOWED_ACTIVE_MONITOR_COUNT_IN_FREE_PLAN: ${ALLOWED_ACTIVE_MONITOR_COUNT_IN_FREE_PLAN} SERVER_APP_HOSTNAME: app - SERVER_ALERT_HOSTNAME: alert SERVER_TELEMETRY_HOSTNAME: telemetry - SERVER_TEST_SERVER_HOSTNAME: test-server SERVER_OTEL_COLLECTOR_HOSTNAME: otel-collector SERVER_WORKER_HOSTNAME: worker SERVER_HOME_HOSTNAME: home - #Ports. Usually they don't need to change. + #Ports. Usually they don't need to change. APP_PORT: ${APP_PORT} HOME_PORT: ${HOME_PORT} TELEMETRY_PORT: ${TELEMETRY_PORT} - TEST_SERVER_PORT: ${TEST_SERVER_PORT} - ACCOUNTS_PORT: ${ACCOUNTS_PORT} - STATUS_PAGE_PORT: ${STATUS_PAGE_PORT} - DASHBOARD_PORT: ${DASHBOARD_PORT} - ADMIN_DASHBOARD_PORT: ${ADMIN_DASHBOARD_PORT} WORKER_PORT: ${WORKER_PORT} OPENTELEMETRY_EXPORTER_OTLP_ENDPOINT: ${OPENTELEMETRY_EXPORTER_OTLP_ENDPOINT} OPENTELEMETRY_EXPORTER_OTLP_HEADERS: ${OPENTELEMETRY_EXPORTER_OTLP_HEADERS}