From 2c3e243d756bb5c53d9c3ad512bc0d6747c79b79 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 30 Sep 2017 00:09:19 +0000 Subject: [PATCH] update status in nagios --- .../nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 | 2 +- roles/nagios_server/templates/nagios/hosts/other.cfg.j2 | 6 +++--- .../nagios_server/templates/nagios/services/websites.cfg.j2 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 index 0754b0b1b9..8aeaf9a75f 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 @@ -1,6 +1,6 @@ define hostgroup { hostgroup_name nomail alias No Mail - members *, !status-fedora2, !registry-cdn, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !proxy05.fedoraproject.org, !mirrorlist-host1plus.fedoraproject.org, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !fas3-01.stg.phx2.fedoraproject.org, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} + members *, !status, !registry-cdn, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !proxy05.fedoraproject.org, !mirrorlist-host1plus.fedoraproject.org, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !fas3-01.stg.phx2.fedoraproject.org, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/hosts/other.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/other.cfg.j2 index dc10ffdce8..351c40a120 100644 --- a/roles/nagios_server/templates/nagios/hosts/other.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/other.cfg.j2 @@ -1,8 +1,8 @@ define host { - host_name status-fedora2 - alias status-fedora2.rhcloud.com + host_name status + alias status.fedoraproject.org use mincheck - address status-fedora2.rhcloud.com + address d6tcqd4og8l21.cloudfront.net {% if vars['nagios_location'] == 'internal' %} parents phx2-gw {% else %} diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index 811bfc9dd1..cc79b72234 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -86,9 +86,9 @@ define service { ## Individual hosts define service { - host_name status-fedora2 + host_name status service_description http-status.fedoraproject.org - check_command check_website!status-fedora2.rhcloud.com!/index.html!All systems go + check_command check_website!d6tcqd4og8l21.cloudfront.net!/index.html!All systems go use websitetemplate }