From 3105f3c91b8e892ffdf0f1f75e33e9c1998745f4 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 9 Jan 2017 16:10:25 +0000 Subject: [PATCH] try to make j2 templates for servicegroups --- .../templates/nagios/servicegroups/autoqa.cfg | 5 ----- .../templates/nagios/servicegroups/bodhi.cfg | 7 ------- .../templates/nagios/servicegroups/bodhi.cfg.j2 | 7 +++++++ .../templates/nagios/servicegroups/fas.cfg | 5 ----- .../templates/nagios/servicegroups/fas.cfg.j2 | 5 +++++ .../nagios/servicegroups/fedorahosted.org.cfg | 5 ----- .../servicegroups/fedorahosted.org.cfg.j2 | 5 +++++ .../templates/nagios/servicegroups/fp-wiki.cfg | 6 ------ .../nagios/servicegroups/fp-wiki.cfg.j2 | 6 ++++++ .../nagios/servicegroups/freemedia.cfg | 6 ------ .../nagios/servicegroups/freemedia.cfg.j2 | 7 +++++++ .../templates/nagios/servicegroups/ipa.cfg | 5 ----- .../templates/nagios/servicegroups/ipa.cfg.j2 | 6 ++++++ .../nagios/servicegroups/kvmHosts.cfg.j2 | 17 +++++++++++++++++ .../nagios/servicegroups/mgmt-http.cfg | 5 ----- .../nagios/servicegroups/mgmt-http.cfg.j2 | 6 ++++++ .../nagios/servicegroups/mgmt-https.cfg | 5 ----- .../nagios/servicegroups/mgmt-https.cfg.j2 | 6 ++++++ .../nagios/servicegroups/mirrorlist.cfg | 6 ------ .../nagios/servicegroups/mirrorlist.cfg.j2 | 7 +++++++ .../templates/nagios/servicegroups/pkgdb.cfg | 6 ------ .../templates/nagios/servicegroups/pkgdb.cfg.j2 | 7 +++++++ .../templates/nagios/servicegroups/retrace.cfg | 5 ----- .../nagios/servicegroups/retrace.cfg.j2 | 6 ++++++ 24 files changed, 85 insertions(+), 66 deletions(-) delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/autoqa.cfg delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg create mode 100644 roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/fas.cfg create mode 100644 roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg create mode 100644 roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg create mode 100644 roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg create mode 100644 roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/ipa.cfg create mode 100644 roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 create mode 100644 roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg create mode 100644 roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg create mode 100644 roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg create mode 100644 roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg create mode 100644 roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 create mode 100644 roles/nagios_server/templates/nagios/servicegroups/retrace.cfg.j2 diff --git a/roles/nagios_server/templates/nagios/servicegroups/autoqa.cfg b/roles/nagios_server/templates/nagios/servicegroups/autoqa.cfg deleted file mode 100644 index 5bf6bde22b..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/autoqa.cfg +++ /dev/null @@ -1,5 +0,0 @@ -#define servicegroup { -# servicegroup_name autoqa -# alias AutoQA Hosts -# members autoqa01,autoqa01-autotest-frontend -#} diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg deleted file mode 100644 index 46dbcba899..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg +++ /dev/null @@ -1,7 +0,0 @@ -define servicegroup { - servicegroup_name bodhi - alias Bodhi - members proxy01,bodhi,proxy02,bodhi,proxy03,bodhi,proxy04,bodhi,proxy06,bodhi,proxy08,bodhi,proxy09,bodhi,proxy05,bodhi,proxy10,bodhi,proxy11,bodhi,proxy12,bodhi,bodhi03,bodhi-internal,bodhi04,bodhi-internal - -} - diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 new file mode 100644 index 0000000000..919a152434 --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 @@ -0,0 +1,7 @@ +define servicegroup { + servicegroup_name bodhi + alias Bodhi + members {% for host in groups['bodhi2'] %}{{host}}, bodhi, {% endfor %}{% for host in groups['proxies'] %}{{host}}, bodhi, {% endfor %} + +} + diff --git a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg deleted file mode 100644 index d7cec01444..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg +++ /dev/null @@ -1,5 +0,0 @@ -define servicegroup { - servicegroup_name fas - alias Fedora Account System - members proxy01,accounts,proxy02,accounts,proxy03,accounts,proxy04,accounts,proxy08,accounts,proxy12,accounts,fas01,accounts,fas02,accounts,fas03,accounts,db-fas01,Check FAS DB,proxy05,accounts,proxy10,accounts,proxy11,accounts,proxy12,accounts,proxy06,accounts -} diff --git a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 new file mode 100644 index 0000000000..2a1ce48149 --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 @@ -0,0 +1,5 @@ +define servicegroup { + servicegroup_name fas + alias Fedora Account System + members {% for host in groups['proxies'] %}{{host}}, accounts, {% endfor %}{% for host in groups['fas'] %}{{host}}, accounts, {% endfor %} db-fas01.phx2.fedoraproject.org,Check FAS DB, +} diff --git a/roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg b/roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg deleted file mode 100644 index aa36349824..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg +++ /dev/null @@ -1,5 +0,0 @@ -define servicegroup { - servicegroup_name fedorahosted - alias Fedora Hosted - members hosted03,BZR,hosted03,GIT,hosted03,bzr.fedorahosted.org,hosted03,fedorahosted.org,hosted03,git.fedorahosted.org,hosted03,hg.fedorahosted.org,hosted03,svn.fedorahosted.org -} diff --git a/roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg.j2 new file mode 100644 index 0000000000..eba8809650 --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg.j2 @@ -0,0 +1,5 @@ +define servicegroup { + servicegroup_name fedorahosted + alias Fedora Hosted + members {% for host in groups['hosted'] %}{{host}}, BZR, {% endfor %}{% for host in groups['hosted'] %}{{host}}, GIT, {% endfor %}{% for host in groups['hosted'] %}{{host}}, bzr.fedorahosted.org, {% endfor %}{% for host in groups['hosted'] %}{{host}}, git.fedoraproject.org, {% endfor %}{% for host in groups['hosted'] %}{{host}}, hg.fedorahosted.org, {% endfor %}{% for host in groups['hosted'] %}{{host}}, svn.fedorahosted.org, {% endfor %} +} diff --git a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg deleted file mode 100644 index 8a57d1d73c..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg +++ /dev/null @@ -1,6 +0,0 @@ -define servicegroup { - servicegroup_name fp-wiki - alias Fedora Project Wiki - members proxy01,fedoraproject.org - wiki - non-cached,proxy02,fedoraproject.org - wiki - non-cached,proxy03,fedoraproject.org - wiki - non-cached,proxy04,fedoraproject.org - wiki - non-cached,proxy06,fedoraproject.org - wiki - non-cached,proxy08,fedoraproject.org - wiki - non-cached,proxy09,fedoraproject.org - wiki - non-cached,proxy01,fedoraproject.org - wiki,proxy02,fedoraproject.org - wiki,proxy03,fedoraproject.org - wiki,proxy04,fedoraproject.org - wiki,proxy06,fedoraproject.org - wiki,proxy08,fedoraproject.org - wiki,proxy09,fedoraproject.org - wiki,proxy05,fedoraproject.org - wiki,proxy10,fedoraproject.org - wiki,proxy11,fedoraproject.org - wiki,proxy12,fedoraproject.org - wiki -} - diff --git a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 new file mode 100644 index 0000000000..1b9c5798a4 --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 @@ -0,0 +1,6 @@ +define servicegroup { + servicegroup_name fp-wiki + alias Fedora Project Wiki + members {% for host in groups['proxies'] %}{{host}}, fedoraproject.org - wiki - non-cached, {% endfor %}{% for host in groups['proxies'] %}{{host}}, fedoraproject.org - wiki, {% endfor %} +} + diff --git a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg deleted file mode 100644 index e88f0b3e1e..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg +++ /dev/null @@ -1,6 +0,0 @@ -define servicegroup { - servicegroup_name freemedia - alias FreeMedia - members sundries01,freemedia-internal,sundries02,freemedia-internal -} - diff --git a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 new file mode 100644 index 0000000000..bf0f0847dc --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 @@ -0,0 +1,7 @@ +define servicegroup { + servicegroup_name freemedia + alias FreeMedia + members {% for host in groups['sundries'] %}{{host}}, freemedia-internal, {% endfor %} + +} + diff --git a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg deleted file mode 100644 index 6075220e28..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg +++ /dev/null @@ -1,5 +0,0 @@ -define servicegroup { - servicegroup_name ipa - alias IPA Servers - members ipa01,IPA Replication Status,ipa02,IPA Replication Status -} diff --git a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 new file mode 100644 index 0000000000..967b0166ad --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 @@ -0,0 +1,6 @@ +define servicegroup { + servicegroup_name ipa + alias IPA Servers + members {% for host in groups['ipa'] %}{{host}}, IPA Replication Status, {% endfor %} + +} diff --git a/roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2 new file mode 100644 index 0000000000..cbd760737d --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2 @@ -0,0 +1,17 @@ +############### +# KVM Servers +############### + +define hostgroup { + hostgroup_name phx-virt + alias PHX Virtual ServiceGroup + members {% for host in groups['virtservers'] %}{{host}}{{host}}, Disk space /,{{host}},Total Processes,{{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH, {% endfor %} + +} + +define hostgroup { + hostgroup_name colo-virt + alias Colocation Virtual ServiceGroup + members {% for host in groups['colo-virt'] %}{{host}}{{host}}, Disk space /,{{host}},Total Processes,{{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH, {% endfor %} + +} diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg deleted file mode 100644 index 3a7858bc2c..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg +++ /dev/null @@ -1,5 +0,0 @@ -define servicegroup { - servicegroup_name mgmt-http - alias mgmt interfaces on http - members backup01.mgmt.fedoraproject.org,backup01.mgmt.fedoraproject.org-http,bvirthost01.mgmt.fedoraproject.org,bvirthost01.mgmt.fedoraproject.org-http,download01.mgmt.fedoraproject.org,download01.mgmt.fedoraproject.org-http,download02.mgmt.fedoraproject.org,download02.mgmt.fedoraproject.org-http,download03.mgmt.fedoraproject.org,download03.mgmt.fedoraproject.org-http,download04.mgmt.fedoraproject.org,download04.mgmt.fedoraproject.org-http,download05.mgmt.fedoraproject.org,download05.mgmt.fedoraproject.org-http,qa01.mgmt.fedoraproject.org,qa01.mgmt.fedoraproject.org-http,qa02.mgmt.fedoraproject.org,qa02.mgmt.fedoraproject.org-http,qa03.mgmt.fedoraproject.org,qa03.mgmt.fedoraproject.org-http,qa04.mgmt.fedoraproject.org,qa04.mgmt.fedoraproject.org-http,qa05.mgmt.fedoraproject.org,qa05.mgmt.fedoraproject.org-http,qa06.mgmt.fedoraproject.org,qa06.mgmt.fedoraproject.org-http,qa07.mgmt.fedoraproject.org,qa07.mgmt.fedoraproject.org-http,qa08.mgmt.fedoraproject.org,qa08.mgmt.fedoraproject.org-http,qa09.mgmt.fedoraproject.org,qa09.mgmt.fedoraproject.org-http,qa10.mgmt.fedoraproject.org,qa10.mgmt.fedoraproject.org-http,qa11.mgmt.fedoraproject.org,qa11.mgmt.fedoraproject.org-http,qa12.mgmt.fedoraproject.org,qa12.mgmt.fedoraproject.org-http,qa13.mgmt.fedoraproject.org,qa13.mgmt.fedoraproject.org-http,qa14.mgmt.fedoraproject.org,qa14.mgmt.fedoraproject.org-http,virthost01.mgmt.fedoraproject.org,virthost01.mgmt.fedoraproject.org-http,virthost03.mgmt.fedoraproject.org,virthost03.mgmt.fedoraproject.org-http,virthost12.mgmt.fedoraproject.org,virthost12.mgmt.fedoraproject.org-http,virthost14.mgmt.fedoraproject.org,virthost14.mgmt.fedoraproject.org-http,virthost15.mgmt.fedoraproject.org,virthost15.mgmt.fedoraproject.org-http,virthost16.mgmt.fedoraproject.org,virthost16.mgmt.fedoraproject.org-http,virthost17.mgmt.fedoraproject.org,virthost17.mgmt.fedoraproject.org-http,virthost18.mgmt.fedoraproject.org,virthost18.mgmt.fedoraproject.org-http,virthost-comm02.mgmt.fedoraproject.org,virthost-comm02.mgmt.fedoraproject.org-http, virthost-comm03.mgmt.fedoraproject.org,virthost-comm03.mgmt.fedoraproject.org-http, virthost-comm04.mgmt.fedoraproject.org,virthost-comm04.mgmt.fedoraproject.org-http,sign-vault03.mgmt.fedoraproject.org,sign-vault03.mgmt.fedoraproject.org-http,sign-vault04.mgmt.fedoraproject.org,sign-vault04.mgmt.fedoraproject.org-http,virthost02.mgmt.fedoraproject.org,virthost02.mgmt.fedoraproject.org-http,virthost11.mgmt.fedoraproject.org,virthost11.mgmt.fedoraproject.org-http -} diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 new file mode 100644 index 0000000000..733a0d673e --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 @@ -0,0 +1,6 @@ +define servicegroup { + servicegroup_name mgmt-http + alias mgmt interfaces on http + members {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-http,{% endfor %} + +} diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg b/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg deleted file mode 100644 index 619f17742d..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg +++ /dev/null @@ -1,5 +0,0 @@ -define servicegroup { - servicegroup_name mgmt-https - alias mgmt interfaces on https - members backup01.mgmt.fedoraproject.org,backup01.mgmt.fedoraproject.org-https,bvirthost01.mgmt.fedoraproject.org,bvirthost01.mgmt.fedoraproject.org-https,download01.mgmt.fedoraproject.org,download01.mgmt.fedoraproject.org-https,download02.mgmt.fedoraproject.org,download02.mgmt.fedoraproject.org-https,download03.mgmt.fedoraproject.org,download03.mgmt.fedoraproject.org-https,download04.mgmt.fedoraproject.org,download04.mgmt.fedoraproject.org-https,download05.mgmt.fedoraproject.org,download05.mgmt.fedoraproject.org-https,qa01.mgmt.fedoraproject.org,qa01.mgmt.fedoraproject.org-https,qa02.mgmt.fedoraproject.org,qa02.mgmt.fedoraproject.org-https,qa03.mgmt.fedoraproject.org,qa03.mgmt.fedoraproject.org-https,qa04.mgmt.fedoraproject.org,qa04.mgmt.fedoraproject.org-https,qa05.mgmt.fedoraproject.org,qa05.mgmt.fedoraproject.org-https,qa06.mgmt.fedoraproject.org,qa06.mgmt.fedoraproject.org-https,qa07.mgmt.fedoraproject.org,qa07.mgmt.fedoraproject.org-https,qa08.mgmt.fedoraproject.org,qa08.mgmt.fedoraproject.org-https,qa09.mgmt.fedoraproject.org,qa09.mgmt.fedoraproject.org-https,qa10.mgmt.fedoraproject.org,qa10.mgmt.fedoraproject.org-https,qa11.mgmt.fedoraproject.org,qa11.mgmt.fedoraproject.org-https,qa12.mgmt.fedoraproject.org,qa12.mgmt.fedoraproject.org-https,qa13.mgmt.fedoraproject.org,qa13.mgmt.fedoraproject.org-https,qa14.mgmt.fedoraproject.org,qa14.mgmt.fedoraproject.org-https,virthost02.mgmt.fedoraproject.org,virthost02.mgmt.fedoraproject.org-https,virthost11.mgmt.fedoraproject.org,virthost11.mgmt.fedoraproject.org-https,virthost03.mgmt.fedoraproject.org,virthost03.mgmt.fedoraproject.org-https,virthost12.mgmt.fedoraproject.org,virthost12.mgmt.fedoraproject.org-https,virthost14.mgmt.fedoraproject.org,virthost14.mgmt.fedoraproject.org-https,virthost15.mgmt.fedoraproject.org,virthost15.mgmt.fedoraproject.org-https,virthost16.mgmt.fedoraproject.org,virthost16.mgmt.fedoraproject.org-https,virthost17.mgmt.fedoraproject.org,virthost17.mgmt.fedoraproject.org-https,virthost18.mgmt.fedoraproject.org,virthost18.mgmt.fedoraproject.org-https,virthost-comm02.mgmt.fedoraproject.org,virthost-comm02.mgmt.fedoraproject.org-https, virthost-comm03.mgmt.fedoraproject.org,virthost-comm03.mgmt.fedoraproject.org-https, virthost-comm04.mgmt.fedoraproject.org,virthost-comm04.mgmt.fedoraproject.org-https, sign-vault03.mgmt.fedoraproject.org,sign-vault03.mgmt.fedoraproject.org-https,sign-vault04.mgmt.fedoraproject.org,sign-vault04.mgmt.fedoraproject.org-https,fed-cloud09.mgmt.fedoraproject.org,fed-cloud09.mgmt.fedoraproject.org-https,fed-cloud08.mgmt.fedoraproject.org,fed-cloud08.mgmt.fedoraproject.org-https,fed-cloud10.mgmt.fedoraproject.org,fed-cloud10.mgmt.fedoraproject.org-https,fed-cloud11.mgmt.fedoraproject.org,fed-cloud11.mgmt.fedoraproject.org-https,fed-cloud12.mgmt.fedoraproject.org,fed-cloud12.mgmt.fedoraproject.org-https,fed-cloud13.mgmt.fedoraproject.org,fed-cloud13.mgmt.fedoraproject.org-https,fed-cloud14.mgmt.fedoraproject.org,fed-cloud14.mgmt.fedoraproject.org-https,fed-cloud15.mgmt.fedoraproject.org,fed-cloud15.mgmt.fedoraproject.org-https -} diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 new file mode 100644 index 0000000000..3c9e649249 --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 @@ -0,0 +1,6 @@ +define servicegroup { + servicegroup_name mgmt-https + alias mgmt interfaces on https + members {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-https,{% endfor %} + +} diff --git a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg deleted file mode 100644 index 3bfb386761..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg +++ /dev/null @@ -1,6 +0,0 @@ -define servicegroup { - servicegroup_name mirrorlist - alias Mirrorlist - members proxy01,mirrors.fedoraproject.org - mirrorlist,proxy02,mirrors.fedoraproject.org - mirrorlist,proxy03,mirrors.fedoraproject.org - mirrorlist,proxy04,mirrors.fedoraproject.org - mirrorlist,proxy06,mirrors.fedoraproject.org - mirrorlist,proxy08,mirrors.fedoraproject.org - mirrorlist,proxy09,mirrors.fedoraproject.org - mirrorlist,proxy05,mirrors.fedoraproject.org - mirrorlist,proxy10,mirrors.fedoraproject.org - mirrorlist,proxy11,mirrors.fedoraproject.org - mirrorlist,proxy12,mirrors.fedoraproject.org - mirrorlist -} - diff --git a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 new file mode 100644 index 0000000000..7bc95aa69c --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 @@ -0,0 +1,7 @@ +define servicegroup { + servicegroup_name mirrorlist + alias Mirrorlist + members {% for host in groups['proxies'] %}{{host}}, mirrors.fedoraproject.org - mirrorlist, {% endfor %} + +} + diff --git a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg deleted file mode 100644 index 83fea06f62..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg +++ /dev/null @@ -1,6 +0,0 @@ -define servicegroup { - servicegroup_name pkgdb - alias Package Database - members -} - diff --git a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 new file mode 100644 index 0000000000..003762072c --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 @@ -0,0 +1,7 @@ +define servicegroup { + servicegroup_name pkgdb + alias Package Database + members {% for host in groups['pkgdb'] %}{{host}}, pkgdb-external,{{host}}, pkgdb-internal, {% endfor %} + +} + diff --git a/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg b/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg index 18f377b047..e69de29bb2 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg +++ b/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg @@ -1,5 +0,0 @@ -define servicegroup { - servicegroup_name retrace - alias Retrace Hosts - members retrace01.qa.fedoraproject.org,Disk space /,retrace01.qa.fedoraproject.org,Total Processes,retrace01.qa.fedoraproject.org,Check Raid,retrace01.qa.fedoraproject.org,Swap,retrace01.qa.fedoraproject.org,SSH -} diff --git a/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg.j2 new file mode 100644 index 0000000000..5d28486a2e --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg.j2 @@ -0,0 +1,6 @@ +define servicegroup { + servicegroup_name retrace + alias Retrace Hosts + members {% for host in groups['retrace'] %}{{host}}, Disk space /,{{host}},Total Processes,{{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH, {% endfor %} + +}