From 9ef0d00b4302b7ddfc9d5620eeb4fad90d3a15aa Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 31 Aug 2016 22:11:49 +0200
Subject: [bug] Remove Nagios soledad procs check

leap_cli already checks for running procs

- Resolves: #8380
---
 puppet/modules/site_check_mk/manifests/agent/soledad.pp | 10 ----------
 puppet/modules/site_config/manifests/remove/soledad.pp  | 12 ++++++++++++
 puppet/modules/soledad/manifests/server.pp              |  1 +
 3 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 puppet/modules/site_config/manifests/remove/soledad.pp

diff --git a/puppet/modules/site_check_mk/manifests/agent/soledad.pp b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
index d6aa810a..a8febaae 100644
--- a/puppet/modules/site_check_mk/manifests/agent/soledad.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
@@ -5,14 +5,4 @@ class site_check_mk::agent::soledad {
     source => 'puppet:///modules/site_check_mk/agent/logwatch/soledad.cfg',
   }
 
-  # local nagios plugin checks via mrpe
-
-  augeas { 'Soledad_Procs':
-    incl    => '/etc/check_mk/mrpe.cfg',
-    lens    => 'Spacevars.lns',
-    changes => [
-      'rm /files/etc/check_mk/mrpe.cfg/Soledad_Procs',
-      'set Soledad_Procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a "/usr/bin/python /usr/bin/twistd --uid=soledad --gid=soledad --pidfile=/var/run/soledad.pid --logfile=/var/log/soledad.log web --wsgi=leap.soledad.server.application --port=ssl:2323:privateKey=/etc/x509/keys/leap.key:certKey=/etc/x509/certs/leap.crt:sslmethod=SSLv23_METHOD"\'' ],
-    require => File['/etc/check_mk/mrpe.cfg'];
-  }
 }
diff --git a/puppet/modules/site_config/manifests/remove/soledad.pp b/puppet/modules/site_config/manifests/remove/soledad.pp
new file mode 100644
index 00000000..46c23f26
--- /dev/null
+++ b/puppet/modules/site_config/manifests/remove/soledad.pp
@@ -0,0 +1,12 @@
+# remove possible leftovers on soledad nodes
+class site_config::remove::soledad {
+
+  # remove soledad procs check because leap_cli already checks for them
+  augeas { 'Soledad_Procs':
+    incl    => '/etc/check_mk/mrpe.cfg',
+    lens    => 'Spacevars.lns',
+    changes => [ 'rm /files/etc/check_mk/mrpe.cfg/Soledad_Procs' ],
+    require => File['/etc/check_mk/mrpe.cfg'];
+  }
+
+}
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index c5e2455d..81f51188 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -4,6 +4,7 @@ class soledad::server {
 
   include ::site_config::default
   include ::soledad::common
+  include ::site_config::remove::soledad
 
   $soledad              = hiera('soledad')
   $couchdb_user         = $soledad['couchdb_soledad_user']['username']
-- 
cgit v1.2.3