summaryrefslogtreecommitdiff
path: root/puppet/modules/site_check_mk
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2016-08-31 19:38:21 -0400
committerMicah Anderson <micah@riseup.net>2016-08-31 19:38:21 -0400
commitfa2dfed639d83fb67e99071cd9e135835d0f65eb (patch)
tree69d43c125dc27e325ac2ac052f10a4b06ea381ef /puppet/modules/site_check_mk
parent1d8236ec76d0aa0aca0171abd82b1a63450c8321 (diff)
parent9ef0d00b4302b7ddfc9d5620eeb4fad90d3a15aa (diff)
Merge remote-tracking branch 'varac/remove_soledad_procs_check' into develop
Diffstat (limited to 'puppet/modules/site_check_mk')
-rw-r--r--puppet/modules/site_check_mk/manifests/agent/soledad.pp11
1 files changed, 1 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 f4a3f3a6..a8febaae 100644
--- a/puppet/modules/site_check_mk/manifests/agent/soledad.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
@@ -1,17 +1,8 @@
+# Configure soledad check_mk checks
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
-
- 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'];
- }
}