Merge branch '6964_remove_old_leap_mx_logfile_from_check_mk_logwatch' into '0.7.0'

remove old leap_mx logfile location from check_mk logwatch state file #6964

Change-Id: I385c639e5c096deef4f81691a85c1b83cbab9421

See merge request !46

2 files changed, 12 insertions, 0 deletions

diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index e69e4b7b..57e45506 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -1,3 +1,4 @@
+# This class is the basic configuration for all nodes
 class site_config::default {
   tag 'leap_base'
 
@@ -13,6 +14,10 @@ class site_config::default {
   include apt::update
   Package { require => Exec['apt_updated'] }
 
+  class {'augeas':
+    version => 'latest'
+  }
+
   include site_config::slow
 
   # default class, used by all hosts
diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp
index 44e3e47b..05a758bb 100644
--- a/puppet/modules/site_config/manifests/remove_files.pp
+++ b/puppet/modules/site_config/manifests/remove_files.pp
@@ -33,4 +33,11 @@ class site_config::remove_files {
       rmdirs => true;
   }
 
+  # leax-mx logged to /var/log/leap_mx.log in the past
+  augeas { 'rm_old_leap_mx_log_destination':
+    incl    => '/etc/check_mk/logwatch.state',
+    lens    => 'Simplelines.lns',
+    changes => [  "rm /files/etc/check_mk/logwatch.state/*[.=~regexp('.*leap_mx.log.*')]" ],
+  }
+
 }