From a0bc7c21085fa6bbb5013c5fa1ed961f119a6245 Mon Sep 17 00:00:00 2001 From: Ian Ngethe Muchiri <100555904+ianmuchyri@users.noreply.github.com> Date: Wed, 29 Apr 2026 13:46:39 +0300 Subject: [PATCH] NOISSUE - Update ui env variables and remove unused and repeated variables (#3507) Signed-off-by: ianmuchyri --- docker/.env | 131 ++----------------------------------- docker/docker-compose.yaml | 4 ++ 2 files changed, 9 insertions(+), 126 deletions(-) diff --git a/docker/.env b/docker/.env index 7e48eb8bb..bb23adb48 100644 --- a/docker/.env +++ b/docker/.env @@ -203,14 +203,9 @@ MG_USERS_DB_SSL_CERT= MG_USERS_DB_SSL_KEY= MG_USERS_DB_SSL_ROOT_CERT= MG_USERS_INSTANCE_ID= -MG_USERS_SECRET_KEY=HyE2D4RUt9nnKG6v8zKEqAp6g6ka8hhZsqUpzgKvnwpXrNVQSH -MG_USERS_ADMIN_EMAIL=admin@example.com -MG_USERS_ADMIN_PASSWORD=12345678 -MG_USERS_PASS_REGEX=^.{8,}$ MG_USERS_ALLOW_SELF_REGISTER=true -MG_UI_PATH_PREFIX=/ui -MG_OAUTH_UI_REDIRECT_URL=http://localhost:9095${MG_UI_PATH_PREFIX}/tokens/secure -MG_OAUTH_UI_ERROR_URL=http://localhost:9095${MG_UI_PATH_PREFIX}/error +MG_OAUTH_UI_REDIRECT_URL=http://localhost:3000/api/auth/token +MG_OAUTH_UI_ERROR_URL=http://localhost:3000/login MG_USERS_DELETE_INTERVAL=24h MG_USERS_DELETE_AFTER=720h MG_PASSWORD_RESET_URL_PREFIX=http://localhost/password-reset @@ -244,7 +239,7 @@ MG_NOTIFICATIONS_INSTANCE_ID= ### Google OAuth2 MG_GOOGLE_CLIENT_ID= MG_GOOGLE_CLIENT_SECRET= -MG_GOOGLE_REDIRECT_URL= +MG_GOOGLE_REDIRECT_URL=http://localhost:3000/oauth/callback/google MG_GOOGLE_STATE= ### Groups @@ -405,9 +400,6 @@ MG_CERTS_OPENBAO_UNSEAL_KEY_2= MG_CERTS_OPENBAO_UNSEAL_KEY_3= MG_CERTS_OPENBAO_ROOT_TOKEN= -## Jaeger Configuration for Certs -MG_JAEGER_URL=http://jaeger:4318/v1/traces -MG_JAEGER_TRACE_RATIO=1.0 #### Auth Client Config for Certs Service MG_ADDONS_CERTS_PATH_PREFIX=../../ @@ -478,22 +470,6 @@ MG_ALLOW_UNVERIFIED_USER=true # Docker image tag MG_RELEASE_TAG=latest -MG_BOOTSTRAP_URL=http://bootstrap:9013 -MG_CERTS_URL=http://certs:9019 -MG_HTTP_ADAPTER_URL=http://http-adapter:8008 -MG_READER_URL=http://timescale-reader:9011 -MG_JOURNAL_URL=http://journal:9021 - -## Object Storage (SeaweedFS) -MG_BACKEND_OBJECT_STORAGE_REGION=us-east-1 -MG_BACKEND_OBJECT_STORAGE_BUCKET=magistrala -MG_BACKEND_OBJECT_STORAGE_ENDPOINT=http://seaweedfs-s3:8333 -MG_BACKEND_OBJECT_STORAGE_USE_PATH_STYLE=true -MG_BACKEND_OBJECT_STORAGE_PRESIGN_ENDPOINT= -MG_BACKEND_OBJECT_STORAGE_ACCESS_KEY=admin -MG_BACKEND_OBJECT_STORAGE_SECRET_KEY=admin -MG_BACKEND_OBJECT_STORAGE_TTL=1h -MG_BACKEND_OBJECT_STORAGE_READ_TTL=1h #### Timescale Reader gRPC Client Config MG_TIMESCALE_READER_GRPC_URL=timescale-reader:7011 @@ -503,90 +479,6 @@ MG_TIMESCALE_READER_GRPC_CLIENT_KEY=${GRPC_MTLS:+./ssl/certs/readers-grpc-client MG_TIMESCALE_READER_GRPC_SERVER_CA_CERTS=${GRPC_MTLS:+./ssl/certs/ca.crt} MG_TIMESCALE_READER_GRPC_CLIENT_CA_CERTS=${GRPC_MTLS:+./ssl/certs/ca.crt} -## Rules Engine -MG_RE_LOG_LEVEL=debug -MG_RE_HTTP_HOST=re -MG_RE_HTTP_PORT=9008 -MG_RE_HTTP_SERVER_CERT= -MG_RE_HTTP_SERVER_KEY= -MG_RE_DB_HOST=re-db -MG_RE_DB_PORT=5432 -MG_RE_DB_USER=magistrala -MG_RE_DB_PASS=magistrala -MG_RE_DB_NAME=rules_engine -MG_RE_DB_SSL_MODE=disable -MG_RE_DB_SSL_CERT= -MG_RE_DB_SSL_KEY= -MG_RE_DB_SSL_ROOT_CERT= -MG_RE_INSTANCE_ID= -MG_RE_EMAIL_TEMPLATE=re.tmpl -MG_RE_CALLOUT_URLS="" -MG_RE_CALLOUT_METHOD="POST" -MG_RE_CALLOUT_TLS_VERIFICATION="false" -MG_RE_CALLOUT_TIMEOUT="10s" -MG_RE_CALLOUT_CA_CERT="" -MG_RE_CALLOUT_CERT="" -MG_RE_CALLOUT_KEY="" -MG_RE_CALLOUT_OPERATIONS="" -MG_RE_URL=http://re:9008 - -## Email -MG_EMAIL_HOST=host.docker.internal -MG_EMAIL_PORT=2525 -MG_EMAIL_USERNAME=from@example.com -MG_EMAIL_PASSWORD=password -MG_EMAIL_FROM_ADDRESS=from@example.com -MG_EMAIL_FROM_NAME=Example -MG_EMAIL_TEMPLATE=email.tmpl - -## Alarms -MG_ALARMS_LOG_LEVEL=debug -MG_ALARMS_HTTP_HOST=alarms -MG_ALARMS_HTTP_PORT=8050 -MG_ALARMS_HTTP_SERVER_CERT= -MG_ALARMS_HTTP_SERVER_KEY= -MG_ALARMS_DB_HOST=alarms-db -MG_ALARMS_DB_PORT=5432 -MG_ALARMS_DB_USER=magistrala -MG_ALARMS_DB_PASS=magistrala -MG_ALARMS_DB_NAME=alarms -MG_ALARMS_DB_SSL_MODE=disable -MG_ALARMS_DB_SSL_CERT= -MG_ALARMS_DB_SSL_KEY= -MG_ALARMS_DB_SSL_ROOT_CERT= -MG_ALARMS_INSTANCE_ID= -MG_ALARMS_EVENT_CONSUMER=alarms -MG_ALARMS_URL=http://alarms:8050 - -## Reports -MG_REPORTS_LOG_LEVEL=debug -MG_REPORTS_HTTP_HOST=reports -MG_REPORTS_HTTP_PORT=9017 -MG_REPORTS_HTTP_SERVER_CERT= -MG_REPORTS_HTTP_SERVER_KEY= -MG_REPORTS_DB_HOST=reports-db -MG_REPORTS_DB_PORT=5432 -MG_REPORTS_DB_USER=magistrala -MG_REPORTS_DB_PASS=magistrala -MG_REPORTS_DB_NAME=reports -MG_REPORTS_DB_SSL_MODE=disable -MG_REPORTS_DB_SSL_CERT= -MG_REPORTS_DB_SSL_KEY= -MG_REPORTS_DB_SSL_ROOT_CERT= -MG_REPORTS_INSTANCE_ID= -MG_REPORTS_EMAIL_TEMPLATE=reports.tmpl -MG_REPORTS_DEFAULT_TEMPLATE= -MG_PDF_CONVERTER_URL=http://pdf-generator:3000/forms/chromium/convert/html -MG_REPORTS_URL=http://reports:9017 -MG_REPORTS_CALLOUT_URLS="" -MG_REPORTS_CALLOUT_METHOD="POST" -MG_REPORTS_CALLOUT_TLS_VERIFICATION="false" -MG_REPORTS_CALLOUT_TIMEOUT="10s" -MG_REPORTS_CALLOUT_CA_CERT="" -MG_REPORTS_CALLOUT_CERT="" -MG_REPORTS_CALLOUT_KEY="" -MG_REPORTS_CALLOUT_OPERATIONS="" - ## Addon Services ### Bootstrap @@ -718,15 +610,6 @@ MG_RE_CALLOUT_KEY="" MG_RE_CALLOUT_OPERATIONS="" MG_RE_URL=http://re:9008 -### Email (shared by RE and Reports) -MG_EMAIL_HOST=smtp.mailtrap.io -MG_EMAIL_PORT=2525 -MG_EMAIL_USERNAME=18bf7f70705139 -MG_EMAIL_PASSWORD=2b0d302e775b1e -MG_EMAIL_FROM_ADDRESS=from@example.com -MG_EMAIL_FROM_NAME=Example -MG_EMAIL_TEMPLATE=email.tmpl - ### Alarms MG_ALARMS_LOG_LEVEL=debug MG_ALARMS_HTTP_HOST=alarms @@ -796,6 +679,8 @@ MG_UI_VERIFICATION_TLS=false MG_UI_CONTENT_TYPE=application/senml+json # Set to yes to accept the EULA for the UI services. To view the EULA visit: https://github.com/absmach/eula MG_UI_DOCKER_ACCEPT_EULA=no +OTEL_SERVICE_NAME=ui-mg +OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318 # Object storage for images # See docker/seaweedfs/s3.json. @@ -843,12 +728,6 @@ MG_HOST_URL=http://localhost:3000 MG_UI_IMAGE_URL=http://ui-backend:9097 MG_UI_BASEURL=http://localhost:3000 -### Google OAuth2 (UI) -MG_GOOGLE_CLIENT_ID= -MG_GOOGLE_CLIENT_SECRET= -MG_GOOGLE_REDIRECT_URL=http://localhost:3000/oauth/callback/google -MG_GOOGLE_STATE=pGXVNhEeKfycuBzk5InlSfMlEU9UrhlkTUOSqhsgDzXP2Y4RsN - #Customer support email variables MG_SUPPORT_EMAIL= MG_SUPPORT_EMAIL_PASS= diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 99ae41b71..dcfa1143a 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -1518,6 +1518,8 @@ services: MG_UI_SMTP_PORT: ${MG_UI_SMTP_PORT} MG_UI_SMTP_SECURE: ${MG_UI_SMTP_SECURE} MG_UI_SUPPORT_FROM: ${MG_UI_SUPPORT_FROM} + OTEL_SERVICE_NAME: ${OTEL_SERVICE_NAME} + OTEL_EXPORTER_OTLP_ENDPOINT: ${OTEL_EXPORTER_OTLP_ENDPOINT} ui-backend: image: ghcr.io/absmach/magistrala/ui-backend:${MG_RELEASE_TAG} @@ -1571,6 +1573,8 @@ services: MG_BACKEND_OBJECT_STORAGE_SECRET_KEY: ${MG_BACKEND_OBJECT_STORAGE_SECRET_KEY} MG_BACKEND_OBJECT_STORAGE_TTL: ${MG_BACKEND_OBJECT_STORAGE_TTL} MG_BACKEND_OBJECT_STORAGE_READ_TTL: ${MG_BACKEND_OBJECT_STORAGE_READ_TTL} + MG_JAEGER_URL: ${MG_JAEGER_URL} + MG_JAEGER_TRACE_RATIO: ${MG_JAEGER_TRACE_RATIO} depends_on: ui-backend-db: condition: service_healthy