From 785676035903b2f7418a45ec0316d9c27f0b33d8 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Dec 04 2017 19:05:57 +0000 Subject: move check_zypper-ignores.txt to /etc/monitoring-plugins --- diff --git a/pillar/common.sls b/pillar/common.sls index 0bac759..8e9ba26 100644 --- a/pillar/common.sls +++ b/pillar/common.sls @@ -8,7 +8,7 @@ locale: requires: en_US.UTF-8 UTF-8 monitoring: checks: - check_zypper: '/usr/lib/nagios/plugins/check_zypper -vrst 120 -ui /etc/nagios/check_zypper-ignores.txt' + check_zypper: '/usr/lib/nagios/plugins/check_zypper -vrst 120 -ui /etc/monitoring-plugins/check_zypper-ignores.txt' ntp: ng: settings: diff --git a/salt/profile/monitoring/init.sls b/salt/profile/monitoring/init.sls index 0323bca..7fdd829 100644 --- a/salt/profile/monitoring/init.sls +++ b/salt/profile/monitoring/init.sls @@ -1,4 +1,4 @@ -{% for dir in ['/etc/nrpe.d', '/etc/nagios'] %} +{% for dir in ['/etc/nrpe.d', '/etc/monitoring-plugins'] %} {{ dir }}: file.directory: - user: root @@ -17,7 +17,7 @@ - mode: 444 {% endfor %} -/etc/nagios/check_zypper-ignores.txt: +/etc/monitoring-plugins/check_zypper-ignores.txt: file.managed: - source: salt://profile/monitoring/files/check_zypper-ignores.txt - template: jinja