diff options
Diffstat (limited to 'puppet/modules')
6 files changed, 19 insertions, 9 deletions
diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp index 979a02d7..2dfe16fa 100644 --- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp +++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp @@ -18,13 +18,15 @@ class site_check_mk::agent::couchdb {        lens    => 'Spacevars.lns',        changes => [          'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_epmd_procs', -        'set Bigcouch_epmd_procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/epmd\'' ]; +        'set Bigcouch_epmd_procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/epmd\'' ], +      require => File['/etc/check_mk/mrpe.cfg'];      'Bigcouch_beam_procs':        incl    => '/etc/check_mk/mrpe.cfg',        lens    => 'Spacevars.lns',        changes => [          'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_beam_procs', -        'set Bigcouch_beam_procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/beam\'' ]; +        'set Bigcouch_beam_procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/beam\'' ], +      require => File['/etc/check_mk/mrpe.cfg'];    }    # check open files for bigcouch proc @@ -39,7 +41,8 @@ class site_check_mk::agent::couchdb {        lens    => 'Spacevars.lns',        changes => [          'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_open_files', -        'set Bigcouch_open_files \'/srv/leap/nagios/plugins/check_unix_open_fds.pl -a beam -w 28672,28672 -c 30720,30720\'' ]; +        'set Bigcouch_open_files \'/srv/leap/nagios/plugins/check_unix_open_fds.pl -a beam -w 28672,28672 -c 30720,30720\'' ], +      require => File['/etc/check_mk/mrpe.cfg'];    }  } diff --git a/puppet/modules/site_check_mk/manifests/agent/haproxy.pp b/puppet/modules/site_check_mk/manifests/agent/haproxy.pp index 5e7215b4..6d52efba 100644 --- a/puppet/modules/site_check_mk/manifests/agent/haproxy.pp +++ b/puppet/modules/site_check_mk/manifests/agent/haproxy.pp @@ -8,7 +8,8 @@ class site_check_mk::agent::haproxy {      lens    => 'Spacevars.lns',      changes => [        'rm /files/etc/check_mk/mrpe.cfg/Haproxy', -      'set Haproxy \'/usr/lib/nagios/plugins/check_haproxy -u "http://localhost:8000/haproxy;csv"\'' ]; +      'set Haproxy \'/usr/lib/nagios/plugins/check_haproxy -u "http://localhost:8000/haproxy;csv"\'' ], +    require => File['/etc/check_mk/mrpe.cfg'];    }  } diff --git a/puppet/modules/site_check_mk/manifests/agent/haveged.pp b/puppet/modules/site_check_mk/manifests/agent/haveged.pp index 62facd9a..cacbea8c 100644 --- a/puppet/modules/site_check_mk/manifests/agent/haveged.pp +++ b/puppet/modules/site_check_mk/manifests/agent/haveged.pp @@ -7,7 +7,9 @@ class site_check_mk::agent::haveged {        lens    => 'Spacevars.lns',        changes => [          'rm /files/etc/check_mk/mrpe.cfg/haveged_proc', -        'set haveged_proc \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /usr/sbin/haveged\'' ]; +        'set haveged_proc \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /usr/sbin/haveged\'' ], +      require => File['/etc/check_mk/mrpe.cfg']; +    }  } diff --git a/puppet/modules/site_check_mk/manifests/agent/mx.pp b/puppet/modules/site_check_mk/manifests/agent/mx.pp index 8215cb21..da66c549 100644 --- a/puppet/modules/site_check_mk/manifests/agent/mx.pp +++ b/puppet/modules/site_check_mk/manifests/agent/mx.pp @@ -12,7 +12,8 @@ class site_check_mk::agent::mx {        lens    => 'Spacevars.lns',        changes => [          'rm /files/etc/check_mk/mrpe.cfg/Leap_MX_Procs', -        'set Leap_MX_Procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a "/usr/bin/python /usr/bin/twistd --pidfile=/var/run/leap_mx.pid --rundir=/var/lib/leap_mx/ --python=/usr/share/app/leap_mx.tac --logfile=/var/log/leap_mx.log"\'' ]; +        'set Leap_MX_Procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a "/usr/bin/python /usr/bin/twistd --pidfile=/var/run/leap_mx.pid --rundir=/var/lib/leap_mx/ --python=/usr/share/app/leap_mx.tac --logfile=/var/log/leap_mx.log"\'' ], +      require => File['/etc/check_mk/mrpe.cfg'];    }    # check stale files in queue dir diff --git a/puppet/modules/site_check_mk/manifests/agent/soledad.pp b/puppet/modules/site_check_mk/manifests/agent/soledad.pp index ad8c23a1..f4a3f3a6 100644 --- a/puppet/modules/site_check_mk/manifests/agent/soledad.pp +++ b/puppet/modules/site_check_mk/manifests/agent/soledad.pp @@ -11,6 +11,7 @@ class site_check_mk::agent::soledad {      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"\'' ] +      '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_check_mk/manifests/agent/tapicero.pp b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp index 39651567..5c14b460 100644 --- a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp +++ b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp @@ -15,10 +15,12 @@ class site_check_mk::agent::tapicero {        lens    => 'Spacevars.lns',        changes => [          'rm /files/etc/check_mk/mrpe.cfg/Tapicero_Procs', -        'set Tapicero_Procs "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a tapicero"' ]; +        'set Tapicero_Procs "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a tapicero"' ], +      require => File['/etc/check_mk/mrpe.cfg'];      'Tapicero_Heartbeat':        incl    => '/etc/check_mk/mrpe.cfg',        lens    => 'Spacevars.lns', -      changes => 'set Tapicero_Heartbeat \'/usr/local/lib/nagios/plugins/check_last_regex_in_log -f /var/log/syslog -r "tapicero" -w 300 -c 600\''; +      changes => 'set Tapicero_Heartbeat \'/usr/local/lib/nagios/plugins/check_last_regex_in_log -f /var/log/syslog -r "tapicero" -w 300 -c 600\'', +      require => File['/etc/check_mk/mrpe.cfg'];    }  }  | 
