From 2759b5aae85002cef2b28b68b5145077d25cb25d Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Mar 25 2024 20:34:56 +0000
Subject: Merge branch 'crameleon/discourse-collector' into 'production'


Allow Prometheus access to Discourse collector

See merge request infra/salt!1608
---

diff --git a/salt/profile/discourse/init.sls b/salt/profile/discourse/init.sls
index f6507fd..b77610d 100644
--- a/salt/profile/discourse/init.sls
+++ b/salt/profile/discourse/init.sls
@@ -69,9 +69,20 @@ discourse_sidekiq_service:
     - require:
         - pkg: discourse_pkgs
 
+discourse_collector_acl:
+  file.managed:
+    - name: /etc/systemd/system/discourse-prometheus-collector.service.d/salt.conf
+    - makedirs: True
+    - contents:
+        - {{ pillar['managed_by_salt'] | yaml_encode }}
+        - '[Service]'
+        - IPAddressAllow=2a07:de40:b27e:1203::50
+
 discourse_prometheus_collector:
   service.running:
     - name: discourse-prometheus-collector
     - enable: True
     - require:
         - pkg: discourse_pkgs
+    - watch:
+        - file: discourse_collector_acl