diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl index bc86a6437a..f9893e8fc7 100644 --- a/HelmChart/Public/oneuptime/templates/_helpers.tpl +++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl @@ -59,8 +59,6 @@ Usage: value: {{ $.Values.statusPage.cnameRecord }} - name: ALLOWED_ACTIVE_MONITOR_COUNT_IN_FREE_PLAN value: {{ $.Values.billing.allowedActiveMonitorCountInFreePlan | quote }} -- name: OTEL_COLLECTOR_HOST - value: {{ $.Values.openTelemetryCollectorHost }} - name: LOG_LEVEL value: {{ $.Values.logLevel }} - name: HTTP_PROTOCOL diff --git a/HelmChart/Public/oneuptime/templates/ingress.yaml b/HelmChart/Public/oneuptime/templates/ingress.yaml index 5cbcaf3897..428780f0b0 100644 --- a/HelmChart/Public/oneuptime/templates/ingress.yaml +++ b/HelmChart/Public/oneuptime/templates/ingress.yaml @@ -37,16 +37,4 @@ spec: port: name: "oneuptime-http" {{- end }} - {{- if $.Values.openTelemetryCollectorHost }} - - host: {{ $.Values.openTelemetryCollectorHost | quote }} - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: {{ printf "%s-%s" $.Release.Name "nginx" }} - port: - name: "oneuptime-http" - {{- end }} {{- end }} diff --git a/HelmChart/Public/oneuptime/values.schema.json b/HelmChart/Public/oneuptime/values.schema.json index a650e1a336..6145a3510b 100644 --- a/HelmChart/Public/oneuptime/values.schema.json +++ b/HelmChart/Public/oneuptime/values.schema.json @@ -80,9 +80,6 @@ }, "additionalProperties": false }, - "openTelemetryCollectorHost": { - "type": ["string", "null"] - }, "deployment": { "type": "object", "properties": { diff --git a/HelmChart/Public/oneuptime/values.yaml b/HelmChart/Public/oneuptime/values.yaml index 08101a4f79..a4264454ef 100644 --- a/HelmChart/Public/oneuptime/values.yaml +++ b/HelmChart/Public/oneuptime/values.yaml @@ -43,9 +43,6 @@ externalSecrets: name: passwordKey: -# (Optional): You usually do not need to set this if you're self hosting. -openTelemetryCollectorHost: - deployment: # Default replica count for all deployments replicaCount: 1 diff --git a/Nginx/default.conf.template b/Nginx/default.conf.template index 5a0dcc3a00..f09197ea7e 100644 --- a/Nginx/default.conf.template +++ b/Nginx/default.conf.template @@ -72,52 +72,6 @@ upstream opentelemetry-collector-grpc { server ${SERVER_OTEL_COLLECTOR_HOSTNAME}:4317; } -# Otel Collector - -server { - - server_tokens off; - - - gzip on; - gzip_types text/plain application/xml application/javascript text/javascript text/css application/json; - gzip_proxied no-cache no-store private expired auth; - gzip_min_length 1000; - - listen 7849; - http2 on; - - server_name oneuptime-opentelemetry-collector ${OTEL_COLLECTOR_HOST}; - - proxy_busy_buffers_size 512k; - proxy_buffers 4 512k; - proxy_buffer_size 256k; - - fastcgi_buffers 16 16k; - fastcgi_buffer_size 32k; - - location / { - # This is for nginx not to crash when service is not available. - resolver 127.0.0.1 valid=30s; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - - # enable WebSockets (for ws://sockjs not connected error in the accounts source: https://stackoverflow.com/questions/41381444/websocket-connection-failed-error-during-websocket-handshake-unexpected-respon) - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - - proxy_pass http://opentelemetry-collector-http; - } - - location ~ /opentelemetry.proto.collector* { - grpc_pass grpc://opentelemetry-collector-grpc; - } - -} - # Status Pages server { diff --git a/config.example.env b/config.example.env index 2e74c57034..50754a4ae7 100644 --- a/config.example.env +++ b/config.example.env @@ -56,9 +56,6 @@ IS_ENTERPRISE_EDITION=false # What is the name of the docker compose project. This is used to prefix the docker containers. COMPOSE_PROJECT_NAME=oneuptime -# OTEL HOST - if you like the collector to be hosted on a different server then change this to the IP of the server. -OTEL_COLLECTOR_HOST= - # Clickhouse Settings CLICKHOUSE_USER=default diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 6eace9cea0..a5e6774342 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -5,9 +5,6 @@ x-common-variables: &common-variables HTTP_PROTOCOL: ${HTTP_PROTOCOL} - OTEL_COLLECTOR_HOST: ${OTEL_COLLECTOR_HOST} - - STATUS_PAGE_CNAME_RECORD: ${STATUS_PAGE_CNAME_RECORD} LOG_LEVEL: ${LOG_LEVEL}