From: Tom Hughes <tom@compton.nu>
Date: Sat, 23 Nov 2024 12:44:45 +0000 (+0000)
Subject: Enable resolved prometheus exporter
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/refs/heads/master?hp=6e7da07c709187c0fb72f8bed7963343ddd95160

Enable resolved prometheus exporter
---

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index ea87c3b7b..5f2a07eba 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -331,6 +331,14 @@ link "/etc/resolv.conf" do
   to "../run/systemd/resolve/stub-resolv.conf"
 end
 
+gem_package "dbus-systemd"
+
+prometheus_exporter "resolved" do
+  port 10028
+  user "systemd-resolve"
+  restrict_address_families "AF_UNIX"
+end
+
 hosts = { :inet => [], :inet6 => [] }
 
 search(:node, "networking:interfaces").collect do |n|
diff --git a/cookbooks/vectortile/recipes/default.rb b/cookbooks/vectortile/recipes/default.rb
index ad4e5a8ef..d57cee6a3 100644
--- a/cookbooks/vectortile/recipes/default.rb
+++ b/cookbooks/vectortile/recipes/default.rb
@@ -99,7 +99,7 @@ end
 python_package "tilekiln" do
   python_virtualenv tilekiln_directory
   python_version "3"
-  version "0.6.2"
+  version "0.6.3"
 end
 
 template "/srv/vector.openstreetmap.org/html/index.html" do
diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index ee24dbd8d..e46f9d52b 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -161,7 +161,9 @@ rails_port "www.openstreetmap.org" do
     ".*\\.mapy\\.cz.*",
     # Blacklist Yandex
     ".*\\.api-maps\\.yandex\\.ru/.*",
-    ".*\\.maps\\.yandex\\.net/.*"
+    ".*\\.maps\\.yandex\\.net/.*",
+    # Blacklist 2gis
+    ".*\\.maps\\.2gis\\.com/.*"
   ]
 end