diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 index 69847a853c..001f005427 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 @@ -2,10 +2,18 @@ # All Servers and associated devices ############### -# Hosts in telia are defined elsewhere -# why its there -define hostgroup { - hostgroup_name all - alias All hosts / Devices - members *, +{% for key, value in groups.iteritems() %} +define hostgroup{ + hostgroup_name {{ key }} + alias {{ key }} + members {% for host in groups[key] %}{{host}}, {% endfor %} + +} +{% endfor %} + +define hostgroup { + hostgroup_name phx2_mgmt_systems + alias Non-Ansibled Management Systems + members {% for host in vars['phx2_management_hosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/hostgroups/anitya.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/anitya.cfg.j2 deleted file mode 100644 index a8e0dd7c51..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/anitya.cfg.j2 +++ /dev/null @@ -1,20 +0,0 @@ -define hostgroup { - hostgroup_name anitya-backend - alias anitya-backend - members {% for host in groups['anitya-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name anitya-frontend - alias anitya-frontend - members {% for host in groups['anitya-frontend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name anitya - alias anitya - members {% for host in groups['anitya'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/ask.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/ask.cfg.j2 deleted file mode 100644 index d749310bcd..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/ask.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name ask - alias ASK servers - members {% for host in groups['ask'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name ask-stg - alias STG ASK servers - members {% for host in groups['ask-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/autocloud.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/autocloud.cfg.j2 deleted file mode 100644 index d26775a620..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/autocloud.cfg.j2 +++ /dev/null @@ -1,57 +0,0 @@ -define hostgroup { - hostgroup_name autocloud-backend-libvirt - alias Autocloud Backend Libvirt servers - members {% for host in groups['autocloud-backend-libvirt'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name autocloud-backend-libvirt-stg - alias STG Autocloud Backend Libvirt servers - members {% for host in groups['autocloud-backend-libvirt-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name autocloud-backend-vbox - alias Autocloud Backend VBOX servers - members {% for host in groups['autocloud-backend-vbox'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name autocloud-backend-vbox-stg - alias STG Autocloud Backend Vbox servers - members {% for host in groups['autocloud-backend-vbox-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name autocloud-backend - alias Autocloud Backend - members {% for host in groups['autocloud-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name autocloud-backend-stg - alias STG Autocloud Backend servers - members {% for host in groups['autocloud-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name autocloud-web - alias Autocloud Web - members {% for host in groups['autocloud-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name autocloud-web-stg - alias STG Autocloud Web servers - members {% for host in groups['autocloud-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - diff --git a/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 deleted file mode 100644 index 36f78e8b03..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 +++ /dev/null @@ -1,13 +0,0 @@ -# define hostgroup { -# hostgroup_name autosign -# alias AUTOSIGN servers -# members {% for host in groups['autosign'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -# } - -define hostgroup { - hostgroup_name autosign-stg - alias STG AUTOSIGN servers - members {% for host in groups['autosign-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/backup.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/backup.cfg.j2 deleted file mode 100644 index 6c380b6eaf..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/backup.cfg.j2 +++ /dev/null @@ -1,7 +0,0 @@ -define hostgroup { - hostgroup_name backup - alias backup servers - members {% for host in groups['backup'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/badges.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/badges.cfg.j2 deleted file mode 100644 index 988f29dbaf..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/badges.cfg.j2 +++ /dev/null @@ -1,27 +0,0 @@ -define hostgroup { - hostgroup_name badges-backend - alias Badges Backend - members {% for host in groups['badges-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name badges-web - alias Badges Web - members {% for host in groups['badges-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name badges-backend-stg - alias STG Badges Backend - members {% for host in groups['badges-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name badges-web-stg - alias STG Badges Web - members {% for host in groups['badges-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/basset.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/basset.cfg.j2 deleted file mode 100644 index 677b65b13e..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/basset.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name basset - alias Basset - members {% for host in groups['basset'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name basset-stg - alias STG Basset - members {% for host in groups['basset-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/bastion.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/bastion.cfg.j2 deleted file mode 100644 index 000f439d03..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/bastion.cfg.j2 +++ /dev/null @@ -1,7 +0,0 @@ -define hostgroup { - hostgroup_name bastions - alias Bastion Servers - members {% for host in groups['bastion'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/batcave.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/batcave.cfg.j2 deleted file mode 100644 index 74452b6d96..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/batcave.cfg.j2 +++ /dev/null @@ -1,6 +0,0 @@ -define hostgroup { - hostgroup_name batcave - alias batcave servers - members {% for host in groups['batcave'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/beaker.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/beaker.cfg.j2 deleted file mode 100644 index 4ac7db9a05..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/beaker.cfg.j2 +++ /dev/null @@ -1,21 +0,0 @@ -define hostgroup { - hostgroup_name beaker - alias beaker - members {% for host in groups['beaker'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name beaker-stg - alias STG beaker - members {% for host in groups['beaker-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name beaker-virthosts - alias beaker virthosts - members {% for host in groups['beaker-virthosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/blockerbugs.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/blockerbugs.cfg.j2 deleted file mode 100644 index d5582720a6..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/blockerbugs.cfg.j2 +++ /dev/null @@ -1,13 +0,0 @@ -define hostgroup { - hostgroup_name blockerbugs - alias Blocker Bugs servers - members {% for host in groups['blockerbugs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name blockerbugs-stg - alias STG Blocker Bugs servers - members {% for host in groups['blockerbugs-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/bodhi.cfg.j2 deleted file mode 100644 index dcb2ad874e..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/bodhi.cfg.j2 +++ /dev/null @@ -1,27 +0,0 @@ -define hostgroup { - hostgroup_name bodhi2 - alias Bodhi2 - members {% for host in groups['bodhi2'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name bodhi2-stg - alias STG Bodhi2 - members {% for host in groups['bodhi2-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name bodhi-backend - alias Bodhi Backend - members {% for host in groups['bodhi-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name bodhi2-backend-stg - alias STG Bodhi Backend - members {% for host in groups['bodhi-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/bug2fedmsg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/bug2fedmsg.cfg.j2 deleted file mode 100644 index 061b6e64a8..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/bug2fedmsg.cfg.j2 +++ /dev/null @@ -1,13 +0,0 @@ -define hostgroup { - hostgroup_name bugzilla2fedmsg - alias BUGZILLA2FEDMSG servers - members {% for host in groups['bugzilla2fedmsg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name bugzilla2fedmsg-stg - alias STG BUGZILLA2FEDMSG servers - members {% for host in groups['bugzilla2fedmsg-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/bugyou.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/bugyou.cfg.j2 deleted file mode 100644 index 8ffd6e6c59..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/bugyou.cfg.j2 +++ /dev/null @@ -1,13 +0,0 @@ -define hostgroup { - hostgroup_name bugyou - alias Bug You - members {% for host in groups['bugyou'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name bugyou-stg - alias STG Bug You - members {% for host in groups['bugyou-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/build-x86.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/build-x86.cfg.j2 deleted file mode 100644 index 56ff220560..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/build-x86.cfg.j2 +++ /dev/null @@ -1,31 +0,0 @@ -define hostgroup { - hostgroup_name buildhw - alias Build x86 HW - members {% for host in groups['buildhw'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - -define hostgroup { - hostgroup_name bkernel - alias Build Kernel x86 HW - members {% for host in groups['bkernel'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - -define hostgroup { - hostgroup_name buildvm - alias Build Virtual Machines - members {% for host in groups['buildvm'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name buildvm-stg - alias STG Build Virtual Machines - members {% for host in groups['buildvm-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - diff --git a/roles/nagios_server/templates/nagios/hostgroups/buildaarch64.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/buildaarch64.cfg.j2 deleted file mode 100644 index 95ece983f8..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/buildaarch64.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name buildvm-aarch64 - alias buildvm-aarch64 - members {% for host in groups['buildvm-aarch64'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name build-aarch64 - alias build-aarch64 - members {% for host in groups['buildaarch64'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 deleted file mode 100644 index 467627f1db..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 +++ /dev/null @@ -1,59 +0,0 @@ -define hostgroup { - hostgroup_name arm-packager - alias ARM packagers - members {% for host in groups['arm-packager'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - -define hostgroup { - hostgroup_name arm-qa - alias ARM qa - members {% for host in groups['arm-qa'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name arm01 - alias ARM 01 builders - members {% for host in groups['arm01'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name arm02 - alias ARM 02 builders - members {% for host in groups['arm02'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -# define hostgroup { -# hostgroup_name arm03 -# alias ARM 03 builders -# members {% for host in groups['arm03'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -# } - -define hostgroup { - hostgroup_name arm04 - alias ARM04 - members {% for host in groups['arm04'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - -define hostgroup { - hostgroup_name buildarm - alias Builders for ARM - members {% for host in groups['buildarm'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name buildarm-stg - alias STG Builders for ARM - members {% for host in groups['buildarm-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - diff --git a/roles/nagios_server/templates/nagios/hostgroups/builders.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/builders.cfg.j2 deleted file mode 100644 index 89b7e1175e..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/builders.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name bvirthost - alias Builder Virthost servers - members {% for host in groups['bvirthost'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name buildvmhost - alias KVM servers for builders - members {% for host in groups['buildvmhost'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/buildppc.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/buildppc.cfg.j2 deleted file mode 100644 index 011ca0ebb3..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/buildppc.cfg.j2 +++ /dev/null @@ -1,35 +0,0 @@ -define hostgroup { - hostgroup_name buildppc - alias PPC secondary Hosts - members {% for host in groups['buildppc'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name buildppcle - alias PPC LE secondary Hosts - members {% for host in groups['buildppcle'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name buildppc64 - alias PPC64 secondary Hosts - members {% for host in groups['buildppc64'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name buildvm-ppc64 - alias PPC 64 VM secondary Hosts - members {% for host in groups['buildvm-ppc64'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name buildvm-ppc64le - alias PPC 64 LE VM secondary Hosts - members {% for host in groups['buildvm-ppc64le'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/builds390.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/builds390.cfg.j2 deleted file mode 100644 index a7aad8dd2c..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/builds390.cfg.j2 +++ /dev/null @@ -1,6 +0,0 @@ -define hostgroup { - hostgroup_name buildvm-s390 - alias Build servers s390 - members {% for host in groups['buildvm-s390'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2 deleted file mode 100644 index 9c9b5a6ab0..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/busgateway.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name bustgateway - alias BUSTGATEWAY servers - members {% for host in groups['busgateway'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name bustgateway-stg - alias STG BUSTGATEWAY servers - members {% for host in groups['busgateway-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2 deleted file mode 100644 index 59aad9c74c..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/copr.cfg.j2 +++ /dev/null @@ -1,70 +0,0 @@ -define hostgroup { - hostgroup_name copr-back - alias COPR-BACK servers - members {% for host in groups['copr-back'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name copr-back-stg - alias STG COPR-BACK servers - members {% for host in groups['copr-back-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name copr-dist-git - alias COPR-DIST-GIT servers - members {% for host in groups['copr-dist-git'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name copr-dist-git-stg - alias STG COPR-DIST-GIT servers - members {% for host in groups['copr-dist-git-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name copr-front - alias COPR-FRONT servers - members {% for host in groups['copr-front'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name copr-front-stg - alias STG COPR-FRONT servers - members {% for host in groups['copr-front-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name copr-keygen - alias COPR-KEYGEN servers - members {% for host in groups['copr-keygen'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name copr-keygen-stg - alias STG COPR-KEYGEN servers - members {% for host in groups['copr-keygen-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name copr - alias Copr servers - members {% for host in groups['copr'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name copr-stg - alias STG Copr servers - members {% for host in groups['copr-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/darkserver.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/darkserver.cfg.j2 deleted file mode 100644 index 394bd299bf..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/darkserver.cfg.j2 +++ /dev/null @@ -1,21 +0,0 @@ -define hostgroup { - hostgroup_name darkserver - alias DARKSERVER servers - members {% for host in groups['darkserver'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name darkserver-backend-stg - alias STG DARKSERVER Backend servers - members {% for host in groups['darkserver-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name darkserver-web-stg - alias STG DARKSERVER WEB servers - members {% for host in groups['darkserver-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/datagrepper.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/datagrepper.cfg.j2 deleted file mode 100644 index a1c94a1764..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/datagrepper.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name datagrepper - alias DATAGREPPER servers - members {% for host in groups['datagrepper'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name datagrepper-stg - alias STG DATAGREPPER servers - members {% for host in groups['datagrepper-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/dbserver.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/dbserver.cfg.j2 deleted file mode 100644 index 1d79a36107..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/dbserver.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name dbserver - alias DBSERVER servers - members {% for host in groups['dbserver'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name dbserver-stg - alias STG DBSERVER servers - members {% for host in groups['dbserver-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/dhcp.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/dhcp.cfg.j2 deleted file mode 100644 index 811fcd24c1..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/dhcp.cfg.j2 +++ /dev/null @@ -1,7 +0,0 @@ -define hostgroup { - hostgroup_name dhcp - alias DHCP servers - members {% for host in groups['dhcp'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/dns.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/dns.cfg.j2 deleted file mode 100644 index 92413581f2..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/dns.cfg.j2 +++ /dev/null @@ -1,6 +0,0 @@ -define hostgroup { - hostgroup_name dnsservers - alias DNS Servers - members {% for host in groups['dns'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/docker.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/docker.cfg.j2 deleted file mode 100644 index bd7e0806ab..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/docker.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name docker-registry - alias DOCKER-REGISTRY servers - members {% for host in groups['docker-registry'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name docker-registry-stg - alias STG DOCKER-REGISTRY servers - members {% for host in groups['docker-registry-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/download.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/download.cfg.j2 deleted file mode 100644 index 91d7b04b45..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/download.cfg.j2 +++ /dev/null @@ -1,20 +0,0 @@ -define hostgroup { - hostgroup_name download-ibiblio - alias Download ibiblio servers - members {% for host in groups['download-ibiblio'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name download-phx2 - alias Download PHX2 servers - members {% for host in groups['download-phx2'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name download-rdu2 - alias Download RDU2 servers - members {% for host in groups['download-rdu2'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/elections.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/elections.cfg.j2 deleted file mode 100644 index ef7bca9b23..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/elections.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name elections - alias ELECTIONS servers - members {% for host in groups['elections'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name elections-stg - alias STG ELECTIONS servers - members {% for host in groups['elections-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/fas.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/fas.cfg.j2 deleted file mode 100644 index 7b4a597c58..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/fas.cfg.j2 +++ /dev/null @@ -1,24 +0,0 @@ -############### -# FAS Servers (just fas for now) -############### - -define hostgroup { - hostgroup_name fasservers - alias FAS Servers - members {% for host in groups['fas'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fas-stg - alias STG FAS Servers - members {% for host in groups['fas-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fas3-stg - alias STG FAS3 Servers - members {% for host in groups['fas3-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/fedimg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/fedimg.cfg.j2 deleted file mode 100644 index 4077ddf355..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/fedimg.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name fedimg - alias FEDIMG servers - members {% for host in groups['fedimg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedimg-stg - alias STG FEDIMG servers - members {% for host in groups['fedimg-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2 deleted file mode 100644 index 5f8e481557..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/fedmsg.cfg.j2 +++ /dev/null @@ -1,84 +0,0 @@ -define hostgroup { - hostgroup_name fedmsg-gateways - alias FEDMSG-GATEWAYS servers - members {% for host in groups['fedmsg-gateways'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-gateways-stg - alias STG FEDMSG-GATEWAYS servers - members {% for host in groups['fedmsg-gateways-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-hubs - alias FEDMSG-HUBS servers - members {% for host in groups['fedmsg-hubs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-hubs-stg - alias STG FEDMSG-HUBS servers - members {% for host in groups['fedmsg-hubs-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-qa-network - alias FEDMSG-QA servers - members {% for host in groups['fedmsg-qa-network'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-qa-stg - alias STG FEDMSG-QA servers - members {% for host in groups['fedmsg-qa-network-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-relays - alias FEDMSG-RELAYS servers - members {% for host in groups['fedmsg-relays'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-relays-stg - alias STG FEDMSG-RELAYS servers - members {% for host in groups['fedmsg-relays-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-ircs - alias FEDMSG-IRCS servers - members {% for host in groups['fedmsg-ircs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-ircs-stg - alias STG FEDMSG-IRCS servers - members {% for host in groups['fedmsg-ircs-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-services - alias FEDMSG-SERVICES servers - members {% for host in groups['fedmsg-services'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedmsg-services-stg - alias STG FEDMSG-SERVICES servers - members {% for host in groups['fedmsg-services-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/fedocal.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/fedocal.cfg.j2 deleted file mode 100644 index 39dba43a78..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/fedocal.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name fedocal - alias FEDOCAL servers - members {% for host in groups['fedocal'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name fedocal-stg - alias STG FEDOCAL servers - members {% for host in groups['fedocal-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/github2fedmsg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/github2fedmsg.cfg.j2 deleted file mode 100644 index 4480c7fb15..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/github2fedmsg.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name github2fedmsg - alias GITHUB2FEDMSG servers - members {% for host in groups['github2fedmsg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name github2fedmsg-stg - alias STG GITHUB2FEDMSG servers - members {% for host in groups['github2fedmsg-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/hosted.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/hosted.cfg.j2 deleted file mode 100644 index cefb8c1c00..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/hosted.cfg.j2 +++ /dev/null @@ -1,6 +0,0 @@ -define hostgroup { - hostgroup_name hosted - alias Hosted Servers - members {% for host in groups['hosted'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/hotness.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/hotness.cfg.j2 deleted file mode 100644 index a2e35696f3..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/hotness.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name hotness - alias HOTNESS servers - members {% for host in groups['hotness'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name hotness-stg - alias STG HOTNESS servers - members {% for host in groups['hotness-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/infinote.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/infinote.cfg.j2 deleted file mode 100644 index 89edb32ec3..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/infinote.cfg.j2 +++ /dev/null @@ -1,8 +0,0 @@ -define hostgroup { - hostgroup_name infinoteservers - alias Infinote Servers - members {% for host in groups['infinote'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - diff --git a/roles/nagios_server/templates/nagios/hostgroups/ipa.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/ipa.cfg.j2 deleted file mode 100644 index b2d4a91050..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/ipa.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name ipa - alias IPA servers - members {% for host in groups['ipa'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name ipa-stg - alias STG IPA servers - members {% for host in groups['ipa-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/ipsilon.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/ipsilon.cfg.j2 deleted file mode 100644 index 7e699b811e..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/ipsilon.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name ipsilon - alias IPSILON servers - members {% for host in groups['ipsilon'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name ipsilon-stg - alias STG IPSILON servers - members {% for host in groups['ipsilon-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/jenkins.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/jenkins.cfg.j2 deleted file mode 100644 index fee353faac..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/jenkins.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name jenkins-master - alias JENKINS MASTER servers - members {% for host in groups['jenkins-master'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name jenkins-slave - alias JENKINS SLAVE servers - members {% for host in groups['jenkins-slave'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/kernel.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/kernel.cfg.j2 deleted file mode 100644 index 6fb3e3816e..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/kernel.cfg.j2 +++ /dev/null @@ -1,21 +0,0 @@ -define hostgroup { - hostgroup_name kernel-qa - alias KERNEL QA servers - members {% for host in groups['kernel-qa'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name kerneltest - alias KERNEL TEST servers - members {% for host in groups['kerneltest'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name kerneltest-stg - alias STG KERNEL TEST servers - members {% for host in groups['kerneltest-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/koji.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/koji.cfg.j2 deleted file mode 100644 index 4210bb0c3d..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/koji.cfg.j2 +++ /dev/null @@ -1,20 +0,0 @@ -define hostgroup { - hostgroup_name koji - alias KOJI servers - members {% for host in groups['koji'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name koji-stg - alias STG KOJI servers - members {% for host in groups['koji-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name kojipkgs - alias KOJI PKGS servers - members {% for host in groups['kojipkgs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/koschei.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/koschei.cfg.j2 deleted file mode 100644 index 6df058c5ef..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/koschei.cfg.j2 +++ /dev/null @@ -1,29 +0,0 @@ -define hostgroup { - hostgroup_name koschei-backend - alias KOSCHEI-BACKEND servers - members {% for host in groups['koschei-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name koschei-backend-stg - alias STG KOSCHEI-BACKEND servers - members {% for host in groups['koschei-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name koschei-web - alias KOSCHEI-WEB servers - members {% for host in groups['koschei-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name koschei-web-stg - alias STG KOSCHEI-WEB servers - members {% for host in groups['koschei-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - diff --git a/roles/nagios_server/templates/nagios/hostgroups/kvmHosts.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/kvmHosts.cfg.j2 deleted file mode 100644 index d7ae9b658c..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/kvmHosts.cfg.j2 +++ /dev/null @@ -1,17 +0,0 @@ -############### -# KVM Servers -############### - -define hostgroup { - hostgroup_name kvmServers - alias kvmServers - members {% for host in groups['virtservers'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name colo-virt - alias Colocation Virtual Hosts - members {% for host in groups['colo-virt'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/mailman.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/mailman.cfg.j2 deleted file mode 100644 index a145b17fec..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/mailman.cfg.j2 +++ /dev/null @@ -1,20 +0,0 @@ -define hostgroup { - hostgroup_name mailman - alias MAILMAN servers - members {% for host in groups['mailman'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name mailman-stg - alias STG MAILMAN servers - members {% for host in groups['mailman-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name smtp-mm - alias SMTP MAILMAN servers - members {% for host in groups['smtp-mm'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/mdapi.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/mdapi.cfg.j2 deleted file mode 100644 index d5f9d4aee6..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/mdapi.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name mdapi - alias MDAPI servers - members {% for host in groups['mdapi'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name mdapi-stg - alias STG MDAPI servers - members {% for host in groups['mdapi-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/memcached.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/memcached.cfg.j2 deleted file mode 100644 index 62d1f8acf1..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/memcached.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name memcached - alias MEMCACHED servers - members {% for host in groups['memcached'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name memcached-stg - alias STG MEMCACHED servers - members {% for host in groups['memcached-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/mgmt.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/mgmt.cfg.j2 deleted file mode 100644 index aec41de695..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/mgmt.cfg.j2 +++ /dev/null @@ -1,6 +0,0 @@ -define hostgroup { - hostgroup_name phx2_mgmt_systems - alias Non-Ansibled Management Systems - members {% for host in vars['phx2_management_hosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/mirroring.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/mirroring.cfg.j2 deleted file mode 100644 index 55642afae6..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/mirroring.cfg.j2 +++ /dev/null @@ -1,56 +0,0 @@ -define hostgroup { - hostgroup_name mirrorlist2 - alias MIRRORLIST2 servers - members {% for host in groups['mirrorlist2'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name mirrorlist2-stg - alias STG MIRRORLIST2 servers - members {% for host in groups['mirrorlist2-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name mm-backend - alias MM-BACKEND servers - members {% for host in groups['mm-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name mm-backend-stg - alias STG MM-BACKEND servers - members {% for host in groups['mm-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name mm-crawler - alias MM-CRAWLER servers - members {% for host in groups['mm-crawler'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name mm-crawler-stg - alias STG MM-CRAWLER servers - members {% for host in groups['mm-crawler-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name mm-frontend - alias MM-FRONTEND servers - members {% for host in groups['mm-frontend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name mm-frontend-stg - alias STG MM-FRONTEND servers - members {% for host in groups['mm-frontend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/modernpaste.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/modernpaste.cfg.j2 deleted file mode 100644 index 3eca491a1a..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/modernpaste.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name modernpaste - alias MODERNPASTE servers - members {% for host in groups['modernpaste'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name modernpaste-stg - alias STG MODERNPASTE servers - members {% for host in groups['modernpaste-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/moksha.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/moksha.cfg.j2 deleted file mode 100644 index 1860477c27..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/moksha.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name moksha-hubs - alias MOKSHA-HUBS servers - members {% for host in groups['moksha-hubs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name moksha-hubs-stg - alias STG MOKSHA-HUBS servers - members {% for host in groups['moksha-hubs-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 deleted file mode 100644 index 106da41593..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 +++ /dev/null @@ -1,5 +0,0 @@ -define hostgroup { - hostgroup_name nomail - alias No Mail - members *, !bastion01, !bastion02, !bastion-vpn, !backup01, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !bodhi-backend01.stg, !value01.stg, !smtp-mm-tummy01, !smtp-mm-ib01, !smtp-mm-osuosl01, !hosted03, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy09, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bvirthost01.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost12.mgmt.fedoraproject.org,!virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org,!virthost19.mgmt.fedoraproject.org,!virthost20.mgmt.fedoraproject.org,!virthost21.mgmt.fedoraproject.org,!virthost22.mgmt.fedoraproject.org,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !arm01-retrace01, !arm01-builder02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder22, !arm04-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.mgmt.fedoraproject.org, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/noswap.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/noswap.cfg.j2 deleted file mode 100644 index 2d89c2a9b3..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/noswap.cfg.j2 +++ /dev/null @@ -1,5 +0,0 @@ -define hostgroup { - hostgroup_name noswap - alias No Swap - members *, !mirrorlist-host1plus, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy12, !proxy12, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!bvirthost01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost12.mgmt.fedoraproject.org, !virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org, !virthost19.mgmt.fedoraproject.org, !virthost20.mgmt.fedoraproject.org, !virthost21.mgmt.fedoraproject.org, !virthost22.mgmt.fedoraproject.org, !ibiblio-gw, !status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !arm01-retrace01, !arm01-builder02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder22, !arm04-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.mgmt.fedoraproject.org, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/notifs.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/notifs.cfg.j2 deleted file mode 100644 index 56b4311033..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/notifs.cfg.j2 +++ /dev/null @@ -1,28 +0,0 @@ -define hostgroup { - hostgroup_name notifs-backend - alias NOTIFS-BACKEND servers - members {% for host in groups['notifs-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name notifs-backend-stg - alias STG NOTIFS-BACKEND servers - members {% for host in groups['notifs-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name notifs-web - alias NOTIFS-WEB servers - members {% for host in groups['notifs-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name notifs-web-stg - alias STG NOTIFS-WEB servers - members {% for host in groups['notifs-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/nuancier.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nuancier.cfg.j2 deleted file mode 100644 index 3c4d6f86ed..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/nuancier.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name nuancier - alias NUANCIER servers - members {% for host in groups['nuancier'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name nuancier-stg - alias STG NUANCIER servers - members {% for host in groups['nuancier-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/openqa.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/openqa.cfg.j2 deleted file mode 100644 index 737a247340..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/openqa.cfg.j2 +++ /dev/null @@ -1,21 +0,0 @@ -define hostgroup { - hostgroup_name openqa - alias OPENQA servers - members {% for host in groups['openqa'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name openqa-workers - alias OPENQA workers - members {% for host in groups['openqa-workers'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name openqa-stg - alias STG OPENQA servers - members {% for host in groups['openqa-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/osbs.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/osbs.cfg.j2 deleted file mode 100644 index 06b3bacdf0..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/osbs.cfg.j2 +++ /dev/null @@ -1,43 +0,0 @@ -define hostgroup { - hostgroup_name osbs-control - alias OSBS-CONTROL servers - members {% for host in groups['osbs-control'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name osbs-control-stg - alias STG OSBS-CONTROL servers - members {% for host in groups['osbs-control-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - -define hostgroup { - hostgroup_name osbs-masters - alias OSBS-MASTERS servers - members {% for host in groups['osbs-masters'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name osbs-masters-stg - alias STG OSBS-MASTERS servers - members {% for host in groups['osbs-masters-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name osbs-nodes - alias OSBS-NODES servers - members {% for host in groups['osbs-nodes'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name osbs-nodes-stg - alias STG OSBS-NODES servers - members {% for host in groups['osbs-nodes-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/packages.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/packages.cfg.j2 deleted file mode 100644 index 11c367e621..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/packages.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name packages - alias PACKAGES servers - members {% for host in groups['packages'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name packages-stg - alias STG PACKAGES servers - members {% for host in groups['packages-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/pagure.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pagure.cfg.j2 deleted file mode 100644 index dc78cecddf..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/pagure.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name pagure - alias PAGURE servers - members {% for host in groups['pagure'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name pagure-stg - alias STG PAGURE servers - members {% for host in groups['pagure-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/paste.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/paste.cfg.j2 deleted file mode 100644 index b1cac8f297..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/paste.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name paste - alias PASTE servers - members {% for host in groups['paste'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name paste-stg - alias STG PASTE servers - members {% for host in groups['paste-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/pdc.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pdc.cfg.j2 deleted file mode 100644 index 3cad4c58b5..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/pdc.cfg.j2 +++ /dev/null @@ -1,28 +0,0 @@ -define hostgroup { - hostgroup_name pdc-backend - alias PDC-BACKEND servers - members {% for host in groups['pdc-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name pdc-backend-stg - alias STG PDC-BACKEND servers - members {% for host in groups['pdc-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name pdc-web - alias PDC-WEB servers - members {% for host in groups['pdc-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name pdc-web-stg - alias STG PDC-WEB servers - members {% for host in groups['pdc-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/people.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/people.cfg.j2 deleted file mode 100644 index bc9d5a884d..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/people.cfg.j2 +++ /dev/null @@ -1,8 +0,0 @@ -define hostgroup { - hostgroup_name peopleservers - alias People Servers - members {% for host in groups['people'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - diff --git a/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2 deleted file mode 100644 index bfc872cc55..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -# define hostgroup { -# hostgroup_name pgbdr -# alias PGBDR servers -# members {% for host in groups['pgbdr'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -# } - -define hostgroup { - hostgroup_name pgbdr-stg - alias STG PGBDR servers - members {% for host in groups['pgbdr-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/pkgdb.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pkgdb.cfg.j2 deleted file mode 100644 index 174132545d..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/pkgdb.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name pkgdb - alias PKGDB servers - members {% for host in groups['pkgdb'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name pkgdb-stg - alias STG PKGDB servers - members {% for host in groups['pkgdb-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/pkgs.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pkgs.cfg.j2 deleted file mode 100644 index 24759f9a88..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/pkgs.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name pkgs - alias PKGS servers - members {% for host in groups['pkgs'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name pkgs-stg - alias STG PKGS servers - members {% for host in groups['pkgs-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/proxies.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/proxies.cfg.j2 deleted file mode 100644 index 0b3b886b3f..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/proxies.cfg.j2 +++ /dev/null @@ -1,17 +0,0 @@ -############### -# Proxy Servers -############### - -define hostgroup { - hostgroup_name proxies - alias proxies - members {% for host in groups['proxies'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name proxies-stg - alias STG proxies - members {% for host in groups['proxies-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/qahardware.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/qahardware.cfg.j2 deleted file mode 100644 index fa204b16e6..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/qahardware.cfg.j2 +++ /dev/null @@ -1,10 +0,0 @@ -############### -# KVM Servers -############### - -define hostgroup { - hostgroup_name qahardware - alias qahardware - members {% for host in groups['qahardware'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/releng.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/releng.cfg.j2 deleted file mode 100644 index 5603de6434..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/releng.cfg.j2 +++ /dev/null @@ -1,21 +0,0 @@ -define hostgroup { - hostgroup_name releng-compose - alias Releng Composers - members {% for host in groups['releng-compose'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name releng-secondary - alias Releng 2nd Composers - members {% for host in groups['releng-secondary'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name releng-stg - alias Releng Stg Composers - members {% for host in groups['releng-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2 deleted file mode 100644 index 0319518c32..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/relvalconsumer.cfg.j2 +++ /dev/null @@ -1,7 +0,0 @@ -define hostgroup { - hostgroup_name relvalconsumer - alias RELVALCONSUMER servers - members {% for host in groups['relvalconsumer'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/resultsdb.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/resultsdb.cfg.j2 deleted file mode 100644 index bb661a7a04..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/resultsdb.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name resultsdb-prod - alias RESULTSDB servers - members {% for host in groups['resultsdb-prod'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name resultsdb-stg - alias STG RESULTSDB servers - members {% for host in groups['resultsdb-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/retrace.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/retrace.cfg.j2 deleted file mode 100644 index 73e60b820b..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/retrace.cfg.j2 +++ /dev/null @@ -1,13 +0,0 @@ -define hostgroup { - hostgroup_name retrace - alias retrace - members {% for host in groups['retrace'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name retrace-stg - alias STG retrace - members {% for host in groups['retrace-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/servers.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/servers.cfg.j2 deleted file mode 100644 index dfae0b6a66..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/servers.cfg.j2 +++ /dev/null @@ -1,10 +0,0 @@ -############### -# All Servers - Minus Builders -############### - -define hostgroup { - hostgroup_name servers - alias All Servers - members *, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy12, !proxy12, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!bvirthost01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost12.mgmt.fedoraproject.org, !virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org, !virthost19.mgmt.fedoraproject.org, !virthost20.mgmt.fedoraproject.org, !virthost21.mgmt.fedoraproject.org, !virthost22.mgmt.fedoraproject.org, !ibiblio-gw, !status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !arm01-retrace01, !arm01-builder02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder22, !arm04-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.mgmt.fedoraproject.org, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/statscache.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/statscache.cfg.j2 deleted file mode 100644 index befba02ae4..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/statscache.cfg.j2 +++ /dev/null @@ -1,28 +0,0 @@ -define hostgroup { - hostgroup_name statscache-backend - alias STATSCACHE-BACKEND servers - members {% for host in groups['statscache-backend'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name statscache-backend-stg - alias STG STATSCACHE-BACKEND servers - members {% for host in groups['statscache-backend-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name statscache-web - alias STATSCACHE-WEB servers - members {% for host in groups['statscache-web'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name statscache-web-stg - alias STG STATSCACHE-WEB servers - members {% for host in groups['statscache-web-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/summershum.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/summershum.cfg.j2 deleted file mode 100644 index 431681a1c3..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/summershum.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name summershum - alias SUMMERSHUM servers - members {% for host in groups['summershum'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name summershum-stg - alias STG SUMMERSHUM servers - members {% for host in groups['summershum-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/sundries.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/sundries.cfg.j2 deleted file mode 100644 index a0e74f84af..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/sundries.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name sundries - alias SUNDRIES servers - members {% for host in groups['sundries'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name sundries-stg - alias STG SUNDRIES servers - members {% for host in groups['sundries-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/tagger.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/tagger.cfg.j2 deleted file mode 100644 index a7add5540b..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/tagger.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name tagger - alias TAGGER servers - members {% for host in groups['tagger'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name tagger-stg - alias STG TAGGER servers - members {% for host in groups['tagger-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/taskotron.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/taskotron.cfg.j2 deleted file mode 100644 index a0588c3fba..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/taskotron.cfg.j2 +++ /dev/null @@ -1,13 +0,0 @@ -define hostgroup { - hostgroup_name taskotron - alias Taskotron Production Hosts - members {% for host in groups['taskotron-prod'] %}{{host}},{% endfor %}{% for host in groups['taskotron-prod-client-hosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name taskotron-stg - alias Taskotron Staging Hosts - members {% for host in groups['taskotron-stg'] %}{{host}},{% endfor %}{% for host in groups['taskotron-stg-client-hosts'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/torrent.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/torrent.cfg.j2 deleted file mode 100644 index 616ca23a05..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/torrent.cfg.j2 +++ /dev/null @@ -1,8 +0,0 @@ -define hostgroup { - hostgroup_name torrent-servers - alias Torrent Servers - members {% for host in groups['torrent'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - diff --git a/roles/nagios_server/templates/nagios/hostgroups/unbound.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/unbound.cfg.j2 deleted file mode 100644 index 45d43884bd..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/unbound.cfg.j2 +++ /dev/null @@ -1,12 +0,0 @@ -############### -# Unbound Servers -############### - -define hostgroup { - hostgroup_name unboundservers - alias Unbound Servers - members {% for host in groups['unbound'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - - diff --git a/roles/nagios_server/templates/nagios/hostgroups/value.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/value.cfg.j2 deleted file mode 100644 index dd3579cc2a..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/value.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name value - alias VALUE servers - members {% for host in groups['value'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name value-stg - alias STG VALUE servers - members {% for host in groups['value-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 deleted file mode 100644 index 7134fffe8b..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 +++ /dev/null @@ -1,10 +0,0 @@ -# -# host group of all vpn client hosts. -# - -define hostgroup { - hostgroup_name vpnclients - alias vpnclients - members {% for host in groups['all'] %}{% if hostvars[host].vpn %}{{host}},{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/hostgroups/web.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/web.cfg.j2 deleted file mode 100644 index 3c727aaad2..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/web.cfg.j2 +++ /dev/null @@ -1,11 +0,0 @@ -############### -# Web Servers -############### - -define hostgroup { - hostgroup_name webservers - alias webservers - members {% for host in groups['webservers'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/wiki.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/wiki.cfg.j2 deleted file mode 100644 index 6c8130d2a1..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/wiki.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name wiki - alias WIKI servers - members {% for host in groups['wiki'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name wiki-stg - alias STG WIKI servers - members {% for host in groups['wiki-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/hostgroups/zanata2fedmsg.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/zanata2fedmsg.cfg.j2 deleted file mode 100644 index 15af96beda..0000000000 --- a/roles/nagios_server/templates/nagios/hostgroups/zanata2fedmsg.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define hostgroup { - hostgroup_name zanata2fedmsg - alias ZANATA2FEDMSG servers - members {% for host in groups['zanata2fedmsg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} - -define hostgroup { - hostgroup_name zanata2fedmsg-stg - alias STG ZANATA2FEDMSG servers - members {% for host in groups['zanata2fedmsg-stg'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} - -} -