summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-10-07 11:17:11 +0200
committervarac <varacanero@zeromail.org>2015-10-07 11:17:11 +0200
commit89f609c97e43b06403706b81caf7a1c3e116bdf8 (patch)
treeafc68b819a1977532b58b9c83b97ae8a30dc1bfb /puppet
parent2b0386bee6525dda705152031d7125bc30b65269 (diff)
[bug] Fix missing dependency (tapicero leftovers)
We need to remove local check-mk-agent checks on the tapicero nodes, and want to notify the monitoring server to re-inventarize the local checks. This doesn't work when both services run on different hosts, it will fail with: Could not find dependent Exec[check_mk-refresh] for Tidy[checkmk_logwatch_spool] So i remove the notifies, because we will re-inventarize of local checks by a daily cronjob anyway, see #6873. ... - Resolves: #XYZ - Related: #XYZ - Documentation: #XYZ - Releases: XYZ
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/remove/tapicero.pp10
1 files changed, 3 insertions, 7 deletions
diff --git a/puppet/modules/site_config/manifests/remove/tapicero.pp b/puppet/modules/site_config/manifests/remove/tapicero.pp
index 497cf8b2..edb4e393 100644
--- a/puppet/modules/site_config/manifests/remove/tapicero.pp
+++ b/puppet/modules/site_config/manifests/remove/tapicero.pp
@@ -32,14 +32,12 @@ class site_config::remove::tapicero {
recurse => true,
matches => 'tapicero*',
require => [ Exec['kill_tapicero'] ];
- '/etc/check_mk/logwatch.d/tapicero.cfg':
- notify => Exec['check_mk-refresh'];
+ '/etc/check_mk/logwatch.d/tapicero.cfg':;
'checkmk_logwatch_spool':
path => '/var/lib/check_mk/logwatch',
recurse => true,
matches => '*tapicero.log',
require => Exec['kill_tapicero'],
- notify => Exec['check_mk-refresh'];
}
# remove local nagios plugin checks via mrpe
@@ -48,14 +46,12 @@ class site_config::remove::tapicero {
incl => '/etc/check_mk/mrpe.cfg',
lens => 'Spacevars.lns',
changes => 'rm /files/etc/check_mk/mrpe.cfg/Tapicero_Procs',
- require => File['/etc/check_mk/mrpe.cfg'],
- notify => Exec['check_mk-refresh'];
+ require => File['/etc/check_mk/mrpe.cfg'];
'Tapicero_Heartbeat':
incl => '/etc/check_mk/mrpe.cfg',
lens => 'Spacevars.lns',
changes => 'rm Tapicero_Heartbeat',
- require => File['/etc/check_mk/mrpe.cfg'],
- notify => Exec['check_mk-refresh'];
+ require => File['/etc/check_mk/mrpe.cfg'];
}
}