From 512eb2655c67e64a78c200513ff5ea7fc57a48a6 Mon Sep 17 00:00:00 2001
From: Ville Pihlava <ville.pihlava@cgi.com>
Date: Fri, 22 Aug 2025 16:04:19 +0300
Subject: [PATCH 1/2] Add routes for monitoring setups.

---
 nginx.conf | 17 +++++++++++++++++
 test.js    |  7 +++++++
 2 files changed, 24 insertions(+)

diff --git a/nginx.conf b/nginx.conf
index 2a01afd..1dc83ae 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -676,6 +676,23 @@ http {
     }
   }
 
+  server {
+    server_name monitoring.digitransit.fi dev-monitoring.digitransit.fi;
+    listen 8080;
+
+    if ($http_x_forwarded_proto != "https") {
+      return 301 https://$host$request_uri;
+    }
+
+    # Add HTTP Strict Transport Security for good measure.
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
+
+    location / {
+      proxy_pass         http://monitoring-setup-grafana.monitoring.svc.cluster.local:80/;
+      include basicsettings.conf;
+    }
+  }
+
   server {
     server_name waltti-test.digitransit.fi
                 next-dev-hameenlinna.digitransit.fi
diff --git a/test.js b/test.js
index accf3ef..3f2e512 100644
--- a/test.js
+++ b/test.js
@@ -321,6 +321,13 @@ describe('otp debug UIs with authentication', function() {
   testWithCorrectCredentials('dev-kela-debug.digitransit.fi','/','test','test','https://dev-kela-debug.digitransit.fi/',true);
 });
 
+describe('monitoring setup', function() {
+  testRedirect('monitoring.digitransit.fi','/kissa','https://monitoring.digitransit.fi/kissa');
+  testProxying('monitoring.digitransit.fi','/','monitoring-setup-grafana.monitoring.svc.cluster.local:80', true);
+  testRedirect('dev-monitoring.digitransit.fi','/kissa','https://dev-monitoring.digitransit.fi/kissa');
+  testProxying('dev-monitoring.digitransit.fi','/','monitoring-setup-grafana.monitoring.svc.cluster.local:80', true);
+});
+
 describe('ext-proxy', function() {
   this.timeout(5000);
   testCaching(null,'/out/helsinki-fi.smoove.pro/api-public/stations',false);

From 52c60b9e00e6c9fea0acb637ed49c1b424c1381c Mon Sep 17 00:00:00 2001
From: Ville Pihlava <ville.pihlava@cgi.com>
Date: Mon, 25 Aug 2025 14:57:54 +0300
Subject: [PATCH 2/2] Change port and tests.

---
 nginx.conf | 2 +-
 test.js    | 4 ++--
 test.sh    | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nginx.conf b/nginx.conf
index 1dc83ae..dbf9326 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -688,7 +688,7 @@ http {
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
 
     location / {
-      proxy_pass         http://monitoring-setup-grafana.monitoring.svc.cluster.local:80/;
+      proxy_pass         http://monitoring-setup-grafana.monitoring.svc.cluster.local:8080/;
       include basicsettings.conf;
     }
   }
diff --git a/test.js b/test.js
index 3f2e512..b948f4a 100644
--- a/test.js
+++ b/test.js
@@ -323,9 +323,9 @@ describe('otp debug UIs with authentication', function() {
 
 describe('monitoring setup', function() {
   testRedirect('monitoring.digitransit.fi','/kissa','https://monitoring.digitransit.fi/kissa');
-  testProxying('monitoring.digitransit.fi','/','monitoring-setup-grafana.monitoring.svc.cluster.local:80', true);
+  testProxying('monitoring.digitransit.fi','/','monitoring-setup-grafana.monitoring.svc.cluster.local:8080', true);
   testRedirect('dev-monitoring.digitransit.fi','/kissa','https://dev-monitoring.digitransit.fi/kissa');
-  testProxying('dev-monitoring.digitransit.fi','/','monitoring-setup-grafana.monitoring.svc.cluster.local:80', true);
+  testProxying('dev-monitoring.digitransit.fi','/','monitoring-setup-grafana.monitoring.svc.cluster.local:8080', true);
 });
 
 describe('ext-proxy', function() {
diff --git a/test.sh b/test.sh
index bfd8ae1..4c74112 100755
--- a/test.sh
+++ b/test.sh
@@ -5,6 +5,9 @@ docker build -t hsldevcom/digitransit-proxy:integrationtest .
 
 PROXIED_HOSTS=$(grep proxy_pass ./*.conf|cut -d'/' -f4|cut -d':' -f1|grep -v "\."|sort|uniq)
 
+# Add monitoring host
+PROXIED_HOSTS="$PROXIED_HOSTS"$'\n'"monitoring-setup-grafana.monitoring.svc.cluster.local"
+
 TARGETHOST=$(node ./tools/getMyLocalIp.js)
 
 echo "$PROXIED_HOSTS"