github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

refactor: remove telemetry hostname references and update backend proxy settings

Browse Source
This commit is contained in:
Nawaz Dhandala
2026-04-02 14:09:26 +01:00
parent 5f398bdb31
commit 6f7907102b
6 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Common/Server/EnvironmentConfig.ts
View File

@@ -176,12 +176,6 @@ export const AppApiHostname: Hostname = Hostname.fromString(
}`, }`,
); );
export const OpenTelemetryIngestHostname: Hostname = Hostname.fromString(
`${process.env["SERVER_APP_HOSTNAME"] || "localhost"}:${
process.env["APP_PORT"] || 80
}`,
);
export const WorkerHostname: Hostname = Hostname.fromString( export const WorkerHostname: Hostname = Hostname.fromString(
`${process.env["SERVER_APP_HOSTNAME"] || "localhost"}:${ `${process.env["SERVER_APP_HOSTNAME"] || "localhost"}:${
process.env["APP_PORT"] || 80 process.env["APP_PORT"] || 80

6
HelmChart/Public/oneuptime/templates/_helpers.tpl
View File

@@ -116,14 +116,8 @@ Usage:
value: {{ $.Release.Name }}-home.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} value: {{ $.Release.Name }}-home.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
- name: SERVER_APP_HOSTNAME - name: SERVER_APP_HOSTNAME
value: {{ $.Release.Name }}-app.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} value: {{ $.Release.Name }}-app.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
- name: TELEMETRY_HOSTNAME
value: {{ $.Release.Name }}-app.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
- name: SERVER_TELEMETRY_HOSTNAME
value: {{ $.Release.Name }}-app.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
- name: APP_PORT - name: APP_PORT
value: {{ $.Values.app.ports.http | squote }} value: {{ $.Values.app.ports.http | squote }}
- name: TELEMETRY_PORT
value: {{ $.Values.app.ports.http | squote }}
- name: HOME_PORT - name: HOME_PORT
value: {{ $.Values.home.ports.http | squote }} value: {{ $.Values.home.ports.http | squote }}
- name: WORKER_CONCURRENCY - name: WORKER_CONCURRENCY

48
Nginx/default.conf.template
View File

@@ -522,30 +522,30 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
location /telemetry { location /telemetry {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass $backend_telemetry; proxy_pass $backend_app;
} }
location /incoming-request-ingest { location /incoming-request-ingest {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass $backend_telemetry; proxy_pass $backend_app;
} }
location /otlp { location /otlp {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -556,25 +556,25 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_pass $backend_telemetry; proxy_pass $backend_app;
} }
# Pyroscope profiling ingestion endpoint # Pyroscope profiling ingestion endpoint
location /pyroscope { location /pyroscope {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass $backend_telemetry; proxy_pass $backend_app;
} }
location ~ /opentelemetry.proto.collector* { location ~ /opentelemetry.proto.collector* {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_otel_grpc grpc://${SERVER_APP_HOSTNAME}:4317; set $backend_app_grpc grpc://${SERVER_APP_HOSTNAME}:4317;
grpc_pass $backend_otel_grpc; grpc_pass $backend_app_grpc;
} }
location /notification { location /notification {
@@ -602,7 +602,7 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
location /fluentd/logs { location /fluentd/logs {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -614,12 +614,12 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
rewrite ^/fluentd/logs(.*)$ /fluentd/v1/logs$1 break; rewrite ^/fluentd/logs(.*)$ /fluentd/v1/logs$1 break;
proxy_pass $backend_telemetry; proxy_pass $backend_app;
} }
location /syslog/v1/logs { location /syslog/v1/logs {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -629,12 +629,12 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_pass $backend_telemetry; proxy_pass $backend_app;
} }
location /probe-ingest { location /probe-ingest {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -644,7 +644,7 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_pass $backend_telemetry; proxy_pass $backend_app;
client_max_body_size 50M; client_max_body_size 50M;
} }
@@ -652,7 +652,7 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
# For backward compatibility with probes that are already deployed # For backward compatibility with probes that are already deployed
location /ingestor { location /ingestor {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -662,14 +662,14 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_pass $backend_telemetry; proxy_pass $backend_app;
client_max_body_size 50M; client_max_body_size 50M;
} }
location /server-monitor { location /server-monitor {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -679,7 +679,7 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_pass $backend_telemetry; proxy_pass $backend_app;
client_max_body_size 50M; client_max_body_size 50M;
} }
@@ -914,7 +914,7 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
location /heartbeat { location /heartbeat {
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -925,7 +925,7 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
rewrite ^/heartbeat(.*)$ /incoming-request$1 break; rewrite ^/heartbeat(.*)$ /incoming-request$1 break;
proxy_pass $backend_telemetry; proxy_pass $backend_app;
client_max_body_size 50M; client_max_body_size 50M;
} }
@@ -933,7 +933,7 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
location /incoming-email { location /incoming-email {
# Incoming Email Monitor webhook endpoint # Incoming Email Monitor webhook endpoint
resolver ${NGINX_RESOLVER} valid=30s; resolver ${NGINX_RESOLVER} valid=30s;
set $backend_telemetry http://${SERVER_APP_HOSTNAME}:${APP_PORT}; set $backend_app http://${SERVER_APP_HOSTNAME}:${APP_PORT};
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -942,7 +942,7 @@ ${PROVISION_SSL_CERTIFICATE_KEY_DIRECTIVE}
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_pass $backend_telemetry; proxy_pass $backend_app;
client_max_body_size 50M; client_max_body_size 50M;
} }

2
OTelCollector/otel-collector-config.template.yaml
View File

@@ -34,7 +34,7 @@ receivers:
exporters: exporters:
otlphttp: otlphttp:
endpoint: "http://{{ .Env.SERVER_TELEMETRY_HOSTNAME }}:{{ .Env.TELEMETRY_PORT }}/otlp" endpoint: "http://{{ .Env.SERVER_APP_HOSTNAME }}:{{ .Env.APP_PORT }}/otlp"
headers: {"Content-Type": "application/json"} headers: {"Content-Type": "application/json"}
auth: auth:
authenticator: headers_setter authenticator: headers_setter

4
config.example.env
View File

@@ -99,14 +99,10 @@ REDIS_TLS_CA=
REDIS_TLS_SENTINEL_MODE=false REDIS_TLS_SENTINEL_MODE=false
# Hostnames. Usually does not need to change. # Hostnames. Usually does not need to change.
TELEMETRY_HOSTNAME=app:3002
SERVER_APP_HOSTNAME=app SERVER_APP_HOSTNAME=app
SERVER_TELEMETRY_HOSTNAME=app
#Ports. Usually they don't need to change. #Ports. Usually they don't need to change.
APP_PORT=3002 APP_PORT=3002
TELEMETRY_PORT=3002
TEST_SERVER_PORT=3800 TEST_SERVER_PORT=3800
HOME_PORT=1444 HOME_PORT=1444
# Plans # Plans

2
docker-compose.base.yml
View File

@@ -30,12 +30,10 @@ x-common-variables: &common-variables
ALLOWED_ACTIVE_MONITOR_COUNT_IN_FREE_PLAN: ${ALLOWED_ACTIVE_MONITOR_COUNT_IN_FREE_PLAN} ALLOWED_ACTIVE_MONITOR_COUNT_IN_FREE_PLAN: ${ALLOWED_ACTIVE_MONITOR_COUNT_IN_FREE_PLAN}
SERVER_APP_HOSTNAME: app SERVER_APP_HOSTNAME: app
SERVER_TELEMETRY_HOSTNAME: app
SERVER_HOME_HOSTNAME: home SERVER_HOME_HOSTNAME: home
#Ports. Usually they don't need to change. #Ports. Usually they don't need to change.
APP_PORT: ${APP_PORT} APP_PORT: ${APP_PORT}
HOME_PORT: ${HOME_PORT} HOME_PORT: ${HOME_PORT}
TELEMETRY_PORT: ${APP_PORT}
OPENTELEMETRY_EXPORTER_OTLP_ENDPOINT: ${OPENTELEMETRY_EXPORTER_OTLP_ENDPOINT} OPENTELEMETRY_EXPORTER_OTLP_ENDPOINT: ${OPENTELEMETRY_EXPORTER_OTLP_ENDPOINT}
OPENTELEMETRY_EXPORTER_OTLP_HEADERS: ${OPENTELEMETRY_EXPORTER_OTLP_HEADERS} OPENTELEMETRY_EXPORTER_OTLP_HEADERS: ${OPENTELEMETRY_EXPORTER_OTLP_HEADERS}