From 77b04f641582d6995449305100b7a93d61b219d9 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Mon, 1 Dec 2014 13:29:20 -0500
Subject: Increase the nagios alert thresholds for bigcouch open file
 descriptors (#6473)

Change-Id: I2549d781427fffc865c2bdcd1e950d60dad509fd
---
 puppet/modules/site_check_mk/manifests/agent/couchdb.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_check_mk/manifests/agent')

diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
index 01e2b886..ee0268a3 100644
--- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
@@ -29,7 +29,7 @@ class site_check_mk::agent::couchdb {
   }
   file_line {
     'Bigcouch_open_files':
-      line => 'Bigcouch_open_files /srv/leap/nagios/plugins/check_unix_open_fds.pl -a beam -w 750,750 -c 1000,1000',
+      line => 'Bigcouch_open_files /srv/leap/nagios/plugins/check_unix_open_fds.pl -a beam -w 28672,28672 -c 30720,30720',
       path => '/etc/check_mk/mrpe.cfg';
   }
 
-- 
cgit v1.2.3


From 049b29370e406cb424254f3be9a283f83f9e92d8 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Dec 2014 13:56:41 +0100
Subject: remove webapp python tests, because they are integrated into the
 platform now (Bug #6489)

Change-Id: Iaec748a173b6e11bb3ab3c11ca152809817644f9
---
 .../modules/site_check_mk/manifests/agent/webapp.pp   | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'puppet/modules/site_check_mk/manifests/agent')

diff --git a/puppet/modules/site_check_mk/manifests/agent/webapp.pp b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
index 64f5ea6d..88c3da30 100644
--- a/puppet/modules/site_check_mk/manifests/agent/webapp.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
@@ -1,20 +1,11 @@
 class site_check_mk::agent::webapp {
 
-  # check webapp login + soledad sync
-  package { [ 'python-srp', 'python-requests', 'python-yaml', 'python-u1db' ]:
-    ensure => installed
+  # remove leftovers of webapp python checks
+  file {
+    [ '/usr/lib/check_mk_agent/local/nagios-webapp_login.py',
+      '/usr/lib/check_mk_agent/local/soledad_sync.py' ]:
+    ensure  => absent
   }
-  file { '/usr/lib/check_mk_agent/local/nagios-webapp_login.py':
-    ensure  => link,
-    target  => '/srv/leap/webapp/test/nagios/webapp_login.py',
-    require => Package['check_mk-agent']
-  }
-  file { '/usr/lib/check_mk_agent/local/soledad_sync.py':
-    ensure  => link,
-    target  => '/srv/leap/webapp/test/nagios/soledad_sync.py',
-    require => Package['check_mk-agent']
-  }
-
 
   # check syslog
   concat::fragment { 'syslog_webapp':
-- 
cgit v1.2.3


From c16c019a3f0f1f4d5ebce9ade59a7386c3c2bb18 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 16 Dec 2014 22:06:08 +0100
Subject: Check tapicero heartbeat (Bug #6556)

In order to assure tapicero is still working, we need to monitor
/var/log/syslog for the last tapicero log msg, which should not be older
than the last check_mk_agent run (every 2 mins atm).
---
 puppet/modules/site_check_mk/manifests/agent/tapicero.pp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'puppet/modules/site_check_mk/manifests/agent')

diff --git a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
index 369ed00b..ffd11100 100644
--- a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
@@ -1,5 +1,7 @@
 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',
@@ -11,6 +13,10 @@ class site_check_mk::agent::tapicero {
     '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';
+
+    'Tapicero_Heartbeat':
+      line => 'Tapicero_Heartbeat  /usr/local/lib/nagios/plugins/check_last_regex_in_log -f /var/log/syslog -r "tapicero" -w 300 -c 600',
+      path => '/etc/check_mk/mrpe.cfg';
   }
 
 }
-- 
cgit v1.2.3