From e9ebc834e7500dceefd0530ba6d0262e87855374 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 3 May 2016 21:50:03 +0200 Subject: [bug] run check_mk inventory on every puppetrun After upgrading the platform, there might be old check_mk checks registered on the monitor hosts. We now run a check_mk inventory on every run that also purged old non-existng checks. - Resolves: #6873 --- puppet/modules/check_mk | 2 +- puppet/modules/site_check_mk/manifests/server.pp | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/puppet/modules/check_mk b/puppet/modules/check_mk index 3df00e29..265ed218 160000 --- a/puppet/modules/check_mk +++ b/puppet/modules/check_mk @@ -1 +1 @@ -Subproject commit 3df00e29388adbf1c0e058df09a7c3886edbaca1 +Subproject commit 265ed2182f790a723996fd84de4dfcb93f800ee0 diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp index 0159a050..090f0bae 100644 --- a/puppet/modules/site_check_mk/manifests/server.pp +++ b/puppet/modules/site_check_mk/manifests/server.pp @@ -32,18 +32,19 @@ class site_check_mk::server { # override paths to use the system check_mk rather than OMD class { 'check_mk::config': - site => '', - etc_dir => '/etc', - nagios_subdir => 'nagios3', - bin_dir => '/usr/bin', - host_groups => undef, - use_storedconfigs => false, - require => Package['check-mk-server'] + site => '', + etc_dir => '/etc', + nagios_subdir => 'nagios3', + bin_dir => '/usr/bin', + host_groups => undef, + use_storedconfigs => false, + inventory_only_on_changes => false, + require => Package['check-mk-server'] } - Exec['check_mk-reload'] -> - Exec['check_mk-refresh-inventory-daily'] -> - Service['nagios'] + Exec['check_mk-refresh'] -> + Exec['check_mk-reload'] -> + Service['nagios'] file { '/etc/check_mk/conf.d/use_ssh.mk': -- cgit v1.2.3