Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51060
Change subject: move ./templates/nagios/nrpe_local_icinga.cfg.erb to
./templates/icinga/nrpe_local.cfg.erb
......................................................................
move ./templates/nagios/nrpe_local_icinga.cfg.erb to
./templates/icinga/nrpe_local.cfg.erb
Change-Id: Ic6dd4ab481a74a6acc4b31622fed11574d979fb4
---
M manifests/nrpe.pp
D templates/nagios/nrpe_local_icinga.cfg.erb
2 files changed, 1 insertion(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/51060/1
diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp
index 1566992..0426312 100644
--- a/manifests/nrpe.pp
+++ b/manifests/nrpe.pp
@@ -166,7 +166,7 @@
owner => root,
group => root,
mode => 0444,
- content => template("nagios/nrpe_local_icinga.cfg.erb");
+ content => template("icinga/nrpe_local.cfg.erb");
"/usr/lib/nagios/plugins/check_dpkg":
owner => root,
group => root,
diff --git a/templates/nagios/nrpe_local_icinga.cfg.erb
b/templates/nagios/nrpe_local_icinga.cfg.erb
deleted file mode 100644
index 59a2229..0000000
--- a/templates/nagios/nrpe_local_icinga.cfg.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-pid_file=/var/run/nagios/nrpe.pid
-allowed_hosts=<%= scope.lookupvar("nrpe::packagesnew::nrpe_allowed_hosts") %>
-
-command[check_dpkg]=/usr/lib/nagios/plugins/check_dpkg
-command[check_disk_5_2]=/usr/lib/nagios/plugins/check_disk -w 5% -c 2% -l -e
-command[check_disk_6_3]=/usr/lib/nagios/plugins/check_disk -w 6% -c 3% -l -e
-command[check_disk_6_4]=/usr/lib/nagios/plugins/check_disk -w 6% -c 4% -l -e
-command[check_raid]=sudo /usr/bin/check-raid.py
-command[check_ram]=/usr/lib/nagios/plugins/check_ram.sh 20 5 b
-
-# process checks, we can't make this generic because we don't pass args via
nrpe (security)
-command[check_ircecho]=/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1:20 -a
ircecho
-command[check_jenkins]=/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1:20 -a
jenkins
-command[check_zuul]=/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1:20 -a
zuul-server
-command[check_mailman]=/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1:35 -a
mailman
-command[check_spamd]=/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:40 -a
spamd
-command[check_poolcounterd]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:3
-C poolcounterd
-command[check_varnishncsa]=/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2:6
-C varnishncsa
-command[check_mysqld]=/usr/lib/nagios/plugins/check_procs -c 1:1 -C mysqld
-command[check_carbon_cache]=/usr/lib/nagios/plugins/check_procs -c 1:1 -C
carbon-cache.py
-command[check_profiler_to_carbon]=/usr/lib/nagios/plugins/check_procs -c 1:1
--ereg-argument-array='^/usr/bin/python /usr/udpprofile/sbin/profiler-to-carbon'
-command[check_profiling_collector]=/usr/lib/nagios/plugins/check_procs -c 1:20
-C collector
-
-# swift process checks (RT-2593)
-command[check_swift_account_auditor]=/usr/lib/nagios/plugins/check_procs -c 1:
--ereg-argument-array='^/usr/bin/python /usr/bin/swift-account-auditor'
-command[check_swift_account_reaper]=/usr/lib/nagios/plugins/check_procs -c 1:
--ereg-argument-array='^/usr/bin/python /usr/bin/swift-account-reaper'
-command[check_swift_account_replicator]=/usr/lib/nagios/plugins/check_procs -c
1: --ereg-argument-array='^/usr/bin/python /usr/bin/swift-account-replicator'
-command[check_swift_account_server]=/usr/lib/nagios/plugins/check_procs -c 1:
--ereg-argument-array='^/usr/bin/python /usr/bin/swift-account-server'
-command[check_swift_container_auditor]=/usr/lib/nagios/plugins/check_procs -c
1: --ereg-argument-array='^/usr/bin/python /usr/bin/swift-container-auditor'
-command[check_swift_container_replicator]=/usr/lib/nagios/plugins/check_procs
-c 1: --ereg-argument-array='^/usr/bin/python
/usr/bin/swift-container-replicator'
-command[check_swift_container_server]=/usr/lib/nagios/plugins/check_procs -c
1: --ereg-argument-array='^/usr/bin/python /usr/bin/swift-container-server'
-command[check_swift_container_updater]=/usr/lib/nagios/plugins/check_procs -c
1: --ereg-argument-array='^/usr/bin/python /usr/bin/swift-container-updater'
-command[check_swift_object_auditor]=/usr/lib/nagios/plugins/check_procs -c 1:
--ereg-argument-array='^/usr/bin/python /usr/bin/swift-object-auditor'
-command[check_swift_object_replicator]=/usr/lib/nagios/plugins/check_procs -c
1: --ereg-argument-array='^/usr/bin/python /usr/bin/swift-object-replicator'
-command[check_swift_object_server]=/usr/lib/nagios/plugins/check_procs -c 1:
--ereg-argument-array='^/usr/bin/python /usr/bin/swift-object-server'
-command[check_swift_object_updater]=/usr/lib/nagios/plugins/check_procs -c 1:
--ereg-argument-array='^/usr/bin/python /usr/bin/swift-object-updater'
-# end swift process checks
-
-# this isn't in all /etc/nagios/nrpe.cfg's and is safe to duplicate
-include_dir=/etc/icinga/nrpe.d/
-include_dir=/etc/nagios/nrpe.d/
--
To view, visit https://gerrit.wikimedia.org/r/51060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6dd4ab481a74a6acc4b31622fed11574d979fb4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
