From 8988a19fb5552e58382bfcc2f74916c5ae212da9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 23 Jan 2015 20:51:55 +0000 Subject: [PATCH] Adjust nagios for koji01/02 replacing koji03/04 --- .../files/value01.phx2.fedoraproject.org-hosts | 2 +- roles/nagios_server/files/nagios/hosts/koji01.cfg | 7 +++++++ roles/nagios_server/files/nagios/hosts/koji02.cfg | 7 +++++++ roles/nagios_server/files/nagios/hosts/koji03.cfg | 14 +++++++------- roles/nagios_server/files/nagios/hosts/koji04.cfg | 14 +++++++------- roles/nagios_server/files/nagios/services/koji.cfg | 2 +- .../files/nagios/services/locking.cfg | 2 +- roles/nagios_server/files/nagios/services/ssl.cfg | 2 +- .../files/nagios/services/websites.cfg | 2 +- 9 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 roles/nagios_server/files/nagios/hosts/koji01.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/koji02.cfg diff --git a/roles/hosts/files/value01.phx2.fedoraproject.org-hosts b/roles/hosts/files/value01.phx2.fedoraproject.org-hosts index 1b3eaec0b3..8e70496c3f 100644 --- a/roles/hosts/files/value01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/value01.phx2.fedoraproject.org-hosts @@ -3,4 +3,4 @@ 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.23 puppet.fedoraproject.org puppet infrastructure.fedoraproject.org 10.5.126.52 admin.fedoraproject.org -10.5.125.59 koji.fedoraproject.org koji03 koji03.phx2.fedoraproject.org +10.5.125.63 koji.fedoraproject.org diff --git a/roles/nagios_server/files/nagios/hosts/koji01.cfg b/roles/nagios_server/files/nagios/hosts/koji01.cfg new file mode 100644 index 0000000000..07cb20a75b --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/koji01.cfg @@ -0,0 +1,7 @@ +define host { + host_name koji01 + alias koji01.phx2.fedoraproject.org + use defaulttemplate + address koji01.phx2.fedoraproject.org + parents bvirthost08 +} diff --git a/roles/nagios_server/files/nagios/hosts/koji02.cfg b/roles/nagios_server/files/nagios/hosts/koji02.cfg new file mode 100644 index 0000000000..c767513320 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/koji02.cfg @@ -0,0 +1,7 @@ +define host { + host_name koji02 + alias koji02.phx2.fedoraproject.org + use defaulttemplate + address koji02.phx2.fedoraproject.org + parents bvirthost10 +} diff --git a/roles/nagios_server/files/nagios/hosts/koji03.cfg b/roles/nagios_server/files/nagios/hosts/koji03.cfg index 295b3c6d7b..ac3b2a3d48 100644 --- a/roles/nagios_server/files/nagios/hosts/koji03.cfg +++ b/roles/nagios_server/files/nagios/hosts/koji03.cfg @@ -1,7 +1,7 @@ -define host { - host_name koji03 - alias koji03.phx2.fedoraproject.org - use defaulttemplate - address koji03.phx2.fedoraproject.org - parents bvirthost11 -} +#define host { +# host_name koji03 +# alias koji03.phx2.fedoraproject.org +# use defaulttemplate +# address koji03.phx2.fedoraproject.org +# parents bvirthost11 +#} diff --git a/roles/nagios_server/files/nagios/hosts/koji04.cfg b/roles/nagios_server/files/nagios/hosts/koji04.cfg index 8f999fee03..00b3d987af 100644 --- a/roles/nagios_server/files/nagios/hosts/koji04.cfg +++ b/roles/nagios_server/files/nagios/hosts/koji04.cfg @@ -1,7 +1,7 @@ -define host { - host_name koji04 - alias koji04.phx2.fedoraproject.org - use defaulttemplate - address koji04.phx2.fedoraproject.org - parents bvirthost07 -} +#define host { +# host_name koji04 +# alias koji04.phx2.fedoraproject.org +# use defaulttemplate +# address koji04.phx2.fedoraproject.org +# parents bvirthost07 +#} diff --git a/roles/nagios_server/files/nagios/services/koji.cfg b/roles/nagios_server/files/nagios/services/koji.cfg index 0561cf1503..618f44a724 100644 --- a/roles/nagios_server/files/nagios/services/koji.cfg +++ b/roles/nagios_server/files/nagios/services/koji.cfg @@ -1,5 +1,5 @@ define service { - host_name koji03 + host_name koji01 service_description Check Koji check_command check_koji max_check_attempts 5 diff --git a/roles/nagios_server/files/nagios/services/locking.cfg b/roles/nagios_server/files/nagios/services/locking.cfg index bc5a604cc5..4f05012fbb 100644 --- a/roles/nagios_server/files/nagios/services/locking.cfg +++ b/roles/nagios_server/files/nagios/services/locking.cfg @@ -1,5 +1,5 @@ define service { - host_name rawhide-composer, koji03 + host_name rawhide-composer, koji01 service_description Check NFS File Locks check_command check_by_nrpe!check_lock use criticaltemplate diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg index a51d4378de..5af8779afd 100644 --- a/roles/nagios_server/files/nagios/services/ssl.cfg +++ b/roles/nagios_server/files/nagios/services/ssl.cfg @@ -20,7 +20,7 @@ define service { } define service { - host_name koji03 + host_name koji01 service_description Koji SSL Cert check_command check_ssl_cert!koji.fedoraproject.org!60 use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg index 5c2160a59e..dbe0cf406c 100644 --- a/roles/nagios_server/files/nagios/services/websites.cfg +++ b/roles/nagios_server/files/nagios/services/websites.cfg @@ -155,7 +155,7 @@ define service { } define service { - host_name koji03 + host_name koji01 service_description koji check_command check_website!koji.fedoraproject.org!/koji/hosts!arm04-builder use websitetemplate