From 2209cb5efa21dc173920b3af47a03444d3a6be1b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 31 May 2016 16:48:17 +0000 Subject: [PATCH] drop bodhost01 and proxy07 --- inventory/inventory | 2 - playbooks/groups/virthost.yml | 2 +- roles/base/files/syncHttpLogs.sh | 1 - roles/batcave/files/ssh_known_hosts | 2 - roles/collectd/server/files/ping.conf | 1 - .../epylog/files/merged/modules.d/rsyncd.conf | 2 +- .../proxy/templates/00-namevirtualhost.conf | 4 -- .../templates/LocalSettings.php.fp.j2 | 6 --- .../templates/LocalSettings.php.fp.j2 | 6 --- .../hosts/admin.fedoraproject.org.cfg | 44 +++++++++---------- .../files/nagios/hostgroups/euservers.cfg | 10 ++--- .../files/nagios/hostgroups/kvmHosts.cfg | 2 +- .../server/files/nagios/hostgroups/nomail.cfg | 2 +- .../files/nagios/hostgroups/proxies.cfg | 2 +- .../files/nagios/hostgroups/servers.cfg | 2 +- .../files/nagios/hostgroups/vpnclients.cfg | 2 +- .../server/files/nagios/hostgroups/web.cfg | 2 +- .../server/files/nagios/hosts/bodhost01.cfg | 14 +++--- .../server/files/nagios/hosts/proxy07.cfg | 14 +++--- .../server/files/nagios/servicedeps/nrpe.cfg | 16 +++---- .../files/nagios/servicegroups/bodhi.cfg | 2 +- .../files/nagios/servicegroups/fp-wiki.cfg | 2 +- .../files/nagios/servicegroups/mirrorlist.cfg | 2 +- .../server/files/nagios/services/fedmsg.cfg | 8 ++-- .../server/files/nagios/services/nrpe.cfg | 2 +- .../server/files/nagios/services/ssl.cfg | 6 +-- .../server/files/nagios/services/websites.cfg | 18 ++++---- 27 files changed, 77 insertions(+), 99 deletions(-) diff --git a/inventory/inventory b/inventory/inventory index 6e2e103475..80aaf3e6bc 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -126,7 +126,6 @@ bvirthost10.phx2.fedoraproject.org bvirthost11.phx2.fedoraproject.org [colo-virt] -bodhost01.fedoraproject.org coloamer01.fedoraproject.org dedicatedsolutions01.fedoraproject.org host1plus01.fedoraproject.org @@ -547,7 +546,6 @@ proxy03.fedoraproject.org proxy04.fedoraproject.org proxy05.fedoraproject.org proxy06.fedoraproject.org -proxy07.fedoraproject.org proxy08.fedoraproject.org proxy09.fedoraproject.org proxy10.phx2.fedoraproject.org diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 14f1ee5822..d54665da82 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -3,7 +3,7 @@ # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars - name: make virthost server system - hosts: virthost:bvirthost:buildvmhost:virthost-comm:colo-virt:!internetx01.fedoraproject.org:!bodhost01.fedoraproject.org + hosts: virthost:bvirthost:buildvmhost:virthost-comm:colo-virt:!internetx01.fedoraproject.org user: root gather_facts: True diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 0d04cc1850..ce97ae1380 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -34,7 +34,6 @@ syncHttpLogs proxy03.vpn.fedoraproject.org syncHttpLogs proxy04.vpn.fedoraproject.org syncHttpLogs proxy05.vpn.fedoraproject.org syncHttpLogs proxy06.vpn.fedoraproject.org -syncHttpLogs proxy07.vpn.fedoraproject.org syncHttpLogs proxy08.vpn.fedoraproject.org syncHttpLogs proxy10.phx2.fedoraproject.org syncHttpLogs proxy11.vpn.fedoraproject.org diff --git a/roles/batcave/files/ssh_known_hosts b/roles/batcave/files/ssh_known_hosts index 2897506baf..28f89f1e87 100644 --- a/roles/batcave/files/ssh_known_hosts +++ b/roles/batcave/files/ssh_known_hosts @@ -123,7 +123,6 @@ bodhi-backend02.phx2.fedoraproject.org,bodhi-backend02,10.5.125.136 ssh-rsa AAAA bodhi01.stg.phx2.fedoraproject.org,bodhi01.stg,10.5.126.166 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRa32PkvwG5xQuL+f8DTzL4ih2EeIX1vA00qi9ViG7/B6r50Q6Xkj7tyzyyL9yPtfblc2Vthtpi8h9m9SScJEv+RDKS6XWmLHiyKzxacBDlz8Jp6/9SEsa9rZuYzxSO9iDFWgWRSUS/dqN/prscYgJujFAz5jjSeOkUDl8+g/7BWxJ+QFmqScDeG3KDswIUVKX4Ecjq6G2pDa62g8dK+LJBQc4q3UMzdu4FfiC0KX2adJlwajmo/XH9mYgsCDA0KtnsznvjG2fEYKD3BKk5CMWoZR8o0L/gP2IJiZH3Yq5F88XUpSkk+8HlvJMgK/VJuYSmJ57xNp7YhvhMNmQrD8T bodhi01.stg.phx2.fedoraproject.org bodhi03.phx2.fedoraproject.org,bodhi03,10.5.126.115,192.168.1.145 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+DySQhz3HikOKbkr8j80xGUmixPaecRfnBBGIQ0K/XqWN9DSMNtPcWm3SkYnzdSbhqUL+QYeNrHVLD0uav2koSsb+9GTO9QLuXNoICYKpH2cfh9kcp+XEjJ7TBqCSBQwSOjdL35+D8VdPXhM0ysJDM0jz2fXmZ6uXtbznMUqW4HAY3jjbyeQbLdinI62YFiW4LInsR9MS7vb7tr8hPa1I/lzujmHfjUu16biORHQSKbcyYCawL9tEt4pNaGR4uQPMitZ6I9/70RC2pmP2KnRsvBMJeWnqVFw6iS+MCrrcuyqQ32NtsqmRL5TDTuFFOs3oxS+pOCe8OFNPOUviMLf/ bodhi03.phx2.fedoraproject.org bodhi04.phx2.fedoraproject.org,bodhi04,10.5.126.116,192.168.1.146 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJlgOQYw4JArE1z5MnRqUwG50CeOXnj2oZh8+zHHVRa8zIeM5fBpxtc3/Kc/nhEelQId56gBQBkJFhuOp+EfIPeR3xsapW1xuJ9t8OhScrYIVbUz7dbJBMcBE3eZORucib4H8TqIiWrcGovi9p5YILXugC72MUIJ3EyOFKJ6VH7u1VWG2xsHXqtm17q8QxyTywMJEkj5vDKBvGyAyxRWF74Ps7ZOs80oGZ/rGqPMVFkXuSeZXmZ1Kj4qewzZnEULh26k19MMC9iWBftAuz9V31T22A4wjXYBxuLt7XW3N5wjkpx4santfpN/wJakry513Wg3qg7gg4B7p7VZs95A0N bodhi04.phx2.fedoraproject.org -bodhost01.fedoraproject.org,94-76-206-175.static.as29550.net,bodhost01,94.76.206.175,192.168.1.48 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAv326D+ivFD2PRTuvYs3yQgf1YmsXky0IKb1nPyKu3TfShbZhCsc1zRzSY8f7HjYBgsq++N2kUxBQoS59gQOR+M6pWLRr7tmbU7Xn8bw9qteu25IAl6A9AO8z3RmK2hSzeyEXaQoZSpD9N2buIWn34BDIcG275rZFC4a3e4tGfIq3JTYAkbrphjOBTP6xXYusAzmr/OZQrqHagdxEWRG5YnijKAR2pN8tmo9Qfp9lncNtM3eZbaKb85xjfAoYw1HQ+iTcFJzDU0hzLO8DPsGlAnnU6AT5ufBaPAlX0g1iqzni8EqVkVwCM+S/4cA4dZ1jT7wXZViIBGr6y/+FdCnu6Q== bodhost01.fedoraproject.org branched-composer.phx2.fedoraproject.org,branched-composer,10.5.125.66 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfp7/KrbMxnQms7gOjWJcJKPRBotPhMfY/M2KGm67lK/DPLHSjZsIOpy/rKkXolRbh+Mw8f7ws2kxQP6Sq0+QVCNLpl2/f16o0cWf0ChzZ3ji6L/7doSJ2YwqOXcNPVj0oTGKzSBJfS3dGgVH9ShhhF5+VvDqvTolzI08OyeuDDW4Twd0nlyBtXR4mD7LPWY2flrph1MmETmQgN6oy43fYAVpbOZVGlXdrs70Yn4kw+2rFYRaCKRssKArf8fH8FiU6n6sb7BKq3Jfiea5QbeNZ6r9KTqX1W1iDpQaMg4Qw8wlKTqMXHYYbA/W9Wh/HpEaNlyAjxvsQxSsYLe8InogT branched-composer.phx2.fedoraproject.org bugyou01.phx2.fedoraproject.org,bugyou01,10.5.126.129 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCSRcGaAdPxO03JeKQUCrTE+k/8oB98DvriC+wWra8StUY2IPItaIA66Czpf1WvA4lQgKxZM8CLziDYHDjYcVBZJGY0B8bn2gHqaaD4GfjilwRRvbZnuOQUF99GeiD1Q+ztXxz6x++YtLAh3ke2c0qBbQ00SY7BX2gKpMGpJ4+P3Jegs74byWsqdibDLCOG2vi1tROqBlejpLC841PgbtrWaKsxdU+ni7cpleqASHXheysEioAY2LS9ThsEp1vfOj8mieKGLsIzCVQjO3deyzfYNiHAgPBQVX9H42Yrkqjo06nZOzz96eM+Btx442LkesBuwWn2xqqvH7BRKUkM4IyF bugyou01.phx2.fedoraproject.org bugyou01.stg.phx2.fedoraproject.org,bugyou01.stg,10.5.126.130 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxT+X37tIutjsmWgBD1c+Rx6Mw9s/SMzwoHxVA1om2Wmq1ZwKbI33C/zKmxbJKwXXtE4kr1VNVZIlx8AB5/H2dpI1ilRVLceyvF93hGenBqIPeon+vEvMr7BpghDnjZSQKoyy+mSTXPwsG8JTMG7TtrO9xa8Bg/+mvAYFkjYL198QzLrSCmFuBMeOS0PDGGYTC3ReghoJ6ENeszKVc/Trh6HAkHTudavAz4qfSJ1daNHxonip2l/6dXRmnTGzafKSQofDqARvnx+al81bdiv/dczvBlH21hf4m/PkS/dgibLeWRCwNBYHIUGsnaXP4taoQVVmk7gaanimO8ZdrSvAp bugyou01.stg.phx2.fedoraproject.org @@ -421,7 +420,6 @@ proxy03.fedoraproject.org,proxy3.fedoraproject.org,proxy03,66.35.62.162,192.168. proxy04.fedoraproject.org,proxy04,152.19.134.142,2610:28:3090:3001:dead:beef:cafe:fed3,192.168.1.14 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5soInggcShEnNSdHx5cwOixqABpdfr1KaDRYGBWbL1RuCAzemPzBsYCQ1m3crJlscyAWrMlfIG2iUuJqJ6RwAx12swRR9k8hlNT1NVghmF9Q/kx4D/dw2NnIbUxqsPhByXwpS0X8OYLgt8kKJw+J2CFxYLGYPvL4aNrzEF/HuUrcIMnHHbrv/InW0uIi+FRC5gWA4gKQat4sh2rC7WgulRNCdfm4QAttuWm9TlcYt8PHkoU1Lpb+vOJXvZoq7SL/BgaGG3qmOhxCBDEd+2J3x4ik3wXslqxxuQ7q7zbgo0552lrvWs3UqDHoO6+a5a5/JQ7Pj5oNxD3aJZYHka2oj proxy04.fedoraproject.org proxy05.fedoraproject.org,proxy05,5.175.150.50,2a00:d1a0:1::131,192.168.1.25 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWTuchhQcbl+ymTOTs+ZWluvLOtSzEy3zOJ8yl4bBPU6TLAT/vJpqZfdLwdyxDES6c46TlbjzJFRLTBH6lon1OS+/FTHw9GkPZGprwaGBTYslmn8O0qPOSCbPvjlIcbkUvIQtDgzbW2FWotL2F+AxiDFUW//wAdtu21TvQoW16m86tcaGSLcan+3xHU/rBXyfHwcT79iyyTY7Qmiww9xAlDz2PtHD/jWhMtz6+Xxk6z1gTSVYa1IhAzQ9MOcCz37LjRevVnaeEYQ5YO44GUoKFke5v7vePoQe/yEQ/5bacUhZUzh2FabgfJh6Bfpa1QPwoWiHqDOEFjVV7Tf3WoAZD proxy05.fedoraproject.org proxy06.fedoraproject.org,proxy06,140.211.169.196,192.168.1.63 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZZMBUDcmWIrmZEPTnu/KhPNtGB3tBvgNWtJoVGP0GlvQ9dCfvsje1H0cOu/dC7ifdciFqgxTq4xFWWR30sjG/24YalJCVMVDYJh7Q5trcwtElgfI+zxX6iAlN+uD5xGUA8a75cadzvQ0+PQdZ1bvDt8svMl16Kz2iTvVN5LTpfas06/IipwwswoV4pR7zSYRR9cpRAwuHzkD59oTU2pC9geIXQpK46Pjb4ypV1aUhEe5PUU4Xg3urxyA4UQ7V72iVSgK45Ov3j6qvJGhnjcSX0zeGonCxwS22Bolg6pZkruZK/3MNrbiDybik9v8Wfgml86BIkg3As48+zimJvNB7 proxy06.fedoraproject.org -proxy07.fedoraproject.org,proxy07,213.175.193.206,192.168.1.52 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZTSthvKg2WQpB8ynmqD7uJT7AeJcm6uZo/qO+WuOO5U8lef9Y9at6ZGgtoJNONXfhD96+DiGTfeXDL+FJmTg8k/U+ZNTMa7lrd+XMDfDvnDULMnew6DdVIEJqqjSrGrtKFd8vKXbeeY8/sDMVVo3jSHfWDsZFJc6SJK69ix+EsCmOIUuJrleb+f7PP451beEBjZdn7Gc/7THzmT0MqCST+wr1RvJk5R5f6tSzZ6tHh28Nl3O+ZVcBlxiwd66yaEigqtVsNr4uTO1jnyZH+ibGdWBSccn1C6lJCF6F7Tl8h064+z+7vsCT+Q1y5TqUDxm4IMFQqgt2Gum29AHBgYHN proxy07.fedoraproject.org proxy08.fedoraproject.org,proxy08,67.203.2.67,2607:f188::dead:beef:cafe:fed1,192.168.1.78 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHwGmc8ntnCU1lnvoOfpSaQrkJGJJmgYKIVjIqH+om8b6M/6HQWvWekepVSjereTF0AxmwNms+p6IhHtug5vgyfcOLZfbZIjJJKtFfMRq/Iex4Ukpw6dHP+fiL5tMeKLsonGdkWG0Xo21iZG2VuspS/j8we84cPOxMOBOsj8Tf+NBl4+s14MHS6z4HENfn0ciUhKSubMYuL1XX5xBHlPx10D16eyRfCoYHk9vJWt/rKDKcX9biBNUsT7MmN7zLZtBO2tP0ifUitEa73Q7RmxZjhWbudXKhkyRs11xgC7R+2UNRXMCTj9LsVzb2tfDnVqL9jerP+0e+mDuEhSCRCl6F proxy08.fedoraproject.org proxy09.fedoraproject.org,proxy09,140.211.169.206,192.168.1.15 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbDEcewscQA5Qf8IV5GhEikNBbJlVrLFWoXfOVHAglmdGxRUTmlIBGGCayFrHYVajFcgO2EVkiClUkD182IU1Mp3zxBDuGVsqAV0480knWyw6hdN5yioAPSerugpivKbHRanxAPISExfTfXunrCvdbvGnkof2YRIqIeW77szWj2H/t33SMzORkijMBRqk/pFm+PHFMBLDt+3bXOY4Y2YhHnEEAzmXallo1CMNAardBPIc/V1KLoUDT/gSRSClSyTMZASFX8wYFABEE8/WpIuBAR0MmfPu+vcjR9fov879IqmKRzCdNpfSWArYQsKYtX230OPg8IAdJCh+m+dF9gcQD proxy09.fedoraproject.org proxy10.phx2.fedoraproject.org,proxy10,10.5.126.51,192.168.1.17 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbKgNqzHryE0slwToFju9OMmIM2UsXh7/WKqYRbyf5OpvMHqrAPLg4JI9ULc61pbcyNlm17ToQvq8fkeTwWZfj4yI+kbnPQg/sJXv7tmWRrH5ZpvZFv4QvheAt5MCLsw5T6dnfFcVW2oH5LrecHCBAKuyAJmfOoMJZTtMEazgKOr2p8Tx91Y6JNix62Wsxpj6SeqcBoURgqqtIbaMnT+hOEcjPsQ2YqZkMNxO2Gq+p80wfefA38uCj1Uord7J3wu1jvTq5IeAsL4at9EiNxncLJI/9h8daSVdXBFO5qoXSifi0WQUBXCsEm4FvjUe4sKK2PBTHlPdHJfMib8P7O5M/ proxy10.phx2.fedoraproject.org diff --git a/roles/collectd/server/files/ping.conf b/roles/collectd/server/files/ping.conf index 3340544fa2..30503b3466 100644 --- a/roles/collectd/server/files/ping.conf +++ b/roles/collectd/server/files/ping.conf @@ -7,6 +7,5 @@ LoadPlugin ping Host "ibiblio04.fedoraproject.org" Host "osuosl03.fedoraproject.org" Host "internetx01.fedoraproject.org" - Host "bodhost01.fedoraproject.org" Host "coloamer01.fedoraproject.org" diff --git a/roles/epylog/files/merged/modules.d/rsyncd.conf b/roles/epylog/files/merged/modules.d/rsyncd.conf index 6ed5fe0b95..5fb159d428 100644 --- a/roles/epylog/files/merged/modules.d/rsyncd.conf +++ b/roles/epylog/files/merged/modules.d/rsyncd.conf @@ -12,5 +12,5 @@ priority = 7 # Report this many "top ranking hosts" # report_top = 10 -ignore_hosts = log01.vpn.fedoraproject.org log01.phx2.fedoraproject.org proxy01.phx2.fedoraproject.org proxy02.vpn.fedoraproject.org proxy03.vpn.fedoraproject.org proxy04.vpn.fedoraproject.org proxy05.vpn.fedoraproject.org proxy06.vpn.fedoraproject.org proxy07.vpn.fedoraproject.org proxy08.vpn.fedoraproject.org proxy10.phx2.fedoraproject.org proxy11.phx2.fedoraproject.org collab04.fedoraproject.org hosted04.fedoraproject.org admin.fedoraproject.org proxy01.stg.phx2.fedoraproject.org +ignore_hosts = log01.vpn.fedoraproject.org log01.phx2.fedoraproject.org proxy01.phx2.fedoraproject.org proxy02.vpn.fedoraproject.org proxy03.vpn.fedoraproject.org proxy04.vpn.fedoraproject.org proxy05.vpn.fedoraproject.org proxy06.vpn.fedoraproject.org proxy08.vpn.fedoraproject.org proxy10.phx2.fedoraproject.org proxy11.phx2.fedoraproject.org collab04.fedoraproject.org hosted04.fedoraproject.org admin.fedoraproject.org proxy01.stg.phx2.fedoraproject.org diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index 551332f968..7665f6d374 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -32,10 +32,6 @@ NameVirtualHost [2a00:d1a0:1::131]:443 NameVirtualHost 140.211.169.196:80 NameVirtualHost 140.211.169.196:443 -#proxy07 -NameVirtualHost 213.175.193.206:80 -NameVirtualHost 213.175.193.206:443 - #proxy08 NameVirtualHost 67.203.2.67:80 NameVirtualHost 67.203.2.67:443 diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 3362115363..fec82996cc 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -381,10 +381,6 @@ $wgSquidServersNoPurge = array( "140.211.169.196", "192.168.1.63", - # proxy07 - "213.175.193.206", - "192.168.1.52", - # proxy08 "67.203.2.67", "2607:f188::dead:beef:cafe:fed1", @@ -427,8 +423,6 @@ $wgSquidServers = array( "192.168.1.25:6081", # proxy06 "192.168.1.63:6081", - # proxy07 - "192.168.1.52:6081", # proxy08 "192.168.1.78:6081", # proxy10 diff --git a/roles/mediawiki123/templates/LocalSettings.php.fp.j2 b/roles/mediawiki123/templates/LocalSettings.php.fp.j2 index 00de51e66a..6acb3c7e57 100644 --- a/roles/mediawiki123/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki123/templates/LocalSettings.php.fp.j2 @@ -357,10 +357,6 @@ $wgSquidServersNoPurge = array( "140.211.169.196", "192.168.1.63", - # proxy07 - "213.175.193.206", - "192.168.1.52", - # proxy08 "67.203.2.67", "2607:f188::dead:beef:cafe:fed1", @@ -403,8 +399,6 @@ $wgSquidServers = array( "192.168.1.25:6081", # proxy06 "192.168.1.63:6081", - # proxy07 - "192.168.1.52:6081", # proxy08 "192.168.1.78:6081", # proxy10 diff --git a/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg b/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg index 6c35adcc89..57d6759f27 100644 --- a/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg +++ b/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg @@ -205,28 +205,28 @@ define host { # bodhost # -define host { - host_name 213.175.193.206-bodhost - alias 213.175.193.206-bodhost - use defaulttemplate - address 213.175.193.206 - parents proxy07.fedoraproject.org -} - -define host { - host_name proxy07.fedoraproject.org - alias proxy07.fedoraproject.org - use defaulttemplate - address 213.175.193.206 - parents bodhost01.fedoraproject.org -} - -define host { - host_name bodhost01.fedoraproject.org - alias bodhost01.fedoraproject.org - use defaulttemplate - address 94.76.206.175 -} +#define host { +# host_name 213.175.193.206-bodhost +# alias 213.175.193.206-bodhost +# use defaulttemplate +# address 213.175.193.206 +# parents proxy07.fedoraproject.org +#} +# +#define host { +# host_name proxy07.fedoraproject.org +# alias proxy07.fedoraproject.org +# use defaulttemplate +# address 213.175.193.206 +# parents bodhost01.fedoraproject.org +#} +# +#define host { +# host_name bodhost01.fedoraproject.org +# alias bodhost01.fedoraproject.org +# use defaulttemplate +# address 94.76.206.175 +#} # # coloamer diff --git a/roles/nagios/server/files/nagios/hostgroups/euservers.cfg b/roles/nagios/server/files/nagios/hostgroups/euservers.cfg index 8aa6eb592b..f6944aa529 100644 --- a/roles/nagios/server/files/nagios/hostgroups/euservers.cfg +++ b/roles/nagios/server/files/nagios/hostgroups/euservers.cfg @@ -3,8 +3,8 @@ # 'good' RTT figures adjusted for US->EU ############### -define hostgroup { - hostgroup_name euservers - alias European Servers - members bodhost01 -} +#define hostgroup { +# hostgroup_name euservers +# alias European Servers +# members bodhost01 +#} diff --git a/roles/nagios/server/files/nagios/hostgroups/kvmHosts.cfg b/roles/nagios/server/files/nagios/hostgroups/kvmHosts.cfg index b8a40f9aa6..6b4015b9cb 100644 --- a/roles/nagios/server/files/nagios/hostgroups/kvmHosts.cfg +++ b/roles/nagios/server/files/nagios/hostgroups/kvmHosts.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name kvmServers alias kvmServers - members bvirthost06, bvirthost01, bvirthost08, bvirthost09, bvirthost10, bvirthost11, virthost01, virthost02, virthost11, virthost03, virthost12, virthost14, virthost15, virthost16, virthost17, virthost18, virthost-comm02, virthost-comm03, virthost-comm04, tummy01, bodhost01, osuosl01, osuosl02, osuosl03, ibiblio02, ibiblio03, ibiblio04, ibiblio05, coloamer01, internetx01, qa09.qa, qa10.qa, qa11.qa, qa12.qa, qa13.qa, qa14.qa, host1plus01, dedicatedsolutions01 + members bvirthost06, bvirthost01, bvirthost08, bvirthost09, bvirthost10, bvirthost11, virthost01, virthost02, virthost11, virthost03, virthost12, virthost14, virthost15, virthost16, virthost17, virthost18, virthost-comm02, virthost-comm03, virthost-comm04, tummy01, osuosl01, osuosl02, osuosl03, ibiblio02, ibiblio03, ibiblio04, ibiblio05, coloamer01, internetx01, qa09.qa, qa10.qa, qa11.qa, qa12.qa, qa13.qa, qa14.qa, host1plus01, dedicatedsolutions01 } diff --git a/roles/nagios/server/files/nagios/hostgroups/nomail.cfg b/roles/nagios/server/files/nagios/hostgroups/nomail.cfg index 3bb22c5496..1061dd1ee1 100644 --- a/roles/nagios/server/files/nagios/hostgroups/nomail.cfg +++ b/roles/nagios/server/files/nagios/hostgroups/nomail.cfg @@ -1,5 +1,5 @@ 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, !proxy07, !proxy07, !proxy08, !proxy08, !proxy09, !proxy10, !proxy11, !proxy12, !bc02.mgmt.fedoraproject.org, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bc02.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,!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-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !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-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 + 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, !bc02.mgmt.fedoraproject.org, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bc02.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,!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-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !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-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/files/nagios/hostgroups/proxies.cfg b/roles/nagios/server/files/nagios/hostgroups/proxies.cfg index a544a7e1d6..b262547994 100644 --- a/roles/nagios/server/files/nagios/hostgroups/proxies.cfg +++ b/roles/nagios/server/files/nagios/hostgroups/proxies.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name proxies alias proxies - members proxy01, proxy02, proxy03, proxy04, proxy05, proxy06, proxy07, proxy08, proxy09, proxy10, proxy11, proxy12 + members proxy01, proxy02, proxy03, proxy04, proxy05, proxy06, proxy08, proxy09, proxy10, proxy11, proxy12 } diff --git a/roles/nagios/server/files/nagios/hostgroups/servers.cfg b/roles/nagios/server/files/nagios/hostgroups/servers.cfg index 99e63c469d..809530f3b0 100644 --- a/roles/nagios/server/files/nagios/hostgroups/servers.cfg +++ b/roles/nagios/server/files/nagios/hostgroups/servers.cfg @@ -5,6 +5,6 @@ define hostgroup { hostgroup_name servers alias All Servers - members *, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy07, !proxy07, !proxy08, !proxy08, !proxy12, !proxy12, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bc02.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,!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-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !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-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 + members *, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy12, !proxy12, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bc02.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,!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-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !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-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/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg index 779b13ff3e..883d86074e 100644 --- a/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg +++ b/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name vpnclients alias vpnclients - members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,osuosl02,proxy09,download-ib01,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people02,internetx01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 + members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,coloamer01,proxy08,osuosl02,proxy09,download-ib01,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people02,internetx01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 } diff --git a/roles/nagios/server/files/nagios/hostgroups/web.cfg b/roles/nagios/server/files/nagios/hostgroups/web.cfg index 6e0647e1b7..2312b04ac6 100644 --- a/roles/nagios/server/files/nagios/hostgroups/web.cfg +++ b/roles/nagios/server/files/nagios/hostgroups/web.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name webservers alias webservers - members proxy01, proxy02, proxy03, proxy04, proxy05, proxy06, proxy07, proxy08, proxy09, proxy10, proxy11, proxy12, fas01, fas02, fas03, status-fedora2, ipsilon01, ipsilon02, + members proxy01, proxy02, proxy03, proxy04, proxy05, proxy06, proxy08, proxy09, proxy10, proxy11, proxy12, fas01, fas02, fas03, status-fedora2, ipsilon01, ipsilon02, } diff --git a/roles/nagios/server/files/nagios/hosts/bodhost01.cfg b/roles/nagios/server/files/nagios/hosts/bodhost01.cfg index d647c738c3..9ce365433a 100644 --- a/roles/nagios/server/files/nagios/hosts/bodhost01.cfg +++ b/roles/nagios/server/files/nagios/hosts/bodhost01.cfg @@ -1,7 +1,7 @@ -define host { - host_name bodhost01 - alias bodhost01.fedoraproject.org - use defaulttemplate - address bodhost01.fedoraproject.org - parents fwsm01-gw -} +#define host { +# host_name bodhost01 +# alias bodhost01.fedoraproject.org +# use defaulttemplate +# address bodhost01.fedoraproject.org +# parents fwsm01-gw +#} diff --git a/roles/nagios/server/files/nagios/hosts/proxy07.cfg b/roles/nagios/server/files/nagios/hosts/proxy07.cfg index 3a42119c9d..bacdf20ef8 100644 --- a/roles/nagios/server/files/nagios/hosts/proxy07.cfg +++ b/roles/nagios/server/files/nagios/hosts/proxy07.cfg @@ -1,7 +1,7 @@ -define host { - host_name proxy07 - alias proxy07.fedoraproject.org - use defaulttemplate - address proxy07.fedoraproject.org - parents bodhost01 -} +#define host { +# host_name proxy07 +# alias proxy07.fedoraproject.org +# use defaulttemplate +# address proxy07.fedoraproject.org +# parents bodhost01 +#} diff --git a/roles/nagios/server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios/server/files/nagios/servicedeps/nrpe.cfg index 58f15e6adf..304224f39e 100644 --- a/roles/nagios/server/files/nagios/servicedeps/nrpe.cfg +++ b/roles/nagios/server/files/nagios/servicedeps/nrpe.cfg @@ -70,14 +70,14 @@ define servicedependency { execution_failure_criteria w,c } -define servicedependency { - host_name bodhost01 - service_description nrpe - dependent_host_name bodhost01 - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes - notification_failure_criteria w,c - execution_failure_criteria w,c -} +#define servicedependency { +# host_name bodhost01 +# service_description nrpe +# dependent_host_name bodhost01 +# dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes +# notification_failure_criteria w,c +# execution_failure_criteria w,c +#} define servicedependency { host_name sundries01 diff --git a/roles/nagios/server/files/nagios/servicegroups/bodhi.cfg b/roles/nagios/server/files/nagios/servicegroups/bodhi.cfg index ad118e014a..46dbcba899 100644 --- a/roles/nagios/server/files/nagios/servicegroups/bodhi.cfg +++ b/roles/nagios/server/files/nagios/servicegroups/bodhi.cfg @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name bodhi alias Bodhi - members proxy01,bodhi,proxy02,bodhi,proxy03,bodhi,proxy04,bodhi,proxy06,bodhi,proxy07,bodhi,proxy08,bodhi,proxy09,bodhi,proxy05,bodhi,proxy10,bodhi,proxy11,bodhi,proxy12,bodhi,bodhi03,bodhi-internal,bodhi04,bodhi-internal + members proxy01,bodhi,proxy02,bodhi,proxy03,bodhi,proxy04,bodhi,proxy06,bodhi,proxy08,bodhi,proxy09,bodhi,proxy05,bodhi,proxy10,bodhi,proxy11,bodhi,proxy12,bodhi,bodhi03,bodhi-internal,bodhi04,bodhi-internal } diff --git a/roles/nagios/server/files/nagios/servicegroups/fp-wiki.cfg b/roles/nagios/server/files/nagios/servicegroups/fp-wiki.cfg index a1ce0e119f..8a57d1d73c 100644 --- a/roles/nagios/server/files/nagios/servicegroups/fp-wiki.cfg +++ b/roles/nagios/server/files/nagios/servicegroups/fp-wiki.cfg @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name fp-wiki alias Fedora Project Wiki - members proxy01,fedoraproject.org - wiki - non-cached,proxy02,fedoraproject.org - wiki - non-cached,proxy03,fedoraproject.org - wiki - non-cached,proxy04,fedoraproject.org - wiki - non-cached,proxy06,fedoraproject.org - wiki - non-cached,proxy07,fedoraproject.org - wiki - non-cached,proxy08,fedoraproject.org - wiki - non-cached,proxy09,fedoraproject.org - wiki - non-cached,proxy01,fedoraproject.org - wiki,proxy02,fedoraproject.org - wiki,proxy03,fedoraproject.org - wiki,proxy04,fedoraproject.org - wiki,proxy06,fedoraproject.org - wiki,proxy07,fedoraproject.org - wiki,proxy08,fedoraproject.org - wiki,proxy09,fedoraproject.org - wiki,proxy05,fedoraproject.org - wiki,proxy10,fedoraproject.org - wiki,proxy11,fedoraproject.org - wiki,proxy12,fedoraproject.org - wiki + members proxy01,fedoraproject.org - wiki - non-cached,proxy02,fedoraproject.org - wiki - non-cached,proxy03,fedoraproject.org - wiki - non-cached,proxy04,fedoraproject.org - wiki - non-cached,proxy06,fedoraproject.org - wiki - non-cached,proxy08,fedoraproject.org - wiki - non-cached,proxy09,fedoraproject.org - wiki - non-cached,proxy01,fedoraproject.org - wiki,proxy02,fedoraproject.org - wiki,proxy03,fedoraproject.org - wiki,proxy04,fedoraproject.org - wiki,proxy06,fedoraproject.org - wiki,proxy08,fedoraproject.org - wiki,proxy09,fedoraproject.org - wiki,proxy05,fedoraproject.org - wiki,proxy10,fedoraproject.org - wiki,proxy11,fedoraproject.org - wiki,proxy12,fedoraproject.org - wiki } diff --git a/roles/nagios/server/files/nagios/servicegroups/mirrorlist.cfg b/roles/nagios/server/files/nagios/servicegroups/mirrorlist.cfg index 209f9387ab..3bfb386761 100644 --- a/roles/nagios/server/files/nagios/servicegroups/mirrorlist.cfg +++ b/roles/nagios/server/files/nagios/servicegroups/mirrorlist.cfg @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name mirrorlist alias Mirrorlist - members proxy01,mirrors.fedoraproject.org - mirrorlist,proxy02,mirrors.fedoraproject.org - mirrorlist,proxy03,mirrors.fedoraproject.org - mirrorlist,proxy04,mirrors.fedoraproject.org - mirrorlist,proxy06,mirrors.fedoraproject.org - mirrorlist,proxy07,mirrors.fedoraproject.org - mirrorlist,proxy08,mirrors.fedoraproject.org - mirrorlist,proxy09,mirrors.fedoraproject.org - mirrorlist,proxy05,mirrors.fedoraproject.org - mirrorlist,proxy10,mirrors.fedoraproject.org - mirrorlist,proxy11,mirrors.fedoraproject.org - mirrorlist,proxy12,mirrors.fedoraproject.org - mirrorlist + members proxy01,mirrors.fedoraproject.org - mirrorlist,proxy02,mirrors.fedoraproject.org - mirrorlist,proxy03,mirrors.fedoraproject.org - mirrorlist,proxy04,mirrors.fedoraproject.org - mirrorlist,proxy06,mirrors.fedoraproject.org - mirrorlist,proxy08,mirrors.fedoraproject.org - mirrorlist,proxy09,mirrors.fedoraproject.org - mirrorlist,proxy05,mirrors.fedoraproject.org - mirrorlist,proxy10,mirrors.fedoraproject.org - mirrorlist,proxy11,mirrors.fedoraproject.org - mirrorlist,proxy12,mirrors.fedoraproject.org - mirrorlist } diff --git a/roles/nagios/server/files/nagios/services/fedmsg.cfg b/roles/nagios/server/files/nagios/services/fedmsg.cfg index 86c8164426..5b8c7a7747 100644 --- a/roles/nagios/server/files/nagios/services/fedmsg.cfg +++ b/roles/nagios/server/files/nagios/services/fedmsg.cfg @@ -32,7 +32,7 @@ define service { } define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy05,proxy06,proxy07,proxy08,proxy09,proxy10,proxy11,proxy12 + host_name proxy01,proxy02,proxy03,proxy04,proxy05,proxy06,proxy08,proxy09,proxy10,proxy11,proxy12 service_description Check for existence fedmsg-gateway proc check_command check_by_nrpe!check_fedmsg_gateway_proc use defaulttemplate @@ -347,7 +347,7 @@ define service { } define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy07,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 + host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 service_description Check fedmsg consumers and producers gateway check_command check_by_nrpe!check_fedmsg_cp_busgateway_gateway use defaulttemplate @@ -479,7 +479,7 @@ define service { } define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy07,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 + host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 service_description Check fedmsg-gateway consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_busgateway_gateway use defaulttemplate @@ -615,7 +615,7 @@ define service { } define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy07,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 + host_name proxy01,proxy02,proxy03,proxy04,proxy06,roxy08,proxy05,proxy09,proxy10,proxy11,proxy12 service_description Check fedmsg-gateway consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_busgateway_gateway use defaulttemplate diff --git a/roles/nagios/server/files/nagios/services/nrpe.cfg b/roles/nagios/server/files/nagios/services/nrpe.cfg index 53e47c9219..4badf8d380 100644 --- a/roles/nagios/server/files/nagios/services/nrpe.cfg +++ b/roles/nagios/server/files/nagios/services/nrpe.cfg @@ -1,5 +1,5 @@ define service { - host_name hosted03, bastion02, bastion01, bastion-vpn, bodhost01, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg + host_name hosted03, bastion02, bastion01, bastion-vpn, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg service_description nrpe check_command test_nrpe max_check_attempts 2 diff --git a/roles/nagios/server/files/nagios/services/ssl.cfg b/roles/nagios/server/files/nagios/services/ssl.cfg index 6974c75a2f..2b8a265a09 100644 --- a/roles/nagios/server/files/nagios/services/ssl.cfg +++ b/roles/nagios/server/files/nagios/services/ssl.cfg @@ -1,19 +1,19 @@ define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description admin.fedoraproject.org SSL Cert check_command check_ssl_cert!admin.fedoraproject.org!60 use defaulttemplate } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description fedoraproject.org SSL Cert check_command check_ssl_cert!fedoraproject.org!60 use defaulttemplate } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description translate.fedoraproject.org SSL Cert check_command check_ssl_cert!translate.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 dd973021e1..a6f407be4c 100644 --- a/roles/nagios/server/files/nagios/services/websites.cfg +++ b/roles/nagios/server/files/nagios/services/websites.cfg @@ -1,12 +1,12 @@ define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description fedoraproject.org check_command check_website!fedoraproject.org!/!getfedora.org use websitetemplate } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description fedoraproject.org - wiki check_command check_website!fedoraproject.org!/wiki/Fedora_Project_Wiki!Fedora Marketing max_check_attempts 10 @@ -14,7 +14,7 @@ define service { } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description fedoraproject.org - wiki - non-cached check_command check_website!fedoraproject.org!/wiki/Special:Version!MediaWiki is free software max_check_attempts 10 @@ -22,14 +22,14 @@ define service { } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description mirrors.fedoraproject.org - mirrorlist check_command check_website!mirrors.fedoraproject.org!/mirrorlist?repo=rawhide&arch=x86_64&country=global!development use websitetemplate } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description pkgdb-external check_command check_website_ssl!admin.fedoraproject.org!/pkgdb/collections/!EPEL use websitetemplate @@ -52,14 +52,14 @@ define service { } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description start.fedoraproject.org check_command check_website_ssl!start.fedoraproject.org!/!The Fedora Project is maintained use websitetemplate } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description accounts check_command check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency use websitetemplate @@ -73,7 +73,7 @@ define service { } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description bodhi check_command check_website_ssl!bodhi.fedoraproject.org!/!Fedora max_check_attempts 8 @@ -89,7 +89,7 @@ define service { } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 service_description bodhi2 check_command check_website_ssl!bodhi.fedoraproject.org!/!top testers max_check_attempts 8