From 46cb455f575bbd813568b9101d947601eb44d98f Mon Sep 17 00:00:00 2001 From: sailalithkanumuri8 Date: Tue, 5 Aug 2025 15:00:42 -0700 Subject: [PATCH 1/7] Added jeager from docker hub --- docker-compose-services.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docker-compose-services.yml b/docker-compose-services.yml index f36b646..ced9c42 100644 --- a/docker-compose-services.yml +++ b/docker-compose-services.yml @@ -125,6 +125,22 @@ services: - ${CONFIG_FILEPATH}/mosquitto:/mosquitto/config networks: - things_network + jaeger: + image: jaegertracing/all-in-one:latest + environment: + - COLLECTOR_OTLP_ENABLED=true + - COLLECTOR_ZIPKIN_HOST_PORT=:9411 + labels: + - "traefik.http.routers.jaeger.rule=Host(`jaeger.${STACK_HOSTNAME}`)" + - "traefik.http.routers.jaeger.service=jaeger" + - "traefik.http.routers.jaeger.middlewares=test-things-auth" + - "traefik.http.services.jaeger.loadbalancer.server.port=16686" + ports: + - "16686:16686" + - "14268:14268" + - "6831:6831/udp" + networks: + - things_network volumes: prometheus_data: grafana_data: From 31f4195150d847e870bce3bdfda21518d4b0344b Mon Sep 17 00:00:00 2001 From: sailalithkanumuri8 Date: Mon, 11 Aug 2025 12:18:28 -0700 Subject: [PATCH 2/7] Changed jeager mapping --- docker-compose-services.yml | 12 ++++++------ ports.md | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docker-compose-services.yml b/docker-compose-services.yml index ced9c42..2fbf0f0 100644 --- a/docker-compose-services.yml +++ b/docker-compose-services.yml @@ -129,16 +129,16 @@ services: image: jaegertracing/all-in-one:latest environment: - COLLECTOR_OTLP_ENABLED=true - - COLLECTOR_ZIPKIN_HOST_PORT=:9411 + - COLLECTOR_ZIPKIN_HOST_PORT=:${JAEGER_ZIPKIN_PORT} labels: - "traefik.http.routers.jaeger.rule=Host(`jaeger.${STACK_HOSTNAME}`)" - "traefik.http.routers.jaeger.service=jaeger" - - "traefik.http.routers.jaeger.middlewares=test-things-auth" - - "traefik.http.services.jaeger.loadbalancer.server.port=16686" + # - "traefik.http.routers.jaeger.middlewares=test-things-auth" + - "traefik.http.services.jaeger.loadbalancer.server.port=${JAEGER_PORT}" ports: - - "16686:16686" - - "14268:14268" - - "6831:6831/udp" + - "${JAEGER_PORT_OUT}:${JAEGER_PORT}" + - "${JAEGER_COLLECTOR_PORT}:14268" + - "${JAEGER_AGENT_PORT}:${JAEGER_AGENT_PORT}/udp" networks: - things_network volumes: diff --git a/ports.md b/ports.md index bf9fe9c..197a12a 100644 --- a/ports.md +++ b/ports.md @@ -16,3 +16,8 @@ The current open ports are listed below. The services that run on these ports ar | 8088 | 5689 | | 8089 | - | | 5685 | - | + +**Jaeger Service Ports:** +- 8084: Jaeger UI (maps to internal 16686) +- 8085: Jaeger Collector (maps to internal 14268) +- 5689: Jaeger Agent UDP (maps to internal 5689) From 9c45ea52dd7335c8949331a6fd08f00a8f1f751d Mon Sep 17 00:00:00 2001 From: sailalithkanumuri8 Date: Tue, 12 Aug 2025 14:34:00 -0700 Subject: [PATCH 3/7] Updating .env file --- .env | 10 ++++++++-- ports.md | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.env b/.env index b7692f8..170b851 100644 --- a/.env +++ b/.env @@ -41,11 +41,17 @@ PORTAINER_PORT=9000 LOKI_HOSTNAME="http://loki" LOKI_PORT=3100 +# Jaeger Tracing Service Ports +JAEGER_PORT=16686 +JAEGER_PORT_OUT=8084 +JAEGER_COLLECTOR_PORT=8085 +JAEGER_AGENT_PORT=5689 +JAEGER_ZIPKIN_PORT=8085 + # Healthcheck Parameters HC_INTERVAL=40s HC_TIMEOUT=30s HC_RETRIES=3 -HC_START_PERIOD=60s # Use the local filepath in your computer -CONFIG_FILEPATH="" +CONFIG_FILEPATH="/Users/sailalithkanumuri/IdeaProjects/infrastructure/conf" \ No newline at end of file diff --git a/ports.md b/ports.md index bf9fe9c..2a2b017 100644 --- a/ports.md +++ b/ports.md @@ -16,3 +16,4 @@ The current open ports are listed below. The services that run on these ports ar | 8088 | 5689 | | 8089 | - | | 5685 | - | +| 443 | - | \ No newline at end of file From 0f8d9a70f69855e75c983f5af8c25ffe700f4701 Mon Sep 17 00:00:00 2001 From: sailalithkanumuri8 Date: Tue, 12 Aug 2025 14:38:43 -0700 Subject: [PATCH 4/7] Updated .env again --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 170b851..4ffcd47 100644 --- a/.env +++ b/.env @@ -54,4 +54,4 @@ HC_TIMEOUT=30s HC_RETRIES=3 # Use the local filepath in your computer -CONFIG_FILEPATH="/Users/sailalithkanumuri/IdeaProjects/infrastructure/conf" \ No newline at end of file +CONFIG_FILEPATH="" From 9efd8ed996174588b5e8ff870a72d6d14f734bbe Mon Sep 17 00:00:00 2001 From: sailalithkanumuri8 Date: Tue, 12 Aug 2025 14:44:52 -0700 Subject: [PATCH 5/7] Removed unecessary jeager ports --- .env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env b/.env index 4ffcd47..be0b63b 100644 --- a/.env +++ b/.env @@ -42,8 +42,6 @@ LOKI_HOSTNAME="http://loki" LOKI_PORT=3100 # Jaeger Tracing Service Ports -JAEGER_PORT=16686 -JAEGER_PORT_OUT=8084 JAEGER_COLLECTOR_PORT=8085 JAEGER_AGENT_PORT=5689 JAEGER_ZIPKIN_PORT=8085 @@ -52,6 +50,7 @@ JAEGER_ZIPKIN_PORT=8085 HC_INTERVAL=40s HC_TIMEOUT=30s HC_RETRIES=3 +HC_START_PERIOD=60s # Use the local filepath in your computer CONFIG_FILEPATH="" From 1eb44f911921a636091f7e443868025f7549d62a Mon Sep 17 00:00:00 2001 From: sailalithkanumuri8 Date: Tue, 12 Aug 2025 14:50:51 -0700 Subject: [PATCH 6/7] Included ports back --- .env | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.env b/.env index be0b63b..72bd37b 100644 --- a/.env +++ b/.env @@ -18,18 +18,20 @@ TRAEFIK_DASHBOARD_PORT_OUT=8080 MOSQUITTO_PORT_OUT=8087 TDD_PORT_OUT=8081 -STACK_HOSTNAME="plugfest.thingweb.io" -BROKER_URI="plugfest.thingweb.io" +# STACK_HOSTNAME="plugfest.thingweb.io" +# BROKER_URI="plugfest.thingweb.io" +STACK_HOSTNAME="localhost" +BROKER_URI="localhost" PORT=8087 # OAUTH & GITHUB FORWARD AUTH -OAUTH_SECRET= +OAUTH_SECRET="y81ONt6QijxfcLIM4PRAZU55RAlUP8lA" GITHUB_AUTH_URL=https://github.com/login/oauth/authorize GITHUB_TOKEN_URL=https://github.com/login/oauth/access_token GITHUB_USER_URL=https://api.github.com/user -GITHUB_CLIENT_ID= -GITHUB_CLIENT_SECRET= -WHITELISTED_EMAILS= +GITHUB_CLIENT_ID=Ov23litWOQlH82KrczKP +GITHUB_CLIENT_SECRET=9304b0a13fb49db6077e5d94e57c85b0b07dcc16 +WHITELISTED_EMAILS=saikanbolt@gmail.com # SERVICE PORTS FORWARD_AUTH_PORT=4181 @@ -42,6 +44,8 @@ LOKI_HOSTNAME="http://loki" LOKI_PORT=3100 # Jaeger Tracing Service Ports +JAEGER_PORT=16686 +JAEGER_PORT_OUT=8084 JAEGER_COLLECTOR_PORT=8085 JAEGER_AGENT_PORT=5689 JAEGER_ZIPKIN_PORT=8085 @@ -53,4 +57,4 @@ HC_RETRIES=3 HC_START_PERIOD=60s # Use the local filepath in your computer -CONFIG_FILEPATH="" +CONFIG_FILEPATH="/Users/sailalithkanumuri/IdeaProjects/infrastructure/conf" \ No newline at end of file From 18dd571a30db256df3f9470ffbc1e0bf8036aeae Mon Sep 17 00:00:00 2001 From: sailalithkanumuri8 Date: Tue, 12 Aug 2025 14:52:11 -0700 Subject: [PATCH 7/7] Modified .env again --- .env | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 72bd37b..2fa2ac3 100644 --- a/.env +++ b/.env @@ -18,20 +18,18 @@ TRAEFIK_DASHBOARD_PORT_OUT=8080 MOSQUITTO_PORT_OUT=8087 TDD_PORT_OUT=8081 -# STACK_HOSTNAME="plugfest.thingweb.io" -# BROKER_URI="plugfest.thingweb.io" -STACK_HOSTNAME="localhost" -BROKER_URI="localhost" +STACK_HOSTNAME="plugfest.thingweb.io" +BROKER_URI="plugfest.thingweb.io" PORT=8087 # OAUTH & GITHUB FORWARD AUTH -OAUTH_SECRET="y81ONt6QijxfcLIM4PRAZU55RAlUP8lA" +OAUTH_SECRET= GITHUB_AUTH_URL=https://github.com/login/oauth/authorize GITHUB_TOKEN_URL=https://github.com/login/oauth/access_token GITHUB_USER_URL=https://api.github.com/user -GITHUB_CLIENT_ID=Ov23litWOQlH82KrczKP -GITHUB_CLIENT_SECRET=9304b0a13fb49db6077e5d94e57c85b0b07dcc16 -WHITELISTED_EMAILS=saikanbolt@gmail.com +GITHUB_CLIENT_ID= +GITHUB_CLIENT_SECRET= +WHITELISTED_EMAILS= # SERVICE PORTS FORWARD_AUTH_PORT=4181 @@ -57,4 +55,4 @@ HC_RETRIES=3 HC_START_PERIOD=60s # Use the local filepath in your computer -CONFIG_FILEPATH="/Users/sailalithkanumuri/IdeaProjects/infrastructure/conf" \ No newline at end of file +CONFIG_FILEPATH="" \ No newline at end of file