From 55c99e66a10d6722ed038bc20c9a0518c81c0491 Mon Sep 17 00:00:00 2001 From: Daniel Phelps Date: Wed, 27 Sep 2023 20:09:52 -0700 Subject: [PATCH] Proxy to healthz from discovery nginx --- dev-tools/compose/docker-compose.healthz.yml | 8 ++++++++ dev-tools/compose/docker-compose.yml | 8 ++++++++ dev-tools/compose/nginx_ingress.conf | 8 ++++++++ discovery-provider/nginx_conf/nginx.conf | 7 +++++++ monitoring/healthz/Dockerfile | 2 +- 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 dev-tools/compose/docker-compose.healthz.yml diff --git a/dev-tools/compose/docker-compose.healthz.yml b/dev-tools/compose/docker-compose.healthz.yml new file mode 100644 index 00000000000..91510a715ed --- /dev/null +++ b/dev-tools/compose/docker-compose.healthz.yml @@ -0,0 +1,8 @@ +version: "3.9" + +services: + healthz: + build: + context: ${PROJECT_ROOT}/monitoring/healthz + deploy: + mode: global diff --git a/dev-tools/compose/docker-compose.yml b/dev-tools/compose/docker-compose.yml index a9df00e310d..c188ab8ec5a 100644 --- a/dev-tools/compose/docker-compose.yml +++ b/dev-tools/compose/docker-compose.yml @@ -81,6 +81,14 @@ services: service: identity-service <<: *common + # Healthz + + healthz: + extends: + file: docker-compose.healthz.yml + service: healthz + <<: *common + # Discovery discovery-provider-notifications: diff --git a/dev-tools/compose/nginx_ingress.conf b/dev-tools/compose/nginx_ingress.conf index b3c0bd52104..e26ac465b54 100644 --- a/dev-tools/compose/nginx_ingress.conf +++ b/dev-tools/compose/nginx_ingress.conf @@ -29,6 +29,14 @@ server { proxy_set_header Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } + + location ^~ /healthz { + resolver 127.0.0.11 valid=30s; + proxy_pass http://healthz; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + } # diff --git a/discovery-provider/nginx_conf/nginx.conf b/discovery-provider/nginx_conf/nginx.conf index 8281a7dcc5c..16c6263f926 100644 --- a/discovery-provider/nginx_conf/nginx.conf +++ b/discovery-provider/nginx_conf/nginx.conf @@ -269,6 +269,13 @@ http { proxy_set_header Connection "upgrade"; } + location ^~ /healthz { + resolver 127.0.0.11 valid=30s; + proxy_pass http://healthz; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + location ~ ^/relay(/.*)?$ { resolver 127.0.0.11 valid=30s; proxy_pass http://relay:6001/relay$1; diff --git a/monitoring/healthz/Dockerfile b/monitoring/healthz/Dockerfile index f0412510ff1..c448e46aaf2 100644 --- a/monitoring/healthz/Dockerfile +++ b/monitoring/healthz/Dockerfile @@ -5,7 +5,7 @@ RUN apt update && apt install -y python3 make gcc g++ ENV WORKDIR /app WORKDIR ${WORKDIR} -COPY index.html package.json package-lock.json tsconfig.json tsconfig.node.json vite.config.ts . +COPY index.html package.json package-lock.json tsconfig.json tsconfig.node.json vite.config.ts postcss.config.js tailwind.config.js . ADD src ./src ADD workers-site ./workers-site