From 50bb114032dff36d5b24db0fcb70d5f396e7125d Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Mon, 19 Aug 2024 14:53:24 +0200
Subject: [PATCH] Add metrics

---
 docker/conf-workers/worker.yaml.j2    | 4 ++++
 docker/configure_workers_and_start.py | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/conf-workers/worker.yaml.j2 b/docker/conf-workers/worker.yaml.j2
index 29ec74b4ea..a750eec8a8 100644
--- a/docker/conf-workers/worker.yaml.j2
+++ b/docker/conf-workers/worker.yaml.j2
@@ -20,6 +20,10 @@ worker_listeners:
         - {{ resource }}
 {%- endfor %}
 {% endif %}
+  - type: metrics
+    port: {{ port + 1 }}
+    resources:
+      - metrics
 
 worker_log_config: {{ worker_log_config_filepath }}
 
diff --git a/docker/configure_workers_and_start.py b/docker/configure_workers_and_start.py
index f65973e6cc..f006539a6f 100755
--- a/docker/configure_workers_and_start.py
+++ b/docker/configure_workers_and_start.py
@@ -880,7 +880,7 @@ def generate_worker_files(
         worker_config = insert_worker_name_for_worker_config(worker_config, worker_name)
 
         worker_config.update(
-            {"name": worker_name, "port": str(worker_port)}
+            {"name": worker_name, "port": worker_port}
         )
 
         # Update the shared config with any worker_type specific options. The first of a
@@ -920,7 +920,7 @@ def generate_worker_files(
         for worker_type in worker_types_set:
             nginx_upstreams.setdefault(worker_type, set()).add(worker_port)
 
-        worker_port += 1
+        worker_port += 2
 
     # Build the nginx location config blocks
     nginx_location_config = ""