diff --git a/nginx.conf b/nginx.conf
index 720a62e..7265c27 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:8080/;
+      include basicsettings.conf;
+    }
+  }
+
   server {
     server_name waltti-test.digitransit.fi
                 next-dev-hameenlinna.digitransit.fi
diff --git a/test.js b/test.js
index e8b2179..fc0fd28 100644
--- a/test.js
+++ b/test.js
@@ -332,7 +332,14 @@ describe('otp debug UIs with authentication', function() {
   testWithCorrectCredentials('dev-kela-debug.digitransit.fi','/','test','test','https://dev-kela-debug.digitransit.fi/',true);
 });
 
-describe('otp debug UIs with path beginning with "/otp" should return 404', 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: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:8080', true);
+});
+
+describe('otp debug UIs with path beginning with "/otp/actuators" should return 404', function() {
   testResponseCode('hsl-debug.digitransit.fi','/otp/actuators', 404, true);
   testResponseCode('waltti-debug.digitransit.fi','/otp/actuators', 404, true);
   testResponseCode('finland-debug.digitransit.fi','/otp/actuators', 404, true);
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"