diff options
| author | varac <varacanero@zeromail.org> | 2016-02-01 20:51:04 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2016-02-02 19:38:35 +0100 |
| commit | ea2955c73150dc7417b2637acb2b29a955550c29 (patch) | |
| tree | 692fe7f7c0b04b2f6dc60d94ad8c4bd92243db9a | |
| parent | 5471630d583d21bc21ec1e6a1e17056c2bdecb23 (diff) | |
[bug] Fix bigcouch spoolfile removal
- Resolves: #7641
| -rw-r--r-- | puppet/modules/site_config/manifests/remove/bigcouch.pp | 1 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/remove/monitoring.pp | 12 |
2 files changed, 4 insertions, 9 deletions
diff --git a/puppet/modules/site_config/manifests/remove/bigcouch.pp b/puppet/modules/site_config/manifests/remove/bigcouch.pp index f8e0ebe2..26ba8d09 100644 --- a/puppet/modules/site_config/manifests/remove/bigcouch.pp +++ b/puppet/modules/site_config/manifests/remove/bigcouch.pp @@ -6,7 +6,6 @@ class site_config::remove::bigcouch { file { '/etc/check_mk/logwatch.d/bigcouch.cfg': ensure => absent, notify => [ - Exec['remove_bigcouch_logwatch_spoolfiles'], Exec['remove_bigcouch_logwatch_stateline'] ] } diff --git a/puppet/modules/site_config/manifests/remove/monitoring.pp b/puppet/modules/site_config/manifests/remove/monitoring.pp index ab9f7a8f..18e2949b 100644 --- a/puppet/modules/site_config/manifests/remove/monitoring.pp +++ b/puppet/modules/site_config/manifests/remove/monitoring.pp @@ -1,17 +1,13 @@ # remove leftovers on monitoring nodes class site_config::remove::monitoring { + # Remove check_mk loggwatch spoolfiles for + # tapicero and bigcouch tidy { - 'checkmk_logwatch_spool': + 'remove_logwatch_spoolfiles': path => '/var/lib/check_mk/logwatch', recurse => true, - matches => '*tapicero.log' - } - - # remove leftover bigcouch logwatch spool files - exec { 'remove_bigcouch_logwatch_spoolfiles': - command => 'find /var/lib/check_mk/logwatch -name \'\\opt\\bigcouch\\var\\log\\bigcouch.log\' -exec rm {} \;', - refreshonly => true, + matches => [ '*tapicero.log', '*bigcouch.log']; } } |