diff options
| author | varac <varacanero@zeromail.org> | 2016-08-31 22:11:49 +0200 |
|---|---|---|
| committer | Micah <micah@leap.se> | 2016-08-31 19:00:15 -0400 |
| commit | d81ba8bb9dbd6b1e8e7867a2fd58756788fe7b1a (patch) | |
| tree | 10868f32ee761e73af0e58a589a7a272be93005f | |
| parent | 07315e2c79e61d98ce503a4b9da7fbba9f8a61ed (diff) | |
[bug] Remove Nagios soledad procs check
leap_cli already checks for running procs
- Resolves: #8380
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/agent/soledad.pp | 10 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/remove/soledad.pp | 12 | ||||
| -rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 1 |
3 files changed, 13 insertions, 10 deletions
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'] |