From d2a2a17798835f1ea62945b1f13d52c6e0eea348 Mon Sep 17 00:00:00 2001 From: Karol Babioch Date: Oct 08 2019 11:57:18 +0000 Subject: Merge branch 'removing_package_update_check' into 'production' Removing monitoring-plugins-zypper as we do not want update alerts on monitoring anymore See merge request infra/salt!267 --- diff --git a/pillar/common.sls b/pillar/common.sls index 8601f26..037290d 100644 --- a/pillar/common.sls +++ b/pillar/common.sls @@ -54,9 +54,6 @@ openssh: banner_src: salt://profile/accounts/files/ssh_banner sshd_config_mode: 0640 profile: - monitoring: - checks: - check_zypper: '/usr/lib/nagios/plugins/check_zypper -vrst 120 -ui /etc/monitoring-plugins/check_zypper-ignores.txt' postfix: aliases: root: admin-auto@opensuse.org diff --git a/salt/profile/monitoring/init.sls b/salt/profile/monitoring/init.sls index 4b03df0..1f043b4 100644 --- a/salt/profile/monitoring/init.sls +++ b/salt/profile/monitoring/init.sls @@ -3,7 +3,6 @@ common_monitoring_packages: - pkgs: - check_mk-agent - monitoring-plugins-common - - monitoring-plugins-zypper - nrpe {% for dir in ['/etc/nrpe.d', '/etc/monitoring-plugins'] %}