Move nagios client and server into a namespaced role.

2026-06-27 23:57:02 +08:00 · 2016-02-23 02:35:50 +00:00
parent 2226a9eae9
commit 0cf7929bac
658 changed files with 24 additions and 24 deletions
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -49,5 +49,5 @@
  roles:
  - { role: dhcp_server, when: datacenter == 'phx2' }
  - { role: tftp_server, when: datacenter == 'phx2' }
-  - nagios_server
+  - nagios/server
  - fedmsg/base
--- a/roles/nagios/client/files/scripts/check_datanommer_timesince.py
+++ b/roles/nagios/client/files/scripts/check_datanommer_timesince.py
--- a/roles/nagios/client/files/scripts/check_fcomm_queue
+++ b/roles/nagios/client/files/scripts/check_fcomm_queue
--- a/roles/nagios/client/files/scripts/check_fedmsg_consumer_backlog.py
+++ b/roles/nagios/client/files/scripts/check_fedmsg_consumer_backlog.py
--- a/roles/nagios/client/files/scripts/check_fedmsg_consumer_exceptions.py
+++ b/roles/nagios/client/files/scripts/check_fedmsg_consumer_exceptions.py
--- a/roles/nagios/client/files/scripts/check_fedmsg_producer_last_ran.py
+++ b/roles/nagios/client/files/scripts/check_fedmsg_producer_last_ran.py
--- a/roles/nagios/client/files/scripts/check_fedmsg_producers_consumers.py
+++ b/roles/nagios/client/files/scripts/check_fedmsg_producers_consumers.py
--- a/roles/nagios/client/files/scripts/check_haproxy_conns.py
+++ b/roles/nagios/client/files/scripts/check_haproxy_conns.py
--- a/roles/nagios/client/files/scripts/check_lock
+++ b/roles/nagios/client/files/scripts/check_lock
--- a/roles/nagios/client/files/scripts/check_lock_file_age
+++ b/roles/nagios/client/files/scripts/check_lock_file_age
--- a/roles/nagios/client/files/scripts/check_memcache_connect
+++ b/roles/nagios/client/files/scripts/check_memcache_connect
--- a/roles/nagios/client/files/scripts/check_postfix_queue
+++ b/roles/nagios/client/files/scripts/check_postfix_queue
--- a/roles/nagios/client/files/scripts/check_raid.py
+++ b/roles/nagios/client/files/scripts/check_raid.py
--- a/roles/nagios/client/files/scripts/check_readonly_fs
+++ b/roles/nagios/client/files/scripts/check_readonly_fs
--- a/roles/nagios/client/files/scripts/check_supybot_plugin
+++ b/roles/nagios/client/files/scripts/check_supybot_plugin
--- a/roles/nagios/client/files/scripts/check_testcloud
+++ b/roles/nagios/client/files/scripts/check_testcloud
--- a/roles/nagios/client/files/selinux/fi-nrpe.mod
+++ b/roles/nagios/client/files/selinux/fi-nrpe.mod
--- a/roles/nagios/client/files/selinux/fi-nrpe.pp
+++ b/roles/nagios/client/files/selinux/fi-nrpe.pp
--- a/roles/nagios/client/files/selinux/fi-nrpe.te
+++ b/roles/nagios/client/files/selinux/fi-nrpe.te
--- a/roles/nagios/client/handlers/main.yml
+++ b/roles/nagios/client/handlers/main.yml
--- a/roles/nagios/client/tasks/main.yml
+++ b/roles/nagios/client/tasks/main.yml
--- a/roles/nagios/client/templates/check_autocloud_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_autocloud_proc.cfg.j2
--- a/roles/nagios/client/templates/check_cron.cfg.j2
+++ b/roles/nagios/client/templates/check_cron.cfg.j2
--- a/roles/nagios/client/templates/check_datanommer_history.cfg.j2
+++ b/roles/nagios/client/templates/check_datanommer_history.cfg.j2
--- a/roles/nagios/client/templates/check_disk.cfg.j2
+++ b/roles/nagios/client/templates/check_disk.cfg.j2
--- a/roles/nagios/client/templates/check_fedmsg_consumers.cfg.j2
+++ b/roles/nagios/client/templates/check_fedmsg_consumers.cfg.j2
--- a/roles/nagios/client/templates/check_fedmsg_gateway_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_fedmsg_gateway_proc.cfg.j2
--- a/roles/nagios/client/templates/check_fedmsg_hub_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_fedmsg_hub_proc.cfg.j2
--- a/roles/nagios/client/templates/check_fedmsg_irc_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_fedmsg_irc_proc.cfg.j2
--- a/roles/nagios/client/templates/check_fedmsg_masher_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_fedmsg_masher_proc.cfg.j2
--- a/roles/nagios/client/templates/check_fedmsg_relay_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_fedmsg_relay_proc.cfg.j2
--- a/roles/nagios/client/templates/check_happroxy_conns.cfg.j2
+++ b/roles/nagios/client/templates/check_happroxy_conns.cfg.j2
--- a/roles/nagios/client/templates/check_koschei_polling_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_koschei_polling_proc.cfg.j2
--- a/roles/nagios/client/templates/check_koschei_resolver_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_koschei_resolver_proc.cfg.j2
--- a/roles/nagios/client/templates/check_koschei_scheduler_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_koschei_scheduler_proc.cfg.j2
--- a/roles/nagios/client/templates/check_koschei_watcher_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_koschei_watcher_proc.cfg.j2
--- a/roles/nagios/client/templates/check_lock.cfg.j2
+++ b/roles/nagios/client/templates/check_lock.cfg.j2
--- a/roles/nagios/client/templates/check_lock_file_age.cfg.j2
+++ b/roles/nagios/client/templates/check_lock_file_age.cfg.j2
--- a/roles/nagios/client/templates/check_memcache.cfg.j2
+++ b/roles/nagios/client/templates/check_memcache.cfg.j2
--- a/roles/nagios/client/templates/check_merged_file_age.cfg.j2
+++ b/roles/nagios/client/templates/check_merged_file_age.cfg.j2
--- a/roles/nagios/client/templates/check_mirrorlist_cache.cfg.j2
+++ b/roles/nagios/client/templates/check_mirrorlist_cache.cfg.j2
--- a/roles/nagios/client/templates/check_mysql.cfg.j2
+++ b/roles/nagios/client/templates/check_mysql.cfg.j2
--- a/roles/nagios/client/templates/check_openvpn_link.cfg.j2
+++ b/roles/nagios/client/templates/check_openvpn_link.cfg.j2
--- a/roles/nagios/client/templates/check_postfix_queue.cfg.j2
+++ b/roles/nagios/client/templates/check_postfix_queue.cfg.j2
--- a/roles/nagios/client/templates/check_raid.cfg.j2
+++ b/roles/nagios/client/templates/check_raid.cfg.j2
--- a/roles/nagios/client/templates/check_readonly_fs.cfg.j2
+++ b/roles/nagios/client/templates/check_readonly_fs.cfg.j2
--- a/roles/nagios/client/templates/check_redis_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_redis_proc.cfg.j2
--- a/roles/nagios/client/templates/check_supybot_fedmsg_plugin.cfg.j2
+++ b/roles/nagios/client/templates/check_supybot_fedmsg_plugin.cfg.j2
--- a/roles/nagios/client/templates/check_swap.cfg.j2
+++ b/roles/nagios/client/templates/check_swap.cfg.j2
--- a/roles/nagios/client/templates/check_testcloud.cfg.j2
+++ b/roles/nagios/client/templates/check_testcloud.cfg.j2
--- a/roles/nagios/client/templates/check_unbound_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_unbound_proc.cfg.j2
--- a/roles/nagios/client/templates/check_varnish_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_varnish_proc.cfg.j2
--- a/roles/nagios/client/templates/nrpe.cfg.j2
+++ b/roles/nagios/client/templates/nrpe.cfg.j2
--- a/roles/nagios/server/files/check_nagios_notifications.py
+++ b/roles/nagios/server/files/check_nagios_notifications.py
--- a/roles/nagios/server/files/irc-colorize.py
+++ b/roles/nagios/server/files/irc-colorize.py
--- a/roles/nagios/server/files/nagios-external/cgi.cfg
+++ b/roles/nagios/server/files/nagios-external/cgi.cfg
--- a/roles/nagios/server/files/nagios-external/contactgroups/bodhi.cfg
+++ b/roles/nagios/server/files/nagios-external/contactgroups/bodhi.cfg
--- a/roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-email.cfg
+++ b/roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-email.cfg
--- a/roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-ircbot.cfg
+++ b/roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-ircbot.cfg
--- a/roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-pager.cfg
+++ b/roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-pager.cfg
--- a/roles/nagios/server/files/nagios-external/contactgroups/null.cfg
+++ b/roles/nagios/server/files/nagios-external/contactgroups/null.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/admin.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/admin.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/ausil.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/ausil.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/codeblock.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/codeblock.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/hvivani.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/hvivani.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/ircbot.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/ircbot.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/jcollie.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/jcollie.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/jmtaylor.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/jmtaylor.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/jstanley.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/jstanley.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/kevin.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/kevin.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/lmacken.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/lmacken.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/mmcgrath.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/mmcgrath.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/nb.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/nb.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/nigelj.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/nigelj.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/null.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/null.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/puiterwijk.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/puiterwijk.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/ricky.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/ricky.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/rigeld2.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/rigeld2.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/skvidal.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/skvidal.cfg
--- a/roles/nagios/server/files/nagios-external/contacts/smooge.cfg
+++ b/roles/nagios/server/files/nagios-external/contacts/smooge.cfg
--- a/roles/nagios/server/files/nagios-external/escalations.cfg
+++ b/roles/nagios/server/files/nagios-external/escalations.cfg
--- a/roles/nagios/server/files/nagios-external/hostgroups/all.cfg
+++ b/roles/nagios/server/files/nagios-external/hostgroups/all.cfg
--- a/roles/nagios/server/files/nagios-external/hostgroups/dns.cfg
+++ b/roles/nagios/server/files/nagios-external/hostgroups/dns.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/fedorapeople.org.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/fedorapeople.org.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/fedoraproject.org.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/fedoraproject.org.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/gateway.fedoraproject.org.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/gateway.fedoraproject.org.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/koji.fedoraproject.org.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/koji.fedoraproject.org.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/noc01.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/noc01.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/ns-sb01.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/ns-sb01.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/ns02.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/ns02.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/ns04.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/ns04.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/ns05.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/ns05.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/redhat.com.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/redhat.com.cfg
--- a/roles/nagios/server/files/nagios-external/hosts/templates.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/templates.cfg
--- a/roles/nagios/server/files/nagios-external/minimal.cfg
+++ b/roles/nagios/server/files/nagios-external/minimal.cfg
--- a/roles/nagios/server/files/nagios-external/misccommands.cfg
+++ b/roles/nagios/server/files/nagios-external/misccommands.cfg
--- a/roles/nagios/server/files/nagios-external/nagios.cfg
+++ b/roles/nagios/server/files/nagios-external/nagios.cfg
--- a/roles/nagios/server/files/nagios-external/nsca.cfg
+++ b/roles/nagios/server/files/nagios-external/nsca.cfg
--- a/roles/nagios/server/files/nagios-external/private/resource.cfg
+++ b/roles/nagios/server/files/nagios-external/private/resource.cfg
--- a/Show More
+++ b/Show More