diff options
| author | elijah <elijah@riseup.net> | 2015-04-17 10:24:37 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-04-17 10:24:37 -0700 |
| commit | f3aa928a91e0172a7a3c940940ab864194cb85a7 (patch) | |
| tree | 433c2784c878301dcc36478e32496b9140d4a407 /puppet/modules/site_check_mk/manifests/agent/tapicero.pp | |
| parent | 8bd7eca1913a8ca23e8b2c92b83aeac5a665131b (diff) | |
| parent | 64cc83793aa35b84b60dd40305c7edf8369a187b (diff) | |
Merge branch 'bugfix/logs' into develop
Diffstat (limited to 'puppet/modules/site_check_mk/manifests/agent/tapicero.pp')
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/agent/tapicero.pp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp index 5c14b460..4a5ec68e 100644 --- a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp +++ b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp @@ -2,10 +2,9 @@ class site_check_mk::agent::tapicero { include ::site_nagios::plugins - concat::fragment { 'syslog_tapicero': - source => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/tapicero.cfg', - target => '/etc/check_mk/logwatch.d/syslog.cfg', - order => '02'; + # watch logs + file { '/etc/check_mk/logwatch.d/tapicero.cfg': + source => 'puppet:///modules/site_check_mk/agent/logwatch/tapicero.cfg', } # local nagios plugin checks via mrpe @@ -20,7 +19,7 @@ class site_check_mk::agent::tapicero { 'Tapicero_Heartbeat': incl => '/etc/check_mk/mrpe.cfg', lens => 'Spacevars.lns', - changes => 'set Tapicero_Heartbeat \'/usr/local/lib/nagios/plugins/check_last_regex_in_log -f /var/log/syslog -r "tapicero" -w 300 -c 600\'', + changes => 'set Tapicero_Heartbeat \'/usr/local/lib/nagios/plugins/check_last_regex_in_log -f /var/log/leap/tapicero.log -r "tapicero" -w 300 -c 600\'', require => File['/etc/check_mk/mrpe.cfg']; } } |