add site_check_mk::agent::tapicero, site_check_mk::agent::couchdb

3 files changed, 24 insertions, 7 deletions

diff --git a/puppet/modules/site_check_mk/files/agent/logwatch/couchdb.cfg b/puppet/modules/site_check_mk/files/agent/logwatch/couchdb.cfg
new file mode 100644
index 00000000..0911d09a
--- /dev/null
+++ b/puppet/modules/site_check_mk/files/agent/logwatch/couchdb.cfg
@@ -0,0 +1,9 @@
+/opt/bigcouch/var/log/bigcouch.log
+ C Uncaught error in HTTP request: {exit,
+ C Uncaught error in HTTP request: {exit,normal}
+ C Uncaught error in HTTP request: {error,
+ C Response abnormally terminated: {nodedown,
+ C rexi_DOWN,noproc
+ C rexi_DOWN,noconnection
+ C error
+ W Shutting down group server
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/tapicero.pp b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
new file mode 100644
index 00000000..2379881c
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
@@ -0,0 +1,10 @@
+class site_check_mk::agent::tapicero {
+
+  # 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';
+  }
+
+}