Merge branch 'rb152_logwatch_reviewed' into 0.6

5 files changed, 39 insertions, 7 deletions

diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
index 75188c7b..a29923c1 100644
--- a/puppet/modules/site_check_mk/manifests/agent.pp
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -15,4 +15,5 @@ class site_check_mk::agent {
   }
 
   include site_check_mk::agent::mrpe
+  include site_check_mk::agent::logwatch
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
index 5b50e5a9..c954292a 100644
--- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
@@ -1,5 +1,10 @@
 class site_check_mk::agent::couchdb {
 
+  file { '/etc/check_mk/logwatch.d/couchdb.cfg':
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/couchdb.cfg',
+  }
+
+
   # local custom checks
   file { '/usr/lib/check_mk_agent/local/check_bigcouch_errors.sh':
     ensure  => link,
@@ -7,11 +12,4 @@ class site_check_mk::agent::couchdb {
     require => Vcsrepo['/srv/leap/couchdb/scripts']
   }
 
-  # local nagios plugin checks via mrpe
-  file_line {
-    'Tapicero_Procs':
-      line => 'Tapicero_Procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a tapicero',
-      path => '/etc/check_mk/mrpe.cfg';
-  }
-
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
new file mode 100644
index 00000000..67db5a12
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
@@ -0,0 +1,15 @@
+class site_check_mk::agent::logwatch {
+  # Deploy mk_logwatch 1.2.4 so we can split the config
+  # into multiple config files in /etc/check_mk/logwatch.d
+  # see https://leap.se/code/issues/5135
+
+  file { '/usr/lib/check_mk_agent/plugins/mk_logwatch':
+    source => 'puppet:///modules/site_check_mk/agent/plugins/mk_logwatch.1.2.4',
+    mode   => '0755'
+  }
+
+  file { '/etc/check_mk/logwatch.d':
+    ensure => directory
+  }
+
+}
diff --git a/puppet/modules/site_check_mk/manifests/agent/soledad.pp b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
index d75ae732..cbae81fe 100644
--- a/puppet/modules/site_check_mk/manifests/agent/soledad.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
@@ -1,5 +1,9 @@
 class site_check_mk::agent::soledad {
 
+  file { '/etc/check_mk/logwatch.d/soledad.cfg':
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/soledad.cfg',
+  }
+
   # local nagios plugin checks via mrpe
   file_line {
     'Soledad_Procs':
diff --git a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
new file mode 100644
index 00000000..088900f4
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
@@ -0,0 +1,14 @@
+class site_check_mk::agent::tapicero {
+
+  file { '/etc/check_mk/logwatch.d/tapicero.cfg':
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/tapicero.cfg',
+  }
+
+  # local nagios plugin checks via mrpe
+  file_line {
+    'Tapicero_Procs':
+      line => 'Tapicero_Procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a tapicero',
+      path => '/etc/check_mk/mrpe.cfg';
+  }
+
+}