From: Tom Hughes <tom@compton.nu>
Date: Thu, 19 Oct 2023 20:15:27 +0000 (+0100)
Subject: Make prometheus API blocks work
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/7449c8bbc89c2bc88c2d075109ffe0484ef1d54e

Make prometheus API blocks work
---

diff --git a/cookbooks/prometheus/templates/default/apache.erb b/cookbooks/prometheus/templates/default/apache.erb
index e6290caed..c20daa31e 100644
--- a/cookbooks/prometheus/templates/default/apache.erb
+++ b/cookbooks/prometheus/templates/default/apache.erb
@@ -23,21 +23,27 @@
 	SSLCertificateFile /etc/ssl/certs/prometheus.openstreetmap.org.pem
 	SSLCertificateKeyFile /etc/ssl/private/prometheus.openstreetmap.org.key
 
-	Redirect 403 /prometheus/api/v1/admin
 	ProxyPass /prometheus http://localhost:9090/prometheus
-	Redirect 403 /alertmanager/api
 	ProxyPass /alertmanager http://localhost:9093/alertmanager
 	ProxyPass /karma http://localhost:8081/karma
 	ProxyPass /api/live/ws ws://localhost:3000/api/live/ws
 	ProxyPass / http://localhost:3000/
 	ProxyPreserveHost on
 
+	<Location /prometheus/api/v1/admin>
+		Require all denied
+	</Location>
+
 	<Location /alertmanager>
 <% @admin_hosts.each do |host| -%>
 		Require ip <%= host %>
 <% end -%>
 	</Location>
 
+	<Location /alertmanager/api>
+		Require all denied
+	</Location>
+
 	<Location /karma>
 <% @admin_hosts.each do |host| -%>
 		Require ip <%= host %>