From 1a88c6ed0ea9d932b919ea75499891961875a86c Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
Date: Sep 19 2023 20:14:53 +0000
Subject: Merge branch 'monitoring' into 'production'


Drop check_mk, restart nrpe on file changes

See merge request infra/salt!697
---

diff --git a/salt/profile/monitoring/init.sls b/salt/profile/monitoring/init.sls
index 6ce798b..d3ad9e1 100644
--- a/salt/profile/monitoring/init.sls
+++ b/salt/profile/monitoring/init.sls
@@ -1,7 +1,8 @@
+{%- set xinetdd = '/etc/xinetd.d/' %}
+
 common_monitoring_packages:
   pkg.installed:
     - pkgs:
-      - check_mk-agent
       - monitoring-plugins-common
       - nrpe
 
@@ -39,25 +40,25 @@ common_monitoring_packages:
     - group: root
     - mode: 444
 
-nrpe.service:
-  service.running:
-    - enable: True
-
 # cleanup old xinetd config for nrpe (pre-Leap 15.5)
-{% for file in ['nrpe', 'nrpe.rpmnew', 'nrpe.rpmsave'] %}
-/etc/xinetd.d/{{ file }}:
+{%- for file in ['nrpe', 'nrpe.rpmnew', 'nrpe.rpmsave', 'check_mk'] %}
+{{ xinetdd }}{{ file }}:
   file.absent
-{% endfor %}
-
-/etc/xinetd.d/check_mk:
-  file.managed:
-    - contents:
-    - source: salt://profile/monitoring/files/xinetd-check_mk
-    - user: root
-    - group: root
-    - mode: 444
+{%- endfor %}
 
+{%- set fe = salt['file.file_exists'] %}
+{%- if not ( fe(xinetdd ~ 'csync2') or fe(xinetdd ~ 'nsca') or fe(xinetdd ~ 'vsftpd') or fe(xinetdd ~ 'livestatus') ) %}
 xinetd:
-  pkg.installed: []
+  pkg.removed: []
+  service.dead:
+    - enable: False
+{%- endif %}
+
+nrpe.service:
   service.running:
     - enable: True
+    - watch:
+      - file: /etc/nrpe.cfg
+      {%- for check in checks.keys() %}
+      - file: /etc/nrpe.d/{{ check }}.cfg
+      {%- endfor %}