From 94b1b707cf69a892bdc68da4220a65d7f3a04e69 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 9 Jan 2017 02:13:39 +0000 Subject: [PATCH] we get rid of servicegroups til tomorrow --- .../files/nagios/servicegroups/servicegroups/pkgdb.cfg | 6 ------ .../files/nagios/servicegroups/servicegroups/retrace.cfg | 5 ----- .../templates/nagios/hosts/phx2-mgmt-hosts.cfg.j2 | 2 +- .../nagios}/servicegroups/autoqa.cfg | 0 .../nagios}/servicegroups/bodhi.cfg | 0 .../nagios}/servicegroups/fas.cfg | 0 .../nagios}/servicegroups/fedorahosted.org.cfg | 0 .../nagios}/servicegroups/fp-wiki.cfg | 0 .../nagios}/servicegroups/freemedia.cfg | 0 .../nagios}/servicegroups/ipa.cfg | 0 .../nagios}/servicegroups/mgmt-http.cfg | 0 .../nagios}/servicegroups/mgmt-https.cfg | 0 .../nagios}/servicegroups/mirrorlist.cfg | 0 .../nagios_server/templates/nagios/servicegroups/pkgdb.cfg | 6 ++++++ .../nagios}/servicegroups/ppc-secondary.cfg | 2 +- .../templates/nagios/servicegroups/retrace.cfg | 5 +++++ 16 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 roles/nagios_server/files/nagios/servicegroups/servicegroups/pkgdb.cfg delete mode 100644 roles/nagios_server/files/nagios/servicegroups/servicegroups/retrace.cfg rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/autoqa.cfg (100%) rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/bodhi.cfg (100%) rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/fas.cfg (100%) rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/fedorahosted.org.cfg (100%) rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/fp-wiki.cfg (100%) rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/freemedia.cfg (100%) rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/ipa.cfg (100%) rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/mgmt-http.cfg (100%) rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/mgmt-https.cfg (100%) rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/mirrorlist.cfg (100%) create mode 100644 roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg rename roles/nagios_server/{files/nagios/servicegroups => templates/nagios}/servicegroups/ppc-secondary.cfg (58%) create mode 100644 roles/nagios_server/templates/nagios/servicegroups/retrace.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/pkgdb.cfg b/roles/nagios_server/files/nagios/servicegroups/servicegroups/pkgdb.cfg deleted file mode 100644 index 566078c695..0000000000 --- a/roles/nagios_server/files/nagios/servicegroups/servicegroups/pkgdb.cfg +++ /dev/null @@ -1,6 +0,0 @@ -define servicegroup { - servicegroup_name pkgdb - alias Package Database - members proxy01,pkgdb-external,proxy02,pkgdb-external,proxy03,pkgdb-external,proxy04,pkgdb-external,proxy08,pkgdb-external,proxy09,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,proxy11,pkgdb-external,proxy12,pkgdb-external -} - diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/retrace.cfg b/roles/nagios_server/files/nagios/servicegroups/servicegroups/retrace.cfg deleted file mode 100644 index dc30917ca4..0000000000 --- a/roles/nagios_server/files/nagios/servicegroups/servicegroups/retrace.cfg +++ /dev/null @@ -1,5 +0,0 @@ -define servicegroup { - servicegroup_name retrace - alias Retrace Hosts - members retrace01.qa,Disk space /,retrace01.qa,Total Processes,retrace01.qa,Check Raid,retrace01.qa,Swap,retrace01.qa,SSH -} diff --git a/roles/nagios_server/templates/nagios/hosts/phx2-mgmt-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/phx2-mgmt-hosts.cfg.j2 index 3f02db4643..3abbe021d6 100644 --- a/roles/nagios_server/templates/nagios/hosts/phx2-mgmt-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/phx2-mgmt-hosts.cfg.j2 @@ -4,7 +4,7 @@ define host { alias {{ host }} use mincheck address {{ host }} - parents fwsm01-gw + parents phx2-gw } {% endfor %} diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/autoqa.cfg b/roles/nagios_server/templates/nagios/servicegroups/autoqa.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/autoqa.cfg rename to roles/nagios_server/templates/nagios/servicegroups/autoqa.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/bodhi.cfg b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/bodhi.cfg rename to roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/fas.cfg b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/fas.cfg rename to roles/nagios_server/templates/nagios/servicegroups/fas.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/fedorahosted.org.cfg b/roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/fedorahosted.org.cfg rename to roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/fp-wiki.cfg b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/fp-wiki.cfg rename to roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/freemedia.cfg b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/freemedia.cfg rename to roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/ipa.cfg b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/ipa.cfg rename to roles/nagios_server/templates/nagios/servicegroups/ipa.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/mgmt-http.cfg b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/mgmt-http.cfg rename to roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/mgmt-https.cfg b/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/mgmt-https.cfg rename to roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/mirrorlist.cfg b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/mirrorlist.cfg rename to roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg diff --git a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg new file mode 100644 index 0000000000..83fea06f62 --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg @@ -0,0 +1,6 @@ +define servicegroup { + servicegroup_name pkgdb + alias Package Database + members +} + diff --git a/roles/nagios_server/files/nagios/servicegroups/servicegroups/ppc-secondary.cfg b/roles/nagios_server/templates/nagios/servicegroups/ppc-secondary.cfg similarity index 58% rename from roles/nagios_server/files/nagios/servicegroups/servicegroups/ppc-secondary.cfg rename to roles/nagios_server/templates/nagios/servicegroups/ppc-secondary.cfg index ab33bf3f3c..40afa49724 100644 --- a/roles/nagios_server/files/nagios/servicegroups/servicegroups/ppc-secondary.cfg +++ b/roles/nagios_server/templates/nagios/servicegroups/ppc-secondary.cfg @@ -1,5 +1,5 @@ define servicegroup { servicegroup_name ppc-secondary alias PPC Secondary Hosts - members ppc-hub,ppc-koji-frontend + members ppc-koji01.ppc.fedoraproject.org,ppc-koji-frontend } diff --git a/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg b/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg new file mode 100644 index 0000000000..18f377b047 --- /dev/null +++ b/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg @@ -0,0 +1,5 @@ +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 +}