From 649108c0c351aa854ff4405536c6ed7ea5b93b0c Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Mon, 7 Jul 2014 17:09:38 +0000 Subject: [PATCH] work so far on nagios_server role. Signed-off-by: Ricky Elrod --- roles/nagios_server/files/irc-colorize.py | 58 +++ .../files/nagios-external/misccommands.cfg | 4 +- .../files/nagios/hostgroups/autoqa.cfg | 2 +- .../files/nagios/hostgroups/dns.cfg | 2 +- .../files/nagios/hostgroups/euservers.cfg | 2 +- .../files/nagios/hostgroups/kvmHosts.cfg | 2 +- .../files/nagios/hostgroups/mgmt.cfg | 2 +- .../files/nagios/hostgroups/nomail.cfg | 2 +- .../files/nagios/hostgroups/phx2app.cfg | 10 +- .../files/nagios/hostgroups/servers.cfg | 2 +- .../files/nagios/hostgroups/vpnclients.cfg | 2 +- .../files/nagios/hostgroups/web.cfg | 2 +- .../files/nagios/hosts/app01-stg.cfg | 14 +- .../files/nagios/hosts/app01.cfg | 14 +- .../files/nagios/hosts/app02-stg.cfg | 14 +- .../files/nagios/hosts/app02.cfg | 14 +- .../files/nagios/hosts/app03.cfg | 14 +- .../files/nagios/hosts/app04.cfg | 14 +- .../files/nagios/hosts/app05.cfg | 14 +- .../files/nagios/hosts/app08.cfg | 14 +- .../files/nagios/hosts/arm01-builder00.cfg | 16 +- .../files/nagios/hosts/arm01-builder01.cfg | 16 +- .../files/nagios/hosts/arm01-releng00.cfg | 8 + .../files/nagios/hosts/arm01-retrace01.cfg | 8 + .../files/nagios/hosts/atomic01-mgmt.cfg | 7 + .../files/nagios/hosts/autoqa-stg01.cfg | 14 +- .../files/nagios/hosts/bodhi01.cfg | 7 + .../files/nagios/hosts/bodhi02.cfg | 7 + .../files/nagios/hosts/buildvm-01.cfg | 2 +- .../files/nagios/hosts/buildvm-02.cfg | 2 +- .../files/nagios/hosts/buildvm-03.cfg | 2 +- .../files/nagios/hosts/buildvm-04.cfg | 2 +- .../files/nagios/hosts/buildvm-05.cfg | 2 +- .../files/nagios/hosts/buildvm-06.cfg | 2 +- .../files/nagios/hosts/buildvm-07.cfg | 2 +- .../files/nagios/hosts/buildvm-08.cfg | 2 +- .../files/nagios/hosts/buildvm-09.cfg | 2 +- .../files/nagios/hosts/buildvm-10.cfg | 2 +- .../files/nagios/hosts/buildvm-11.cfg | 2 +- .../files/nagios/hosts/buildvm-12.cfg | 2 +- .../files/nagios/hosts/buildvm-13.cfg | 2 +- .../files/nagios/hosts/buildvm-14.cfg | 2 +- .../files/nagios/hosts/buildvm-15.cfg | 2 +- .../files/nagios/hosts/buildvm-16.cfg | 2 +- .../files/nagios/hosts/buildvm-17.cfg | 2 +- .../files/nagios/hosts/buildvm-18.cfg | 2 +- .../files/nagios/hosts/buildvm-19.cfg | 2 +- .../files/nagios/hosts/buildvm-20.cfg | 2 +- .../files/nagios/hosts/buildvm-21.cfg | 2 +- .../files/nagios/hosts/buildvm-22.cfg | 2 +- .../files/nagios/hosts/buildvm-23.cfg | 2 +- .../files/nagios/hosts/buildvm-24.cfg | 2 +- .../files/nagios/hosts/buildvm-25.cfg | 2 +- .../files/nagios/hosts/buildvm-26.cfg | 2 +- .../files/nagios/hosts/buildvm-27.cfg | 9 + .../files/nagios/hosts/buildvmhost-01.cfg | 16 +- .../files/nagios/hosts/buildvmhost-02.cfg | 16 +- .../files/nagios/hosts/buildvmhost-03.cfg | 16 +- .../files/nagios/hosts/buildvmhost-04.cfg | 16 +- .../files/nagios/hosts/buildvmhost-05.cfg | 16 +- .../files/nagios/hosts/buildvmhost-06.cfg | 16 +- .../files/nagios/hosts/buildvmhost-07.cfg | 16 +- .../files/nagios/hosts/buildvmhost-08.cfg | 16 +- .../files/nagios/hosts/buildvmhost-09.cfg | 16 +- .../files/nagios/hosts/buildvmhost-10.cfg | 8 + .../files/nagios/hosts/buildvmhost-11.cfg | 8 + .../files/nagios/hosts/buildvmhost-12.cfg | 8 + .../files/nagios/hosts/busgateway01-stg.cfg | 2 +- .../files/nagios/hosts/bvirthost02.cfg | 14 +- .../files/nagios/hosts/bvirthost03.cfg | 14 +- .../files/nagios/hosts/download-ib01.cfg | 14 +- .../files/nagios/hosts/download-ib02.cfg | 7 + .../files/nagios/hosts/github2fedmsg01.cfg | 7 + .../files/nagios/hosts/ibiblio04.cfg | 8 + .../files/nagios/hosts/imagebuiler.cfg | 18 +- .../files/nagios/hosts/mirrorlist-ibiblio.cfg | 2 +- .../files/nagios/hosts/nfs01.cfg | 14 +- .../files/nagios/hosts/pkgdb01.cfg | 7 + .../files/nagios/hosts/pkgdb01.stg.cfg | 7 + .../files/nagios/hosts/pkgdb02.cfg | 7 + .../files/nagios/hosts/pkgs01-stg.cfg | 2 +- .../files/nagios/hosts/releng01.cfg | 16 +- .../files/nagios/hosts/sundries01.cfg | 7 + .../files/nagios/hosts/sundries01.stg.cfg | 7 + .../files/nagios/hosts/sundries02.cfg | 7 + .../files/nagios/hosts/tagger01.cfg | 7 + .../files/nagios/hosts/tagger02.cfg | 7 + .../files/nagios/hosts/unbound-ib01.cfg | 2 +- .../files/nagios/hosts/value01.cfg | 7 + .../files/nagios/hosts/value03.cfg | 14 +- .../files/nagios/hosts/virthost11.cfg | 14 +- .../files/nagios/hosts/virthost16.cfg | 7 + .../files/nagios/hosts/wiki01.cfg | 7 + .../files/nagios/hosts/wiki01.stg.cfg | 7 + .../files/nagios/hosts/wiki02.cfg | 7 + .../files/nagios/misccommands.cfg | 4 +- .../files/nagios/servicedeps/nrpe.cfg | 104 ++++-- .../files/nagios/servicegroups/autoqa.cfg | 2 +- .../files/nagios/servicegroups/bodhi.cfg | 2 +- .../files/nagios/servicegroups/freemedia.cfg | 2 +- .../files/nagios/servicegroups/mgmt-http.cfg | 2 +- .../files/nagios/servicegroups/mgmt-https.cfg | 2 +- .../files/nagios/servicegroups/pkgdb.cfg | 2 +- .../files/nagios/services/disk.cfg | 14 +- .../files/nagios/services/fedmsg.cfg | 195 +++++++++- .../files/nagios/services/mgmt.cfg | 12 +- .../files/nagios/services/nrpe.cfg | 2 +- .../files/nagios/services/websites.cfg | 55 ++- roles/nagios_server/files/nrpe.cfg | 30 ++ .../plugins/check_fedmsg_consumer_backlog.py | 58 +++ .../check_fedmsg_consumer_exceptions.py | 54 +++ .../check_fedmsg_producers_consumers.py | 60 +++ .../nagios_server/files/plugins/restart_httpd | 4 +- .../files/plugins/restart_rsyslog | 4 +- roles/nagios_server/tasks/main.yml | 352 +++++------------- ...heckcommands.cfg.erb => checkcommands.cfg} | 2 +- ...nagios-http.conf.erb => nagios-httpd.conf} | 2 +- ...heckcommands.cfg.erb => checkcommands.cfg} | 10 +- 118 files changed, 1100 insertions(+), 627 deletions(-) create mode 100644 roles/nagios_server/files/irc-colorize.py create mode 100644 roles/nagios_server/files/nagios/hosts/arm01-releng00.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/arm01-retrace01.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/atomic01-mgmt.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/bodhi01.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/bodhi02.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/buildvm-27.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/buildvmhost-10.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/buildvmhost-11.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/buildvmhost-12.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/download-ib02.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/github2fedmsg01.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/ibiblio04.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/pkgdb01.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/pkgdb01.stg.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/pkgdb02.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/sundries01.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/sundries01.stg.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/sundries02.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/tagger01.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/tagger02.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/value01.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/virthost16.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/wiki01.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/wiki01.stg.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/wiki02.cfg create mode 100644 roles/nagios_server/files/plugins/check_fedmsg_consumer_backlog.py create mode 100644 roles/nagios_server/files/plugins/check_fedmsg_consumer_exceptions.py create mode 100644 roles/nagios_server/files/plugins/check_fedmsg_producers_consumers.py rename roles/nagios_server/templates/nagios-external/{checkcommands.cfg.erb => checkcommands.cfg} (98%) rename roles/nagios_server/templates/{nagios-http.conf.erb => nagios-httpd.conf} (96%) rename roles/nagios_server/templates/nagios/{checkcommands.cfg.erb => checkcommands.cfg} (96%) diff --git a/roles/nagios_server/files/irc-colorize.py b/roles/nagios_server/files/irc-colorize.py new file mode 100644 index 0000000000..122f8d0f93 --- /dev/null +++ b/roles/nagios_server/files/irc-colorize.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python +""" Reads a string from stdin and prints it to stdout with irc colors + +:license: LGPLv2+ +:author: Ralph Bean +""" + +import sys + +mirc_colors = { + "white": 0, + "black": 1, + "blue": 2, + "green": 3, + "red": 4, + "brown": 5, + "purple": 6, + "orange": 7, + "yellow": 8, + "light green": 9, + "teal": 10, + "light cyan": 11, + "light blue": 12, + "pink": 13, + "grey": 14, + "light grey": 15, +} + +mapping = { + 'RECOVERY': 'green', + 'OK': 'green', + 'UNKNOWN': 'purple', + 'WARNING': 'teal', + # 'red' probably makes the most sense here, but it behaved oddly + 'PROBLEM': 'brown', + 'CRITICAL': 'brown', +} + + +def markup(string, color): + return "\x02\x03%i%s\x03\x02" % (mirc_colors[color], string) + + +def colorize(word): + suffix = '' + if word.endswith(':'): + word, suffix = word[:-1], word[-1] + + if word in mapping: + word = markup(word, mapping[word]) + + return word + suffix + + +if __name__ == '__main__': + lines = sys.stdin.readlines() + for line in lines: + print " ".join([colorize(word) for word in line.strip().split()]) diff --git a/roles/nagios_server/files/nagios-external/misccommands.cfg b/roles/nagios_server/files/nagios-external/misccommands.cfg index 83ec8e18f4..064c97f879 100644 --- a/roles/nagios_server/files/nagios-external/misccommands.cfg +++ b/roles/nagios_server/files/nagios-external/misccommands.cfg @@ -62,7 +62,7 @@ define command{ # 'host-notify-by-ircbot' command definition define command{ command_name host-notify-by-ircbot - command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTALIAS$ is $HOSTSTATE$: $HOSTOUTPUT$ ($$(hostname -s))" | nc -w 1 value03.vpn.fedoraproject.org 5050 + command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTALIAS$ is $HOSTSTATE$: $HOSTOUTPUT$ ($$(hostname -s))" | /usr/local/bin/irc-colorize.py | nc -w 1 value01.vpn.fedoraproject.org 5050 } # 'notify-by-email' command definition @@ -81,7 +81,7 @@ define command{ # 'notify-by-ircbot' command definition define command{ command_name notify-by-ircbot - command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$: $SERVICEOUTPUT$ ($$(hostname -s))" | nc -w 1 value03.vpn.fedoraproject.org 5050 + command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$: $SERVICEOUTPUT$ ($$(hostname -s))" | /usr/local/bin/irc-colorize.py | nc -w 1 value01.vpn.fedoraproject.org 5050 } diff --git a/roles/nagios_server/files/nagios/hostgroups/autoqa.cfg b/roles/nagios_server/files/nagios/hostgroups/autoqa.cfg index 82ce1dcc59..055e4b59c6 100644 --- a/roles/nagios_server/files/nagios/hostgroups/autoqa.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/autoqa.cfg @@ -1,5 +1,5 @@ define hostgroup { hostgroup_name autoqa alias AutoQA Hosts - members autoqa01, autoqa-stg01 + members autoqa01 } diff --git a/roles/nagios_server/files/nagios/hostgroups/dns.cfg b/roles/nagios_server/files/nagios/hostgroups/dns.cfg index 14cfd88a96..d7dadc3274 100644 --- a/roles/nagios_server/files/nagios/hostgroups/dns.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/dns.cfg @@ -1,5 +1,5 @@ define hostgroup { hostgroup_name dnsservers alias DNS Servers - members ns03 + members ns-sb01,ns02,ns03,ns04,ns05 } diff --git a/roles/nagios_server/files/nagios/hostgroups/euservers.cfg b/roles/nagios_server/files/nagios/hostgroups/euservers.cfg index 905fb0e696..c50bf29ae0 100644 --- a/roles/nagios_server/files/nagios/hostgroups/euservers.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/euservers.cfg @@ -6,5 +6,5 @@ define hostgroup { hostgroup_name euservers alias European Servers - members telia01, noc02, noc02 + members telia01 } diff --git a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg index 9fc5cae1f2..3a3095fbb7 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 bvirthost01, bvirthost02, bvirthost03, bvirthost04, bvirthost05, bvirthost07, virthost01, virthost02, virthost03, virthost04, virthost05, virthost06, virthost07, virthost08, virthost09, virthost10, virthost11, virthost12, virthost14, virthost15, virthost-comm01, virthost-comm02, telia01, tummy01, bodhost01, osuosl01, osuosl02, ibiblio01, ibiblio02, ibiblio03, coloamer01, internetx01, serverbeach06, serverbeach07, serverbeach08, serverbeach09, serverbeach10 + members bvirthost01, bvirthost04, bvirthost05, bvirthost07, virthost01, virthost02, virthost03, virthost04, virthost05, virthost06, virthost07, virthost08, virthost09, virthost10, virthost12, virthost14, virthost15, virthost16, virthost-comm01, virthost-comm02, telia01, tummy01, bodhost01, osuosl01, osuosl02, ibiblio01, ibiblio02, ibiblio03, ibiblio04, coloamer01, internetx01, serverbeach06, serverbeach07, serverbeach08, serverbeach09, serverbeach10 } diff --git a/roles/nagios_server/files/nagios/hostgroups/mgmt.cfg b/roles/nagios_server/files/nagios/hostgroups/mgmt.cfg index b4817cd023..f8c5b78a72 100644 --- a/roles/nagios_server/files/nagios/hostgroups/mgmt.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/mgmt.cfg @@ -1,6 +1,6 @@ define hostgroup { hostgroup_name mgmt alias Physical hosts management inerface - members backup03-mgmt,bc02-mgmt,bvirthost01-mgmt,bvirthost04-mgmt,bvirthost05-mgmt,bvirthost07-mgmt,download01-mgmt,download02-mgmt,download03-mgmt,download04-mgmt,download05-mgmt,qa01-mgmt,qa02-mgmt,qa03-mgmt,qa04-mgmt,qa05-mgmt,qa06-mgmt,qa07-mgmt,qa08-mgmt,tape02-mgmt,virthost-comm01-mgmt,virthost01-mgmt,virthost02-mgmt,virthost03-mgmt,virthost04-mgmt,virthost05-mgmt,virthost06-mgmt,virthost07-mgmt,virthost08-mgmt,virthost09-mgmt,virthost10-mgmt,virthost11-mgmt,virthost12-mgmt,virthost14-mgmt,virthost15-mgmt,virthost-comm02-mgmt,sign-vault03-mgmt,sign-vault04-mgmt + members backup03-mgmt,bc02-mgmt,bvirthost01-mgmt,bvirthost04-mgmt,bvirthost05-mgmt,bvirthost07-mgmt,download01-mgmt,download02-mgmt,download03-mgmt,download04-mgmt,download05-mgmt,qa01-mgmt,qa02-mgmt,qa03-mgmt,qa04-mgmt,qa05-mgmt,qa06-mgmt,qa07-mgmt,qa08-mgmt,tape02-mgmt,virthost-comm01-mgmt,virthost01-mgmt,virthost02-mgmt,virthost03-mgmt,virthost04-mgmt,virthost05-mgmt,virthost06-mgmt,virthost07-mgmt,virthost08-mgmt,virthost09-mgmt,virthost10-mgmt,atomic01-mgmt,virthost12-mgmt,virthost14-mgmt,virthost15-mgmt,virthost-comm02-mgmt,sign-vault03-mgmt,sign-vault04-mgmt } diff --git a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg index 169bf1ad75..7d05c83489 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, !backup03, !app01.stg, !app02.stg, !db02.stg, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !releng01.stg, !value01.stg, !smtp-mm-telia01, !smtp-mm-tummy01, !smtp-mm-ib01, !hosted03, !hosted04, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy03-wildcard, !proxy04-fpo, !proxy04-wildcard, !proxy06-fpo, !proxy06-wildcard, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !bc02-mgmt, !fwsm01-gw, !backup03-mgmt,!bc02-mgmt,!bvirthost01-mgmt,!bvirthost04-mgmt,!bvirthost05-mgmt,!bvirthost07-mgmt,!download01-mgmt,!download02-mgmt,!download03-mgmt,!download04-mgmt,!download05-mgmt,!qa01-mgmt,!qa02-mgmt,!qa03-mgmt,!qa04-mgmt,!qa05-mgmt,!qa06-mgmt,!qa07-mgmt,!qa08-mgmt,!tape02-mgmt,!virthost-comm01-mgmt,!virthost01-mgmt,!virthost02-mgmt,!virthost03-mgmt,!virthost04-mgmt,!virthost05-mgmt,!virthost06-mgmt,!virthost07-mgmt,!virthost08-mgmt,!virthost09-mgmt,!virthost10-mgmt,!virthost11-mgmt,!virthost12-mgmt,!virthost14-mgmt,!virthost15-mgmt,!autoqa01,!autoqa-stg01,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02-mgmt,!ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03-mgmt,!sign-vault04,!sign-vault04-mgmt,!proxy09-fpo, !proxy09-wildcard, !arm01-builder00, !arm01-builder01, !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-builder07, !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, !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, !buildvmhost-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-05, !buildvmhost-06, !buildvmhost-07, !buildvmhost-08, !buildvmhost-09, !releng01, !imagebuilder + members *, !bastion01, !bastion02, !bastion-vpn, !backup03, !db02.stg, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !releng01.stg, !value01.stg, !smtp-mm-telia01, !smtp-mm-tummy01, !smtp-mm-ib01, !hosted03, !hosted04, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy03-wildcard, !proxy04-fpo, !proxy04-wildcard, !proxy06-fpo, !proxy06-wildcard, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !bc02-mgmt, !fwsm01-gw, !backup03-mgmt,!bc02-mgmt,!bvirthost01-mgmt,!bvirthost04-mgmt,!bvirthost05-mgmt,!bvirthost07-mgmt,!download01-mgmt,!download02-mgmt,!download03-mgmt,!download04-mgmt,!download05-mgmt,!qa01-mgmt,!qa02-mgmt,!qa03-mgmt,!qa04-mgmt,!qa05-mgmt,!qa06-mgmt,!qa07-mgmt,!qa08-mgmt,!tape02-mgmt,!virthost-comm01-mgmt,!virthost01-mgmt,!virthost02-mgmt,!virthost03-mgmt,!virthost04-mgmt,!virthost05-mgmt,!virthost06-mgmt,!virthost07-mgmt,!virthost08-mgmt,!virthost09-mgmt,!virthost10-mgmt,!atomic01-mgmt,!virthost12-mgmt,!virthost14-mgmt,!virthost15-mgmt,!autoqa01,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02-mgmt,!ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03-mgmt,!sign-vault04,!sign-vault04-mgmt,!proxy09-fpo, !proxy09-wildcard, !arm01-releng00, !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-builder07, !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, !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 } diff --git a/roles/nagios_server/files/nagios/hostgroups/phx2app.cfg b/roles/nagios_server/files/nagios/hostgroups/phx2app.cfg index 6c1370c996..1dad728cfd 100644 --- a/roles/nagios_server/files/nagios/hostgroups/phx2app.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/phx2app.cfg @@ -2,9 +2,9 @@ # PHX2 App Servers ############### -define hostgroup { - hostgroup_name phx2app - alias FAS Servers - members app01, app02, app03, app04, bapp02 -} +#define hostgroup { +# hostgroup_name phx2app +# alias FAS Servers +# members app01, app02, app03, app04, bapp02 +#} diff --git a/roles/nagios_server/files/nagios/hostgroups/servers.cfg b/roles/nagios_server/files/nagios/hostgroups/servers.cfg index ce198f6bc1..684153a8ca 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-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy03-wildcard, !proxy04-fpo, !proxy04-wildcard, !proxy06-fpo, !proxy06-wildcard, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !fwsm01-gw, !backup03-mgmt,!bc02-mgmt,!bvirthost01-mgmt,!bvirthost05-mgmt,!download01-mgmt,!download02-mgmt,!download03-mgmt,!download04-mgmt,!download05-mgmt,!qa01-mgmt,!qa02-mgmt,!qa03-mgmt,!qa04-mgmt,!qa05-mgmt,!qa06-mgmt,!qa07-mgmt,!qa08-mgmt,!tape02-mgmt,!bvirthost04-mgmt, !bvirthost07-mgmt, !virthost-comm01-mgmt,!virthost01-mgmt,!virthost02-mgmt,!virthost03-mgmt,!virthost04-mgmt,!virthost05-mgmt,!virthost06-mgmt,!virthost07-mgmt,!virthost08-mgmt,!virthost09-mgmt,!virthost10-mgmt,!virthost11-mgmt, !virthost12-mgmt, !virthost14-mgmt,!virthost15-mgmt, !autoqa01, !autoqa-stg01, !ibiblio-gw, !status-fedora2,!virthost-comm02-mgmt,!ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03-mgmt,!sign-vault04,!sign-vault04-mgmt,!proxy09-fpo,!proxy09-wildcard, !arm01-builder00, !arm01-builder01, !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-builder07, !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, !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, !buildvmhost-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-05, !buildvmhost-06, !buildvmhost-07, !buildvmhost-08, !buildvmhost-09, !releng01, !imagebuilder + members *, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy03-wildcard, !proxy04-fpo, !proxy04-wildcard, !proxy06-fpo, !proxy06-wildcard, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !fwsm01-gw, !backup03-mgmt,!bc02-mgmt,!bvirthost01-mgmt,!bvirthost05-mgmt,!download01-mgmt,!download02-mgmt,!download03-mgmt,!download04-mgmt,!download05-mgmt,!qa01-mgmt,!qa02-mgmt,!qa03-mgmt,!qa04-mgmt,!qa05-mgmt,!qa06-mgmt,!qa07-mgmt,!qa08-mgmt,!tape02-mgmt,!bvirthost04-mgmt, !bvirthost07-mgmt, !virthost-comm01-mgmt,!virthost01-mgmt,!virthost02-mgmt,!virthost03-mgmt,!virthost04-mgmt,!virthost05-mgmt,!virthost06-mgmt,!virthost07-mgmt,!virthost08-mgmt,!virthost09-mgmt,!virthost10-mgmt,!atomic01-mgmt, !virthost12-mgmt, !virthost14-mgmt,!virthost15-mgmt, !autoqa01, !ibiblio-gw, !status-fedora2,!virthost-comm02-mgmt,!ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03-mgmt,!sign-vault04,!sign-vault04-mgmt,!proxy09-fpo,!proxy09-wildcard, !arm01-releng00, !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-builder07, !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, !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 } diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg index 0b1c2b5713..dff742894e 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,telia01,smtp-mm-telia01,unbound-telia01,bodhost01,proxy07,coloamer01,app08,proxy08,ibiblio01,download-ib01,noc02,unbound-ib01,ibiblio02,app05,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,backup02,people03,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,hosted03,ibiblio02,hosted04,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,collab04,proxy09 + members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,telia01,smtp-mm-telia01,unbound-telia01,bodhost01,proxy07,coloamer01,proxy08,ibiblio01,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,backup02,people03,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,hosted03,ibiblio02,hosted04,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,collab04,proxy09 } diff --git a/roles/nagios_server/files/nagios/hostgroups/web.cfg b/roles/nagios_server/files/nagios/hostgroups/web.cfg index a4bcdcffb5..dd52755932 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 app01, app02, app03, app04, app05, app08, proxy01, proxy02, proxy03, proxy04, proxy08, fas01, fas02, fas03, status-fedora2, fedoauth01, fedoauth02, proxy09 + members proxy01, proxy02, proxy03, proxy04, proxy06, proxy07, proxy08, fas01, fas02, fas03, status-fedora2, fedoauth01, fedoauth02, proxy09 } diff --git a/roles/nagios_server/files/nagios/hosts/app01-stg.cfg b/roles/nagios_server/files/nagios/hosts/app01-stg.cfg index fcf8995dc0..9564c66f77 100644 --- a/roles/nagios_server/files/nagios/hosts/app01-stg.cfg +++ b/roles/nagios_server/files/nagios/hosts/app01-stg.cfg @@ -1,7 +1,7 @@ -define host { - host_name app01.stg - alias app01.stg.phx2.fedoraproject.org - use defaulttemplate - address app01.stg.phx2.fedoraproject.org - parents virthost10 -} +#define host { +# host_name app01.stg +# alias app01.stg.phx2.fedoraproject.org +# use defaulttemplate +# address app01.stg.phx2.fedoraproject.org +# parents virthost10 +#} diff --git a/roles/nagios_server/files/nagios/hosts/app01.cfg b/roles/nagios_server/files/nagios/hosts/app01.cfg index df4e5b62f8..6a59534896 100644 --- a/roles/nagios_server/files/nagios/hosts/app01.cfg +++ b/roles/nagios_server/files/nagios/hosts/app01.cfg @@ -1,7 +1,7 @@ -define host { - host_name app01 - alias app01.phx2.fedoraproject.org - use defaulttemplate - address app01.phx2.fedoraproject.org - parents virthost05 -} +#define host { +# host_name app01 +# alias app01.phx2.fedoraproject.org +# use defaulttemplate +# address app01.phx2.fedoraproject.org +# parents virthost05 +#} diff --git a/roles/nagios_server/files/nagios/hosts/app02-stg.cfg b/roles/nagios_server/files/nagios/hosts/app02-stg.cfg index 4f760c0bdb..03ddb9265a 100644 --- a/roles/nagios_server/files/nagios/hosts/app02-stg.cfg +++ b/roles/nagios_server/files/nagios/hosts/app02-stg.cfg @@ -1,7 +1,7 @@ -define host { - host_name app02.stg - alias app02.stg.phx2.fedoraproject.org - use defaulttemplate - address app02.stg.phx2.fedoraproject.org - parents virthost12 -} +#define host { +## host_name app02.stg +# alias app02.stg.phx2.fedoraproject.org +# use defaulttemplate +# address app02.stg.phx2.fedoraproject.org +# parents virthost12 +#} diff --git a/roles/nagios_server/files/nagios/hosts/app02.cfg b/roles/nagios_server/files/nagios/hosts/app02.cfg index 37cb7ef9bd..f15cd59a1b 100644 --- a/roles/nagios_server/files/nagios/hosts/app02.cfg +++ b/roles/nagios_server/files/nagios/hosts/app02.cfg @@ -1,7 +1,7 @@ -define host { - host_name app02 - alias app02.phx2.fedoraproject.org - use defaulttemplate - address app02.phx2.fedoraproject.org - parents virthost07 -} +#define host { +# host_name app02 +# alias app02.phx2.fedoraproject.org +# use defaulttemplate +# address app02.phx2.fedoraproject.org +# parents virthost07 +#} diff --git a/roles/nagios_server/files/nagios/hosts/app03.cfg b/roles/nagios_server/files/nagios/hosts/app03.cfg index 9b71f6dd84..80b54ffc60 100644 --- a/roles/nagios_server/files/nagios/hosts/app03.cfg +++ b/roles/nagios_server/files/nagios/hosts/app03.cfg @@ -1,7 +1,7 @@ -define host { - host_name app03 - alias app03.phx2.fedoraproject.org - use defaulttemplate - address app03.phx2.fedoraproject.org - parents virthost08 -} +#define host { +# host_name app03 +# alias app03.phx2.fedoraproject.org +# use defaulttemplate +# address app03.phx2.fedoraproject.org +# parents virthost08 +#} diff --git a/roles/nagios_server/files/nagios/hosts/app04.cfg b/roles/nagios_server/files/nagios/hosts/app04.cfg index 1a64c3ac50..620260d6b7 100644 --- a/roles/nagios_server/files/nagios/hosts/app04.cfg +++ b/roles/nagios_server/files/nagios/hosts/app04.cfg @@ -1,7 +1,7 @@ -define host { - host_name app04 - alias app04.phx2.fedoraproject.org - use defaulttemplate - address app04.phx2.fedoraproject.org - parents virthost09 -} +#define host { +# host_name app04 +# alias app04.phx2.fedoraproject.org +# use defaulttemplate +# address app04.phx2.fedoraproject.org +# parents virthost09 +#} diff --git a/roles/nagios_server/files/nagios/hosts/app05.cfg b/roles/nagios_server/files/nagios/hosts/app05.cfg index 83ce64466b..2cfeb85fe4 100644 --- a/roles/nagios_server/files/nagios/hosts/app05.cfg +++ b/roles/nagios_server/files/nagios/hosts/app05.cfg @@ -1,7 +1,7 @@ -define host { - host_name app05 - alias app05.fedoraproject.org - use defaulttemplate - address app05.fedoraproject.org - parents ibiblio02 -} +#define host { +# host_name app05 +# alias app05.fedoraproject.org +# use defaulttemplate +# address app05.fedoraproject.org +# parents ibiblio02 +#} diff --git a/roles/nagios_server/files/nagios/hosts/app08.cfg b/roles/nagios_server/files/nagios/hosts/app08.cfg index aa1435dd60..971f968486 100644 --- a/roles/nagios_server/files/nagios/hosts/app08.cfg +++ b/roles/nagios_server/files/nagios/hosts/app08.cfg @@ -1,8 +1,8 @@ -define host { - host_name app08 - alias app08.fedoraproject.org - use defaulttemplate - address app08.fedoraproject.org - parents coloamer01 -} +#define host { +# host_name app08 +# alias app08.fedoraproject.org +# use defaulttemplate +# address app08.fedoraproject.org +# parents coloamer01 +#} diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder00.cfg b/roles/nagios_server/files/nagios/hosts/arm01-builder00.cfg index 7efcc24ae3..d04b122786 100644 --- a/roles/nagios_server/files/nagios/hosts/arm01-builder00.cfg +++ b/roles/nagios_server/files/nagios/hosts/arm01-builder00.cfg @@ -1,8 +1,8 @@ -define host { - host_name arm01-builder00 - alias arm01-builder00.arm.fedoraproject.org - use defaultbuilders - check_command check-host-alive - address arm01-builder00.arm.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# host_name arm01-builder00 +# alias arm01-builder00.arm.fedoraproject.org +# use defaultbuilders +# check_command check-host-alive +# address arm01-builder00.arm.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder01.cfg b/roles/nagios_server/files/nagios/hosts/arm01-builder01.cfg index 49bfecea34..62f4e3c6f3 100644 --- a/roles/nagios_server/files/nagios/hosts/arm01-builder01.cfg +++ b/roles/nagios_server/files/nagios/hosts/arm01-builder01.cfg @@ -1,8 +1,8 @@ -define host { - host_name arm01-builder01 - alias arm01-builder01.arm.fedoraproject.org - use defaultbuilders - check_command check-host-alive - address arm01-builder01.arm.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# host_name arm01-builder01 +# alias arm01-builder01.arm.fedoraproject.org +# use defaultbuilders +# check_command check-host-alive +# address arm01-builder01.arm.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/arm01-releng00.cfg b/roles/nagios_server/files/nagios/hosts/arm01-releng00.cfg new file mode 100644 index 0000000000..5399469507 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/arm01-releng00.cfg @@ -0,0 +1,8 @@ +define host { + host_name arm01-releng00 + alias arm01-releng00.arm.fedoraproject.org + use defaultbuilders + check_command check-host-alive + address arm01-releng00.arm.fedoraproject.org + contact_groups build-sysadmin-email +} diff --git a/roles/nagios_server/files/nagios/hosts/arm01-retrace01.cfg b/roles/nagios_server/files/nagios/hosts/arm01-retrace01.cfg new file mode 100644 index 0000000000..0084fa3e33 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/arm01-retrace01.cfg @@ -0,0 +1,8 @@ +define host { + host_name arm01-retrace01 + alias arm01-retrace01.arm.fedoraproject.org + use defaultbuilders + check_command check-host-alive + address arm01-retrace01.arm.fedoraproject.org + contact_groups build-sysadmin-email +} diff --git a/roles/nagios_server/files/nagios/hosts/atomic01-mgmt.cfg b/roles/nagios_server/files/nagios/hosts/atomic01-mgmt.cfg new file mode 100644 index 0000000000..dd6a7b64d9 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/atomic01-mgmt.cfg @@ -0,0 +1,7 @@ +define host { + host_name atomic01-mgmt + alias atomic01-mgmt.phx2.fedoraproject.org + use mincheck + address atomic01-mgmt.phx2.fedoraproject.org + parents fwsm01-gw +} diff --git a/roles/nagios_server/files/nagios/hosts/autoqa-stg01.cfg b/roles/nagios_server/files/nagios/hosts/autoqa-stg01.cfg index 5d03c175f0..efa102671e 100644 --- a/roles/nagios_server/files/nagios/hosts/autoqa-stg01.cfg +++ b/roles/nagios_server/files/nagios/hosts/autoqa-stg01.cfg @@ -1,7 +1,7 @@ -define host { - host_name autoqa-stg01 - alias autoqa-stg01.qa.fedoraproject.org - use autoqatemplate - address autoqa-stg01.qa.fedoraproject.org - parents virthost-comm01 -} +#define host { +# host_name autoqa-stg01 +# alias autoqa-stg01.qa.fedoraproject.org +# use autoqatemplate +# address autoqa-stg01.qa.fedoraproject.org +# parents virthost-comm01 +#} diff --git a/roles/nagios_server/files/nagios/hosts/bodhi01.cfg b/roles/nagios_server/files/nagios/hosts/bodhi01.cfg new file mode 100644 index 0000000000..44a9bdfeb8 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/bodhi01.cfg @@ -0,0 +1,7 @@ +define host { + host_name bodhi01 + alias bodhi01.phx2.fedoraproject.org + use defaulttemplate + address bodhi01.phx2.fedoraproject.org + parents virthost01 +} diff --git a/roles/nagios_server/files/nagios/hosts/bodhi02.cfg b/roles/nagios_server/files/nagios/hosts/bodhi02.cfg new file mode 100644 index 0000000000..f1273093ad --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/bodhi02.cfg @@ -0,0 +1,7 @@ +define host { + host_name bodhi02 + alias bodhi02.phx2.fedoraproject.org + use defaulttemplate + address bodhi02.phx2.fedoraproject.org + parents virthost03 +} diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-01.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-01.cfg index 4a0bbdbf34..ea455dae2e 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-01.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-01.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-01.phx2.fedoraproject.org - parents buildvmhost-01 + parents buildvmhost-10 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-02.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-02.cfg index 92cc81faac..d9fcbf3e13 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-02.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-02.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-02.phx2.fedoraproject.org - parents buildvmhost-01 + parents buildvmhost-10 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-03.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-03.cfg index 6ca61e0872..d0a8d9b224 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-03.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-03.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-03.phx2.fedoraproject.org - parents buildvmhost-01 + parents buildvmhost-10 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-04.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-04.cfg index d110cfb566..d7a6ff6c4b 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-04.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-04.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-04.phx2.fedoraproject.org - parents buildvmhost-02 + parents buildvmhost-10 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-05.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-05.cfg index a563448421..fa653e98c0 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-05.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-05.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-05.phx2.fedoraproject.org - parents buildvmhost-02 + parents buildvmhost-10 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-06.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-06.cfg index b6dbffd722..22d152d69b 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-06.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-06.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-06.phx2.fedoraproject.org - parents buildvmhost-02 + parents buildvmhost-10 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-07.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-07.cfg index 681c37b836..e875ff8761 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-07.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-07.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-07.phx2.fedoraproject.org - parents buildvmhost-03 + parents buildvmhost-10 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-08.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-08.cfg index 1de2147475..7ce8c3c318 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-08.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-08.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-08.phx2.fedoraproject.org - parents buildvmhost-03 + parents buildvmhost-10 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-09.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-09.cfg index be69bc3b0c..a848231c8a 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-09.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-09.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-09.phx2.fedoraproject.org - parents buildvmhost-03 + parents buildvmhost-10 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-10.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-10.cfg index 35ef6199b3..2ff66515f8 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-10.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-10.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-10.phx2.fedoraproject.org - parents buildvmhost-04 + parents buildvmhost-11 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-11.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-11.cfg index 5706c26aef..5caf7e3390 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-11.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-11.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-11.phx2.fedoraproject.org - parents buildvmhost-04 + parents buildvmhost-11 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-12.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-12.cfg index 53486410f6..56ef4ed1bc 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-12.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-12.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-12.phx2.fedoraproject.org - parents buildvmhost-04 + parents buildvmhost-11 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-13.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-13.cfg index 495a0f987d..fe7191c4f5 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-13.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-13.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-13.phx2.fedoraproject.org - parents buildvmhost-05 + parents buildvmhost-11 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-14.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-14.cfg index 99e2579783..14a12ac488 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-14.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-14.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-14.phx2.fedoraproject.org - parents buildvmhost-05 + parents buildvmhost-11 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-15.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-15.cfg index 0c498d1d70..873bfee4a7 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-15.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-15.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-15.phx2.fedoraproject.org - parents buildvmhost-05 + parents buildvmhost-11 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-16.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-16.cfg index f4406bf37d..287682e09c 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-16.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-16.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-16.phx2.fedoraproject.org - parents buildvmhost-06 + parents buildvmhost-11 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-17.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-17.cfg index 99cbb93805..192078ff7a 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-17.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-17.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-17.phx2.fedoraproject.org - parents buildvmhost-06 + parents buildvmhost-11 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-18.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-18.cfg index c38b249118..0d80897a45 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-18.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-18.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-18.phx2.fedoraproject.org - parents buildvmhost-07 + parents buildvmhost-11 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-19.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-19.cfg index fc3c54cf37..8b0967aab8 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-19.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-19.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-19.phx2.fedoraproject.org - parents buildvmhost-07 + parents buildvmhost-12 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-20.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-20.cfg index 0dc432569b..cf86423f92 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-20.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-20.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-20.phx2.fedoraproject.org - parents buildvmhost-07 + parents buildvmhost-12 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-21.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-21.cfg index 6f3ad02e90..e73a628ead 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-21.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-21.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-21.phx2.fedoraproject.org - parents buildvmhost-08 + parents buildvmhost-12 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-22.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-22.cfg index 0eb843502b..402be48eb8 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-22.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-22.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-22.phx2.fedoraproject.org - parents buildvmhost-08 + parents buildvmhost-12 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-23.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-23.cfg index bd78e223b8..081d7ae49b 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-23.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-23.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-23.phx2.fedoraproject.org - parents buildvmhost-08 + parents buildvmhost-12 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-24.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-24.cfg index 8e64d16cdf..3ed7d04528 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-24.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-24.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-24.phx2.fedoraproject.org - parents buildvmhost-09 + parents buildvmhost-12 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-25.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-25.cfg index 2f75439faf..91b7f9b6d2 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-25.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-25.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-25.phx2.fedoraproject.org - parents buildvmhost-09 + parents buildvmhost-12 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-26.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-26.cfg index 3c1b75c52a..8a8af1edeb 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvm-26.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvm-26.cfg @@ -4,6 +4,6 @@ define host { use defaultbuilders check_command check-host-alive address buildvm-26.phx2.fedoraproject.org - parents buildvmhost-09 + parents buildvmhost-12 contact_groups build-sysadmin-email } diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-27.cfg b/roles/nagios_server/files/nagios/hosts/buildvm-27.cfg new file mode 100644 index 0000000000..8c60334f27 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/buildvm-27.cfg @@ -0,0 +1,9 @@ +define host { + alias buildvm-27.phx2.fedoraproject.org + host_name buildvm-27 + use defaultbuilders + check_command check-host-alive + address buildvm-27.phx2.fedoraproject.org + parents buildvmhost-12 + contact_groups build-sysadmin-email +} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-01.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-01.cfg index ee0e3ea175..99d411271f 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvmhost-01.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-01.cfg @@ -1,8 +1,8 @@ -define host { - alias buildvmhost-01.phx2.fedoraproject.org - host_name buildvmhost-01 - use defaultbuilders - check_command check-host-alive - address buildvmhost-01.phx2.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# alias buildvmhost-01.phx2.fedoraproject.org +# host_name buildvmhost-01 +# use defaultbuilders +# check_command check-host-alive +# address buildvmhost-01.phx2.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-02.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-02.cfg index 0b77bd8ac8..c1d2d474f2 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvmhost-02.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-02.cfg @@ -1,8 +1,8 @@ -define host { - alias buildvmhost-02.phx2.fedoraproject.org - host_name buildvmhost-02 - use defaultbuilders - check_command check-host-alive - address buildvmhost-02.phx2.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# alias buildvmhost-02.phx2.fedoraproject.org +# host_name buildvmhost-02 +# use defaultbuilders +# check_command check-host-alive +# address buildvmhost-02.phx2.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-03.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-03.cfg index e3449c602d..27a3c96cbc 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvmhost-03.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-03.cfg @@ -1,8 +1,8 @@ -define host { - alias buildvmhost-03.phx2.fedoraproject.org - host_name buildvmhost-03 - use defaultbuilders - check_command check-host-alive - address buildvmhost-03.phx2.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# alias buildvmhost-03.phx2.fedoraproject.org +# host_name buildvmhost-03 +# use defaultbuilders +# check_command check-host-alive +# address buildvmhost-03.phx2.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-04.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-04.cfg index e39d6c044a..1173d2e7cf 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvmhost-04.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-04.cfg @@ -1,8 +1,8 @@ -define host { - alias buildvmhost-04.phx2.fedoraproject.org - host_name buildvmhost-04 - use defaultbuilders - check_command check-host-alive - address buildvmhost-04.phx2.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# alias buildvmhost-04.phx2.fedoraproject.org +# host_name buildvmhost-04 +# use defaultbuilders +# check_command check-host-alive +# address buildvmhost-04.phx2.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-05.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-05.cfg index 609c03bc4b..aba6236862 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvmhost-05.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-05.cfg @@ -1,8 +1,8 @@ -define host { - alias buildvmhost-05.phx2.fedoraproject.org - host_name buildvmhost-05 - use defaultbuilders - check_command check-host-alive - address buildvmhost-05.phx2.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# alias buildvmhost-05.phx2.fedoraproject.org +# host_name buildvmhost-05 +# use defaultbuilders +# check_command check-host-alive +# address buildvmhost-05.phx2.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-06.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-06.cfg index 0f27c55a04..c82077209e 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvmhost-06.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-06.cfg @@ -1,8 +1,8 @@ -define host { - alias buildvmhost-06.phx2.fedoraproject.org - host_name buildvmhost-06 - use defaultbuilders - check_command check-host-alive - address buildvmhost-06.phx2.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# alias buildvmhost-06.phx2.fedoraproject.org +# host_name buildvmhost-06 +# use defaultbuilders +# check_command check-host-alive +# address buildvmhost-06.phx2.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-07.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-07.cfg index 31f1f2f0bf..2ada57959c 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvmhost-07.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-07.cfg @@ -1,8 +1,8 @@ -define host { - alias buildvmhost-07.phx2.fedoraproject.org - host_name buildvmhost-07 - use defaultbuilders - check_command check-host-alive - address buildvmhost-07.phx2.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# alias buildvmhost-07.phx2.fedoraproject.org +# host_name buildvmhost-07 +# use defaultbuilders +# check_command check-host-alive +# address buildvmhost-07.phx2.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-08.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-08.cfg index c73d47c9d7..9138bbe18a 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvmhost-08.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-08.cfg @@ -1,8 +1,8 @@ -define host { - alias buildvmhost-08.phx2.fedoraproject.org - host_name buildvmhost-08 - use defaultbuilders - check_command check-host-alive - address buildvmhost-08.phx2.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# alias buildvmhost-08.phx2.fedoraproject.org +# host_name buildvmhost-08 +# use defaultbuilders +# check_command check-host-alive +# address buildvmhost-08.phx2.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-09.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-09.cfg index 4d38b429ab..72a8daf417 100644 --- a/roles/nagios_server/files/nagios/hosts/buildvmhost-09.cfg +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-09.cfg @@ -1,8 +1,8 @@ -define host { - alias buildvmhost-09.phx2.fedoraproject.org - host_name buildvmhost-09 - use defaultbuilders - check_command check-host-alive - address buildvmhost-09.phx2.fedoraproject.org - contact_groups build-sysadmin-email -} +#define host { +# alias buildvmhost-09.phx2.fedoraproject.org +# host_name buildvmhost-09 +# use defaultbuilders +# check_command check-host-alive +# address buildvmhost-09.phx2.fedoraproject.org +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-10.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-10.cfg new file mode 100644 index 0000000000..8ec3b4b68f --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-10.cfg @@ -0,0 +1,8 @@ +define host { + alias buildvmhost-10.phx2.fedoraproject.org + host_name buildvmhost-10 + use defaultbuilders + check_command check-host-alive + address buildvmhost-10.phx2.fedoraproject.org + contact_groups build-sysadmin-email +} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-11.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-11.cfg new file mode 100644 index 0000000000..81fc04d98c --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-11.cfg @@ -0,0 +1,8 @@ +define host { + alias buildvmhost-11.phx2.fedoraproject.org + host_name buildvmhost-11 + use defaultbuilders + check_command check-host-alive + address buildvmhost-11.phx2.fedoraproject.org + contact_groups build-sysadmin-email +} diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-12.cfg b/roles/nagios_server/files/nagios/hosts/buildvmhost-12.cfg new file mode 100644 index 0000000000..503330d569 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/buildvmhost-12.cfg @@ -0,0 +1,8 @@ +define host { + alias buildvmhost-12.phx2.fedoraproject.org + host_name buildvmhost-12 + use defaultbuilders + check_command check-host-alive + address buildvmhost-12.phx2.fedoraproject.org + contact_groups build-sysadmin-email +} diff --git a/roles/nagios_server/files/nagios/hosts/busgateway01-stg.cfg b/roles/nagios_server/files/nagios/hosts/busgateway01-stg.cfg index 64d0896328..beeabb0a4a 100644 --- a/roles/nagios_server/files/nagios/hosts/busgateway01-stg.cfg +++ b/roles/nagios_server/files/nagios/hosts/busgateway01-stg.cfg @@ -3,5 +3,5 @@ define host { alias busgateway01.stg.phx2.fedoraproject.org use defaulttemplate address busgateway01.stg.phx2.fedoraproject.org - parents virthost11 + parents virthost16 } diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost02.cfg b/roles/nagios_server/files/nagios/hosts/bvirthost02.cfg index dd88cab46d..cc10a2cd9e 100644 --- a/roles/nagios_server/files/nagios/hosts/bvirthost02.cfg +++ b/roles/nagios_server/files/nagios/hosts/bvirthost02.cfg @@ -1,7 +1,7 @@ -define host { - host_name bvirthost02 - alias bvirthost02.phx2.fedoraproject.org - use defaulttemplate - address bvirthost02.phx2.fedoraproject.org - parents fwsm01-gw -} +#define host { +# host_name bvirthost02 +# alias bvirthost02.phx2.fedoraproject.org +# use defaulttemplate +# address bvirthost02.phx2.fedoraproject.org +# parents fwsm01-gw +#} diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost03.cfg b/roles/nagios_server/files/nagios/hosts/bvirthost03.cfg index c642fd119c..37ac05aa49 100644 --- a/roles/nagios_server/files/nagios/hosts/bvirthost03.cfg +++ b/roles/nagios_server/files/nagios/hosts/bvirthost03.cfg @@ -1,7 +1,7 @@ -define host { - host_name bvirthost03 - alias bvirthost03.phx2.fedoraproject.org - use defaulttemplate - address bvirthost03.phx2.fedoraproject.org - parents fwsm01-gw -} +#define host { +# host_name bvirthost03 +# alias bvirthost03.phx2.fedoraproject.org +# use defaulttemplate +# address bvirthost03.phx2.fedoraproject.org +# parents fwsm01-gw +#} diff --git a/roles/nagios_server/files/nagios/hosts/download-ib01.cfg b/roles/nagios_server/files/nagios/hosts/download-ib01.cfg index 5306626731..4cbf4819ff 100644 --- a/roles/nagios_server/files/nagios/hosts/download-ib01.cfg +++ b/roles/nagios_server/files/nagios/hosts/download-ib01.cfg @@ -1,7 +1,7 @@ -define host { - host_name download-ib01 - alias download-ib01.fedoraproject.org - use defaulttemplate - address download-ib01.fedoraproject.org - parents ibiblio01 -} +# define host { +# host_name download-ib01 +# alias download-ib01.fedoraproject.org +# use defaulttemplate +# address download-ib01.fedoraproject.org +# parents ibiblio01 +# } diff --git a/roles/nagios_server/files/nagios/hosts/download-ib02.cfg b/roles/nagios_server/files/nagios/hosts/download-ib02.cfg new file mode 100644 index 0000000000..02ab047f8b --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/download-ib02.cfg @@ -0,0 +1,7 @@ +define host { + host_name download-ib02 + alias download-ib02.fedoraproject.org + use defaulttemplate + address download-ib02.fedoraproject.org + parents ibiblio04 +} diff --git a/roles/nagios_server/files/nagios/hosts/github2fedmsg01.cfg b/roles/nagios_server/files/nagios/hosts/github2fedmsg01.cfg new file mode 100644 index 0000000000..dad5572a7f --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/github2fedmsg01.cfg @@ -0,0 +1,7 @@ +define host { + host_name github2fedmsg01 + alias github2fedmsg01.phx2.fedoraproject.org + use defaulttemplate + address github2fedmsg01.phx2.fedoraproject.org + parents virthost14 +} diff --git a/roles/nagios_server/files/nagios/hosts/ibiblio04.cfg b/roles/nagios_server/files/nagios/hosts/ibiblio04.cfg new file mode 100644 index 0000000000..7afdb25012 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/ibiblio04.cfg @@ -0,0 +1,8 @@ +define host { + host_name ibiblio04 + alias ibiblio04.fedoraproject.org + use defaulttemplate + address ibiblio04.fedoraproject.org + parents ibiblio-gw +} + diff --git a/roles/nagios_server/files/nagios/hosts/imagebuiler.cfg b/roles/nagios_server/files/nagios/hosts/imagebuiler.cfg index 204279b490..e1d54cecdd 100644 --- a/roles/nagios_server/files/nagios/hosts/imagebuiler.cfg +++ b/roles/nagios_server/files/nagios/hosts/imagebuiler.cfg @@ -1,9 +1,9 @@ -define host { - host_name imagebuilder - alias imagebuilder.qa.fedoraproject.org - use defaultbuilders - check_command check-host-alive - address imagebuilder.qa.fedoraproject.org - parents virthost-comm01 - contact_groups build-sysadmin-email -} +#define host { +# host_name imagebuilder +# alias imagebuilder.qa.fedoraproject.org +# use defaultbuilders +# check_command check-host-alive +# address imagebuilder.qa.fedoraproject.org +# parents virthost-comm01 +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio.cfg b/roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio.cfg index d5ae3ae3ef..16e85fc93a 100644 --- a/roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio.cfg +++ b/roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio.cfg @@ -3,5 +3,5 @@ define host { alias mirrorlist-ibiblio.fedoraproject.org use defaulttemplate address mirrorlist-ibiblio.fedoraproject.org - parents ibiblio03 + parents ibiblio04 } diff --git a/roles/nagios_server/files/nagios/hosts/nfs01.cfg b/roles/nagios_server/files/nagios/hosts/nfs01.cfg index 8e2a8f4429..898d34f142 100644 --- a/roles/nagios_server/files/nagios/hosts/nfs01.cfg +++ b/roles/nagios_server/files/nagios/hosts/nfs01.cfg @@ -1,7 +1,7 @@ -define host { - host_name nfs01 - alias nfs01.phx2.fedoraproject.org - use defaulttemplate - address nfs01.phx2.fedoraproject.org - parents bvirthost07 -} +#define host { +# host_name nfs01 +# alias nfs01.phx2.fedoraproject.org +# use defaulttemplate +# address nfs01.phx2.fedoraproject.org +# parents bvirthost07 +#} diff --git a/roles/nagios_server/files/nagios/hosts/pkgdb01.cfg b/roles/nagios_server/files/nagios/hosts/pkgdb01.cfg new file mode 100644 index 0000000000..d8bf8bb265 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/pkgdb01.cfg @@ -0,0 +1,7 @@ +define host { + host_name pkgdb01 + alias pkgdb01.phx2.fedoraproject.org + use defaulttemplate + address pkgdb01.phx2.fedoraproject.org + parents virthost01 +} diff --git a/roles/nagios_server/files/nagios/hosts/pkgdb01.stg.cfg b/roles/nagios_server/files/nagios/hosts/pkgdb01.stg.cfg new file mode 100644 index 0000000000..2e9b93093f --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/pkgdb01.stg.cfg @@ -0,0 +1,7 @@ +define host { + host_name pkgdb01.stg + alias pkgdb01.stg.phx2.fedoraproject.org + use defaulttemplate + address pkgdb01.stg.phx2.fedoraproject.org + parents virthost12 +} diff --git a/roles/nagios_server/files/nagios/hosts/pkgdb02.cfg b/roles/nagios_server/files/nagios/hosts/pkgdb02.cfg new file mode 100644 index 0000000000..25550c06e7 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/pkgdb02.cfg @@ -0,0 +1,7 @@ +define host { + host_name pkgdb02 + alias pkgdb02.phx2.fedoraproject.org + use defaulttemplate + address pkgdb02.phx2.fedoraproject.org + parents virthost03 +} diff --git a/roles/nagios_server/files/nagios/hosts/pkgs01-stg.cfg b/roles/nagios_server/files/nagios/hosts/pkgs01-stg.cfg index 0fb260f3b9..348d6b3a10 100644 --- a/roles/nagios_server/files/nagios/hosts/pkgs01-stg.cfg +++ b/roles/nagios_server/files/nagios/hosts/pkgs01-stg.cfg @@ -3,5 +3,5 @@ define host { alias pkgs01.stg.phx2.fedoraproject.org use defaulttemplate address pkgs01.stg.phx2.fedoraproject.org - parents virthost11 + parents virthost16 } diff --git a/roles/nagios_server/files/nagios/hosts/releng01.cfg b/roles/nagios_server/files/nagios/hosts/releng01.cfg index 07a2e48fe5..e4ecbc953c 100644 --- a/roles/nagios_server/files/nagios/hosts/releng01.cfg +++ b/roles/nagios_server/files/nagios/hosts/releng01.cfg @@ -1,8 +1,8 @@ -define host { - host_name releng01 - alias releng01.phx2.fedoraproject.org - use defaulttemplate - address releng01.phx2.fedoraproject.org - parents buildvmhost-06 - contact_groups build-sysadmin-email -} +#define host { +# host_name releng01 +# alias releng01.phx2.fedoraproject.org +# use defaulttemplate +# address releng01.phx2.fedoraproject.org +# parents buildvmhost-06 +# contact_groups build-sysadmin-email +#} diff --git a/roles/nagios_server/files/nagios/hosts/sundries01.cfg b/roles/nagios_server/files/nagios/hosts/sundries01.cfg new file mode 100644 index 0000000000..b924d13606 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/sundries01.cfg @@ -0,0 +1,7 @@ +define host { + host_name sundries01 + alias sundries01.phx2.fedoraproject.org + use defaulttemplate + address sundries01.phx2.fedoraproject.org + parents virthost03 +} diff --git a/roles/nagios_server/files/nagios/hosts/sundries01.stg.cfg b/roles/nagios_server/files/nagios/hosts/sundries01.stg.cfg new file mode 100644 index 0000000000..bd08eecc4c --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/sundries01.stg.cfg @@ -0,0 +1,7 @@ +define host { + host_name sundries01.stg + alias sundries01.stg.phx2.fedoraproject.org + use defaulttemplate + address sundries01.stg.phx2.fedoraproject.org + parents virthost12 +} diff --git a/roles/nagios_server/files/nagios/hosts/sundries02.cfg b/roles/nagios_server/files/nagios/hosts/sundries02.cfg new file mode 100644 index 0000000000..d03ec69890 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/sundries02.cfg @@ -0,0 +1,7 @@ +define host { + host_name sundries02 + alias sundries02.phx2.fedoraproject.org + use defaulttemplate + address sundries02.phx2.fedoraproject.org + parents virthost01 +} diff --git a/roles/nagios_server/files/nagios/hosts/tagger01.cfg b/roles/nagios_server/files/nagios/hosts/tagger01.cfg new file mode 100644 index 0000000000..c77b4a1c03 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/tagger01.cfg @@ -0,0 +1,7 @@ +define host { + host_name tagger01 + alias tagger01.phx2.fedoraproject.org + use defaulttemplate + address tagger01.phx2.fedoraproject.org + parents virthost01 +} diff --git a/roles/nagios_server/files/nagios/hosts/tagger02.cfg b/roles/nagios_server/files/nagios/hosts/tagger02.cfg new file mode 100644 index 0000000000..8527041409 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/tagger02.cfg @@ -0,0 +1,7 @@ +define host { + host_name tagger02 + alias tagger02.phx2.fedoraproject.org + use defaulttemplate + address tagger02.phx2.fedoraproject.org + parents virthost03 +} diff --git a/roles/nagios_server/files/nagios/hosts/unbound-ib01.cfg b/roles/nagios_server/files/nagios/hosts/unbound-ib01.cfg index 952186548c..8cf230000b 100644 --- a/roles/nagios_server/files/nagios/hosts/unbound-ib01.cfg +++ b/roles/nagios_server/files/nagios/hosts/unbound-ib01.cfg @@ -3,5 +3,5 @@ define host { alias unbound-ib01.fedoraproject.org use defaulttemplate address unbound-ib01.fedoraproject.org - parents ibiblio01 + parents ibiblio04 } diff --git a/roles/nagios_server/files/nagios/hosts/value01.cfg b/roles/nagios_server/files/nagios/hosts/value01.cfg new file mode 100644 index 0000000000..0e02bb169b --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/value01.cfg @@ -0,0 +1,7 @@ +define host { + host_name value01 + alias value01.phx2.fedoraproject.org + use defaulttemplate + address value01.phx2.fedoraproject.org + parents virthost03 +} diff --git a/roles/nagios_server/files/nagios/hosts/value03.cfg b/roles/nagios_server/files/nagios/hosts/value03.cfg index ff20980919..4243aaa7a5 100644 --- a/roles/nagios_server/files/nagios/hosts/value03.cfg +++ b/roles/nagios_server/files/nagios/hosts/value03.cfg @@ -1,7 +1,7 @@ -define host { - host_name value03 - alias value03.phx2.fedoraproject.org - use defaulttemplate - address value03.phx2.fedoraproject.org - parents virthost07 -} +#define host { +# host_name value03 +# alias value03.phx2.fedoraproject.org +# use defaulttemplate +# address value03.phx2.fedoraproject.org +# parents virthost07 +#} diff --git a/roles/nagios_server/files/nagios/hosts/virthost11.cfg b/roles/nagios_server/files/nagios/hosts/virthost11.cfg index 26f852daf8..0714434eef 100644 --- a/roles/nagios_server/files/nagios/hosts/virthost11.cfg +++ b/roles/nagios_server/files/nagios/hosts/virthost11.cfg @@ -1,7 +1,7 @@ -define host { - host_name virthost11 - alias virthost11.phx2.fedoraproject.org - use defaulttemplate - address virthost11.phx2.fedoraproject.org - parents fwsm01-gw -} +# define host { +# host_name virthost11 +# alias virthost11.phx2.fedoraproject.org +# use defaulttemplate +# address virthost11.phx2.fedoraproject.org +# parents fwsm01-gw +# } diff --git a/roles/nagios_server/files/nagios/hosts/virthost16.cfg b/roles/nagios_server/files/nagios/hosts/virthost16.cfg new file mode 100644 index 0000000000..0a6cb23fcb --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/virthost16.cfg @@ -0,0 +1,7 @@ +define host { + host_name virthost16 + alias virthost16.phx2.fedoraproject.org + use defaulttemplate + address virthost16.phx2.fedoraproject.org + parents fwsm01-gw +} diff --git a/roles/nagios_server/files/nagios/hosts/wiki01.cfg b/roles/nagios_server/files/nagios/hosts/wiki01.cfg new file mode 100644 index 0000000000..60339bf270 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/wiki01.cfg @@ -0,0 +1,7 @@ +define host { + host_name wiki01 + alias wiki01.phx2.fedoraproject.org + use defaulttemplate + address wiki01.phx2.fedoraproject.org + parents virthost03 +} diff --git a/roles/nagios_server/files/nagios/hosts/wiki01.stg.cfg b/roles/nagios_server/files/nagios/hosts/wiki01.stg.cfg new file mode 100644 index 0000000000..9e10797b92 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/wiki01.stg.cfg @@ -0,0 +1,7 @@ +define host { + host_name wiki01.stg + alias wiki01.stg.phx2.fedoraproject.org + use defaulttemplate + address wiki01.stg.phx2.fedoraproject.org + parents virthost12 +} diff --git a/roles/nagios_server/files/nagios/hosts/wiki02.cfg b/roles/nagios_server/files/nagios/hosts/wiki02.cfg new file mode 100644 index 0000000000..43afaa0f80 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/wiki02.cfg @@ -0,0 +1,7 @@ +define host { + host_name wiki02 + alias wiki02.phx2.fedoraproject.org + use defaulttemplate + address wiki02.phx2.fedoraproject.org + parents virthost01 +} diff --git a/roles/nagios_server/files/nagios/misccommands.cfg b/roles/nagios_server/files/nagios/misccommands.cfg index 18951aca35..3546713c09 100644 --- a/roles/nagios_server/files/nagios/misccommands.cfg +++ b/roles/nagios_server/files/nagios/misccommands.cfg @@ -68,7 +68,7 @@ define command{ # 'host-notify-by-ircbot' command definition define command{ command_name host-notify-by-ircbot - command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTALIAS$ is $HOSTSTATE$: $HOSTOUTPUT$ ($$(hostname -s))" | nc -w 1 value03 5050 + command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTALIAS$ is $HOSTSTATE$: $HOSTOUTPUT$ ($$(hostname -s))" | /usr/local/bin/irc-colorize.py | nc -w 1 value01 5050 } # 'notify-by-email' command definition @@ -82,7 +82,7 @@ define command{ # 'notify-by-ircbot' command definition define command{ command_name notify-by-ircbot - command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$: $SERVICEOUTPUT$ ($$(hostname -s))" | nc -w 1 value03 5050 + command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$: $SERVICEOUTPUT$ ($$(hostname -s))" | /usr/local/bin/irc-colorize.py | nc -w 1 value01 5050 } # 'notify-by-xmpp' command definition diff --git a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg index 1f22d88944..419db4c4a9 100644 --- a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg @@ -17,56 +17,28 @@ define servicedependency { } define servicedependency { - host_name app01 + host_name pkgdb01 service_description nrpe - dependent_host_name app01 - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Disk Space /boot, Swap, Total Processes, Zombie Processes + dependent_host_name pkgdb01 + 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 app02 + host_name pkgdb02 service_description nrpe - dependent_host_name app02 - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Disk Space /boot, Swap, Total Processes, Zombie Processes + dependent_host_name pkgdb02 + 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 app03 + host_name pkgdb01.stg service_description nrpe - dependent_host_name app03 - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Disk Space /boot, Swap, Total Processes, Zombie Processes - notification_failure_criteria w,c - execution_failure_criteria w,c -} - -define servicedependency { - host_name app04 - service_description nrpe - dependent_host_name app04 - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Disk Space /boot, Swap, Total Processes, Zombie Processes - notification_failure_criteria w,c - execution_failure_criteria w,c -} - -define servicedependency { - host_name app05 - service_description nrpe - dependent_host_name app05 - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Disk Space /boot, Swap, Total Processes, Zombie Processes - notification_failure_criteria w,c - execution_failure_criteria w,c -} - - -define servicedependency { - host_name app08 - service_description nrpe - dependent_host_name app08 - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Disk Space /boot, Swap, Total Processes, Zombie Processes + dependent_host_name pkgdb01.stg + dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes notification_failure_criteria w,c execution_failure_criteria w,c } @@ -125,11 +97,65 @@ define servicedependency { execution_failure_criteria w,c } +define servicedependency { + host_name sundries01 + service_description nrpe + dependent_host_name sundries01 + 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.stg + service_description nrpe + dependent_host_name sundries01.stg + 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 sundries02 + service_description nrpe + dependent_host_name sundries02 + 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 wiki01 + service_description nrpe + dependent_host_name wiki01 + 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 wiki01.stg + service_description nrpe + dependent_host_name wiki01.stg + 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 wiki02 + service_description nrpe + dependent_host_name wiki02 + 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 packages03 service_description packages-internal dependent_host_name packages03 - dependent_service_description packages-internal-relationshiptab, packages-internal-bugstab + dependent_service_description packages-internal-bugstab notification_failure_criteria w,c execution_failure_criteria w,c } @@ -138,7 +164,7 @@ define servicedependency { host_name packages04 service_description packages-internal dependent_host_name packages04 - dependent_service_description packages-internal-relationshiptab, packages-internal-bugstab + dependent_service_description packages-internal-bugstab notification_failure_criteria w,c execution_failure_criteria w,c } diff --git a/roles/nagios_server/files/nagios/servicegroups/autoqa.cfg b/roles/nagios_server/files/nagios/servicegroups/autoqa.cfg index fbd2873393..22995245c6 100644 --- a/roles/nagios_server/files/nagios/servicegroups/autoqa.cfg +++ b/roles/nagios_server/files/nagios/servicegroups/autoqa.cfg @@ -1,5 +1,5 @@ define servicegroup { servicegroup_name autoqa alias AutoQA Hosts - members autoqa01,autoqa01-autotest-frontend,autoqa-stg01,autoqa-stg01-autotest-frontend + members autoqa01,autoqa01-autotest-frontend } diff --git a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg index 2877b0debf..175614096a 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-wildcard,bodhi,proxy02-wildcard,bodhi,proxy03-wildcard,bodhi,proxy04-wildcard,bodhi,proxy06-wildcard,bodhi,proxy07-wildcard,bodhi,proxy08-wildcard,bodhi,app01,bodhi-internal,app02,bodhi-internal,app03,bodhi-internal,app04,bodhi-internal,app05,bodhi-internal,app08,bodhi-internal,proxy09-wildcard,bodhi + members proxy01-wildcard,bodhi,proxy02-wildcard,bodhi,proxy03-wildcard,bodhi,proxy04-wildcard,bodhi,proxy06-wildcard,bodhi,proxy07-wildcard,bodhi,proxy08-wildcard,bodhi,proxy09-wildcard,bodhi,bodhi01,bodhi-internal,bodhi02,bodhi-internal } diff --git a/roles/nagios_server/files/nagios/servicegroups/freemedia.cfg b/roles/nagios_server/files/nagios/servicegroups/freemedia.cfg index 4b6d58cf05..e88f0b3e1e 100644 --- a/roles/nagios_server/files/nagios/servicegroups/freemedia.cfg +++ b/roles/nagios_server/files/nagios/servicegroups/freemedia.cfg @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name freemedia alias FreeMedia - members app01,freemedia-internal,app02,freemedia-internal,app03,freemedia-internal,app04,freemedia-internal,app05,freemedia-internal,app08,freemedia-internal + members sundries01,freemedia-internal,sundries02,freemedia-internal } diff --git a/roles/nagios_server/files/nagios/servicegroups/mgmt-http.cfg b/roles/nagios_server/files/nagios/servicegroups/mgmt-http.cfg index 0f5426445b..67d5307940 100644 --- a/roles/nagios_server/files/nagios/servicegroups/mgmt-http.cfg +++ b/roles/nagios_server/files/nagios/servicegroups/mgmt-http.cfg @@ -1,5 +1,5 @@ define servicegroup { servicegroup_name mgmt-http alias mgmt interfaces on http - members backup03-mgmt,backup03-mgmt-http,bc02-mgmt,bc02-mgmt-http,bvirthost01-mgmt,bvirthost01-mgmt-http,bvirthost05-mgmt,bvirthost05-mgmt-http,bvirthost07-mgmt,bvirthost07-mgmt-http,download01-mgmt,download01-mgmt-http,download02-mgmt,download02-mgmt-http,download03-mgmt,download03-mgmt-http,download04-mgmt,download04-mgmt-http,download05-mgmt,download05-mgmt-http,qa01-mgmt,qa01-mgmt-http,qa02-mgmt,qa02-mgmt-http,qa03-mgmt,qa03-mgmt-http,qa04-mgmt,qa04-mgmt-http,qa05-mgmt,qa05-mgmt-http,qa06-mgmt,qa06-mgmt-http,qa07-mgmt,qa07-mgmt-http,qa08-mgmt,qa08-mgmt-http,tape02-mgmt,tape02-mgmt-http,virthost-comm01-mgmt,virthost-comm01-mgmt-http,virthost01-mgmt,virthost01-mgmt-http,virthost02-mgmt,virthost02-mgmt-http,virthost03-mgmt,virthost03-mgmt-http,virthost11-mgmt,virthost11-mgmt-http,virthost12-mgmt,virthost12-mgmt-http,virthost14-mgmt,virthost14-mgmt-http,virthost15-mgmt,virthost15-mgmt-http,virthost-comm02-mgmt,virthost-comm02-mgmt-http,sign-vault03-mgmt,sign-vault03-mgmt-http,sign-vault04-mgmt,sign-vault04-mgmt-http + members backup03-mgmt,backup03-mgmt-http,bc02-mgmt,bc02-mgmt-http,bvirthost01-mgmt,bvirthost01-mgmt-http,bvirthost05-mgmt,bvirthost05-mgmt-http,bvirthost07-mgmt,bvirthost07-mgmt-http,download01-mgmt,download01-mgmt-http,download02-mgmt,download02-mgmt-http,download03-mgmt,download03-mgmt-http,download04-mgmt,download04-mgmt-http,download05-mgmt,download05-mgmt-http,qa01-mgmt,qa01-mgmt-http,qa02-mgmt,qa02-mgmt-http,qa03-mgmt,qa03-mgmt-http,qa04-mgmt,qa04-mgmt-http,qa05-mgmt,qa05-mgmt-http,qa06-mgmt,qa06-mgmt-http,qa07-mgmt,qa07-mgmt-http,qa08-mgmt,qa08-mgmt-http,tape02-mgmt,tape02-mgmt-http,virthost-comm01-mgmt,virthost-comm01-mgmt-http,virthost01-mgmt,virthost01-mgmt-http,virthost02-mgmt,virthost02-mgmt-http,virthost03-mgmt,virthost03-mgmt-http,atomic01-mgmt,atomic01-mgmt-http,virthost12-mgmt,virthost12-mgmt-http,virthost14-mgmt,virthost14-mgmt-http,virthost15-mgmt,virthost15-mgmt-http,virthost-comm02-mgmt,virthost-comm02-mgmt-http,sign-vault03-mgmt,sign-vault03-mgmt-http,sign-vault04-mgmt,sign-vault04-mgmt-http } diff --git a/roles/nagios_server/files/nagios/servicegroups/mgmt-https.cfg b/roles/nagios_server/files/nagios/servicegroups/mgmt-https.cfg index 98075dfa38..d1021c32d9 100644 --- a/roles/nagios_server/files/nagios/servicegroups/mgmt-https.cfg +++ b/roles/nagios_server/files/nagios/servicegroups/mgmt-https.cfg @@ -1,5 +1,5 @@ define servicegroup { servicegroup_name mgmt-https alias mgmt interfaces on https - members backup03-mgmt,backup03-mgmt-https,bc02-mgmt,bc02-mgmt-https,bvirthost01-mgmt,bvirthost01-mgmt-https,bvirthost05-mgmt,bvirthost05-mgmt-https,bvirthost07-mgmt,bvirthost07-mgmt-https,download01-mgmt,download01-mgmt-https,download02-mgmt,download02-mgmt-https,download03-mgmt,download03-mgmt-https,download04-mgmt,download04-mgmt-https,download05-mgmt,download05-mgmt-https,qa01-mgmt,qa01-mgmt-https,qa02-mgmt,qa02-mgmt-https,qa03-mgmt,qa03-mgmt-https,qa04-mgmt,qa04-mgmt-https,qa05-mgmt,qa05-mgmt-https,qa06-mgmt,qa06-mgmt-https,qa07-mgmt,qa07-mgmt-https,qa08-mgmt,qa08-mgmt-https,virthost-comm01-mgmt,virthost-comm01-mgmt-https,virthost01-mgmt,virthost01-mgmt-https,virthost02-mgmt,virthost02-mgmt-https,virthost03-mgmt,virthost03-mgmt-https,virthost11-mgmt,virthost11-mgmt-https,virthost12-mgmt,virthost12-mgmt-https,virthost14-mgmt,virthost14-mgmt-https,virthost15-mgmt,virthost15-mgmt-https,virthost-comm02-mgmt,virthost-comm02-mgmt-https,sign-vault03-mgmt,sign-vault03-mgmt-https,sign-vault04-mgmt,sign-vault04-mgmt-https + members backup03-mgmt,backup03-mgmt-https,bc02-mgmt,bc02-mgmt-https,bvirthost01-mgmt,bvirthost01-mgmt-https,bvirthost05-mgmt,bvirthost05-mgmt-https,bvirthost07-mgmt,bvirthost07-mgmt-https,download01-mgmt,download01-mgmt-https,download02-mgmt,download02-mgmt-https,download03-mgmt,download03-mgmt-https,download04-mgmt,download04-mgmt-https,download05-mgmt,download05-mgmt-https,qa01-mgmt,qa01-mgmt-https,qa02-mgmt,qa02-mgmt-https,qa03-mgmt,qa03-mgmt-https,qa04-mgmt,qa04-mgmt-https,qa05-mgmt,qa05-mgmt-https,qa06-mgmt,qa06-mgmt-https,qa07-mgmt,qa07-mgmt-https,qa08-mgmt,qa08-mgmt-https,virthost-comm01-mgmt,virthost-comm01-mgmt-https,virthost01-mgmt,virthost01-mgmt-https,virthost02-mgmt,virthost02-mgmt-https,virthost03-mgmt,virthost03-mgmt-https,atomic01-mgmt,atomic01-mgmt-https,virthost12-mgmt,virthost12-mgmt-https,virthost14-mgmt,virthost14-mgmt-https,virthost15-mgmt,virthost15-mgmt-https,virthost-comm02-mgmt,virthost-comm02-mgmt-https,sign-vault03-mgmt,sign-vault03-mgmt-https,sign-vault04-mgmt,sign-vault04-mgmt-https } diff --git a/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg b/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg index b00f4068ff..2bd60e6032 100644 --- a/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg +++ b/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name pkgdb alias Package Database - members proxy01-wildcard,pkgdb-external,proxy02-wildcard,pkgdb-external,proxy03-wildcard,pkgdb-external,proxy04-wildcard,pkgdb-external,proxy08-wildcard,pkgdb-external,app01,pkgdb-internal,app02,pkgdb-internal,app03,pkgdb-internal,app04,pkgdb-internal,app05,pkgdb-internal,app08,pkgdb-internal,db01,Check PackageDB DB,proxy09-wildcard,pkgdb-external + members proxy01-wildcard,pkgdb-external,proxy02-wildcard,pkgdb-external,proxy03-wildcard,pkgdb-external,proxy04-wildcard,pkgdb-external,proxy08-wildcard,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,db01,Check PackageDB DB,proxy09-wildcard,pkgdb-external } diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg index ca435400e2..e8c9c28db4 100644 --- a/roles/nagios_server/files/nagios/services/disk.cfg +++ b/roles/nagios_server/files/nagios/services/disk.cfg @@ -14,7 +14,7 @@ define service { #} define service { - host_name app01, app02, app03, app04, app05, app08, noc01, proxy01, proxy02, releng02, db01 + host_name noc01, proxy01, proxy02, releng02, db01 service_description Disk Space /boot check_command check_by_nrpe!check_disk_/boot use disktemplate @@ -41,12 +41,12 @@ define service { use disktemplate } -define service { - host_name nfs01 - service_description Disk space /mnt/koji - check_command check_by_nrpe!check_disk_/mnt/koji - use disktemplate -} +#define service { +# host_name nfs01 +# service_description Disk space /mnt/koji +# check_command check_by_nrpe!check_disk_/mnt/koji +# use disktemplate +#} define service { host_name pkgs01 diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg index f1bf080860..c4fbe81931 100644 --- a/roles/nagios_server/files/nagios/services/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg @@ -1,68 +1,61 @@ define service { - host_name app01 - service_description Check fedmsg-relay - check_command check_by_nrpe!check_fedmsg_relay_proc - use defaulttemplate -} - -define service { - host_name value03 - service_description Check fedmsg-irc + host_name value01 + service_description Check for fedmsg-irc proc check_command check_by_nrpe!check_fedmsg_irc_proc use defaulttemplate } define service { host_name busgateway01 - service_description Check fedmsg-hub + service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { host_name busgateway01 - service_description Check fedmsg-gateway + service_description Check for fedmsg-gateway proc check_command check_by_nrpe!check_fedmsg_gateway_proc use defaulttemplate } define service { host_name busgateway01 - service_description Check fedmsg-relay + service_description Check for fedmsg-relay proc check_command check_by_nrpe!check_fedmsg_relay_proc use defaulttemplate } define service { host_name badges-backend01 - service_description Check fedmsg-hub + service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { host_name summershum01 - service_description Check fedmsg-hub + service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { host_name notifs-backend01 - service_description Check fedmsg-hub + service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { host_name pkgs01 - service_description Check fedmsg-hub + service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { - host_name value03 + host_name value01 service_description Check supybot fedmsg plugin check_command check_by_nrpe!check_supybot_fedmsg_plugin use defaulttemplate @@ -189,3 +182,171 @@ define service { # check_command check_by_nrpe!check_datanommer_summershum # use defaulttemplate #} + +define service { + host_name busgateway01 + service_description Check fedmsg consumers and producers hub + check_command check_by_nrpe!check_fedmsg_cp_busgateway_hub + use defaulttemplate +} + +define service { + host_name busgateway01 + service_description Check fedmsg consumers and producers relay + check_command check_by_nrpe!check_fedmsg_cp_busgateway_relay + use defaulttemplate +} + +define service { + host_name busgateway01 + service_description Check fedmsg consumers and producers gateway + check_command check_by_nrpe!check_fedmsg_cp_busgateway_gateway + use defaulttemplate +} + +define service { + host_name value01 + service_description Check fedmsg consumers and producers irc + check_command check_by_nrpe!check_fedmsg_cp_value + use defaulttemplate +} + +define service { + host_name pkgs01 + service_description Check fedmsg consumers and producers hub + check_command check_by_nrpe!check_fedmsg_cp_pkgs + use defaulttemplate +} + +define service { + host_name summershum01 + service_description Check fedmsg consumers and producers hub + check_command check_by_nrpe!check_fedmsg_cp_summershum + use defaulttemplate +} + +define service { + host_name badges-backend01 + service_description Check fedmsg consumers and producers hub + check_command check_by_nrpe!check_fedmsg_cp_badges_backend + use defaulttemplate +} + +define service { + host_name notifs-backend01 + service_description Check fedmsg consumers and producers hub + check_command check_by_nrpe!check_fedmsg_cp_notifs_backend + use defaulttemplate +} + +define service { + host_name busgateway01 + service_description Check fedmsg-hub consumers exceptions + check_command check_by_nrpe!check_fedmsg_cexceptions_busgateway_hub + use defaulttemplate +} + +define service { + host_name busgateway01 + service_description Check fedmsg-relay consumers exceptions + check_command check_by_nrpe!check_fedmsg_cexceptions_busgateway_relay + use defaulttemplate +} + +define service { + host_name busgateway01 + service_description Check fedmsg-gateway consumers exceptions + check_command check_by_nrpe!check_fedmsg_cexceptions_busgateway_gateway + use defaulttemplate +} + +define service { + host_name value01 + service_description Check fedmsg-irc consumers exceptions + check_command check_by_nrpe!check_fedmsg_cexceptions_value + use defaulttemplate +} + +define service { + host_name pkgs01 + service_description Check fedmsg-hub consumers exceptions + check_command check_by_nrpe!check_fedmsg_cexceptions_pkgs + use defaulttemplate +} + +define service { + host_name summershum01 + service_description Check fedmsg-hub consumers exceptions + check_command check_by_nrpe!check_fedmsg_cexceptions_summershum + use defaulttemplate +} + +define service { + host_name badges-backend01 + service_description Check fedmsg-hub consumers exceptions + check_command check_by_nrpe!check_fedmsg_cexceptions_badges_backend + use defaulttemplate +} + +define service { + host_name notifs-backend01 + service_description Check fedmsg-hub consumers exceptions + check_command check_by_nrpe!check_fedmsg_cexceptions_notifs_backend + use defaulttemplate +} + +define service { + host_name busgateway01 + service_description Check fedmsg-hub consumers backlog + check_command check_by_nrpe!check_fedmsg_cbacklog_busgateway_hub + use defaulttemplate +} + +define service { + host_name busgateway01 + service_description Check fedmsg-relay consumers backlog + check_command check_by_nrpe!check_fedmsg_cbacklog_busgateway_relay + use defaulttemplate +} + +define service { + host_name busgateway01 + service_description Check fedmsg-gateway consumers backlog + check_command check_by_nrpe!check_fedmsg_cbacklog_busgateway_gateway + use defaulttemplate +} + +define service { + host_name value01 + service_description Check fedmsg-irc consumers backlog + check_command check_by_nrpe!check_fedmsg_cbacklog_value + use defaulttemplate +} + +define service { + host_name pkgs01 + service_description Check fedmsg-hub consumers backlog + check_command check_by_nrpe!check_fedmsg_cbacklog_pkgs + use defaulttemplate +} + +define service { + host_name summershum01 + service_description Check fedmsg-hub consumers backlog + check_command check_by_nrpe!check_fedmsg_cbacklog_summershum + use defaulttemplate +} + +define service { + host_name badges-backend01 + service_description Check fedmsg-hub consumers backlog + check_command check_by_nrpe!check_fedmsg_cbacklog_badges_backend + use defaulttemplate +} + +define service { + host_name notifs-backend01 + service_description Check fedmsg-hub consumers backlog + check_command check_by_nrpe!check_fedmsg_cbacklog_notifs_backend + use defaulttemplate +} diff --git a/roles/nagios_server/files/nagios/services/mgmt.cfg b/roles/nagios_server/files/nagios/services/mgmt.cfg index a4c4886e37..23967c4b89 100644 --- a/roles/nagios_server/files/nagios/services/mgmt.cfg +++ b/roles/nagios_server/files/nagios/services/mgmt.cfg @@ -183,9 +183,9 @@ define service { } define service { - host_name virthost11-mgmt - service_description virthost11-mgmt-http - check_command check_http!virthost11-mgmt.phx2.fedoraproject.org + host_name atomic01-mgmt + service_description atomic01-mgmt-http + check_command check_http!atomic01-mgmt.phx2.fedoraproject.org use defaulttemplate } @@ -404,9 +404,9 @@ define service { } define service { - host_name virthost11-mgmt - service_description virthost11-mgmt-https - check_command check_https!virthost11-mgmt.phx2.fedoraproject.org + host_name atomic01-mgmt + service_description atomic01-mgmt-https + check_command check_https!atomic01-mgmt.phx2.fedoraproject.org use defaulttemplate } diff --git a/roles/nagios_server/files/nagios/services/nrpe.cfg b/roles/nagios_server/files/nagios/services/nrpe.cfg index f516eca3c2..26ea253b7b 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, hosted04, app01, app02, app03, app04, app05, app08, backup02, bapp02, bastion02, bastion01, bastion-vpn, bodhost01, bvirthost05 + host_name hosted03, hosted04, backup02, bapp02, bastion02, bastion01, bastion-vpn, bodhost01, bvirthost05, 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/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg index de9d60e807..c52c167f45 100644 --- a/roles/nagios_server/files/nagios/services/websites.cfg +++ b/roles/nagios_server/files/nagios/services/websites.cfg @@ -36,7 +36,7 @@ define service { } define service { - host_name app01,app02,app03,app04,app05,app08 + host_name pkgdb01,pkgdb02,pkgdb01.stg service_description pkgdb-internal check_command check_website!localhost!/pkgdb/collections/!EPEL use internalwebsitetemplate @@ -73,13 +73,31 @@ define service { } define service { - host_name app01,app02,app03,app04,app05,app08 + host_name bodhi01,bodhi02 service_description bodhi-internal check_command check_website!localhost!/updates/!Latest max_check_attempts 8 use internalwebsitetemplate } +define service { + host_name github2fedmsg01 + service_description github2fedmsg-internal + check_command check_website!localhost!/github2fedmsg/!stuff + max_check_attempts 8 + use internalwebsitetemplate + event_handler restart_httpd +} + +define service { + host_name tagger01,tagger02 + service_description tagger-internal + check_command check_website!localhost!/tagger/!Tagger + max_check_attempts 8 + use internalwebsitetemplate + event_handler restart_httpd +} + define service { host_name packages03,packages04 service_description packages-internal @@ -89,13 +107,17 @@ define service { event_handler restart_httpd } -define service { - host_name packages03,packages04 - service_description packages-internal-relationshiptab - check_command check_website!localhost!/packages/fcomm_connector/yum/query/query_provides/%7B%22filters%22:%7B%22package%22:%22nethack%22,%22version%22:%223.4.3-26.fc17%22,%22repo%22:%22Rawhide%22,%22arch%22:%22x86_64%22%7D,%22rows_per_page%22:10,%22start_row%22:0%7D!total_rows - max_check_attempts 8 - use internalwebsitetemplate -} +# Commenting out this service check. It always goes down. +# Someday, when we're on rhel7 with dnf, we're going to rewrite the feature in +# fedora-packages to not use yum and hopefully be more stable. At that point, +# we can reintroduce this. +#define service { +# host_name packages03,packages04 +# service_description packages-internal-relationshiptab +# check_command check_website!localhost!/packages/fcomm_connector/yum/query/query_provides/%7B%22filters%22:%7B%22package%22:%22nethack%22,%22version%22:%223.4.3-26.fc17%22,%22repo%22:%22Rawhide%22,%22arch%22:%22x86_64%22%7D,%22rows_per_page%22:10,%22start_row%22:0%7D!total_rows +# max_check_attempts 8 +# use internalwebsitetemplate +#} define service { host_name packages03,packages04 @@ -139,13 +161,12 @@ define service { use websitetemplate } define service { - host_name app01,app02,app03,app04,app05,app08 + host_name sundries01,sundries02 service_description freemedia-internal check_command check_website!localhost!/freemedia/FreeMedia-form.html!Media use internalwebsitetemplate } - define service { host_name releng04 service_description releng04-internal @@ -167,12 +188,12 @@ define service { use autoqatemplate } -define service { - host_name autoqa-stg01 - service_description autoqa-stg01-autotest-frontend - check_command check_website!autoqa-stg01.qa.fedoraproject.org!/afe/!Autotest Frontend - use autoqatemplate -} +#define service { +# host_name autoqa-stg01 +# service_description autoqa-stg01-autotest-frontend +# check_command check_website!autoqa-stg01.qa.fedoraproject.org!/afe/!Autotest Frontend +# use autoqatemplate +#} define service { host_name ppc-hub diff --git a/roles/nagios_server/files/nrpe.cfg b/roles/nagios_server/files/nrpe.cfg index c74f34fa5d..bdcf6ca06f 100644 --- a/roles/nagios_server/files/nrpe.cfg +++ b/roles/nagios_server/files/nrpe.cfg @@ -273,6 +273,36 @@ command[check_datanommer_mailman]=/usr/lib/nagios/plugins/check_datanommer_times command[check_datanommer_cnucnuweb]=/usr/lib/nagios/plugins/check_datanommer_timesince.py cnucnuweb 604800 1814400 command[check_datanommer_summershum]=/usr/lib/nagios/plugins/check_datanommer_timesince.py summershum 604800 1814400 +# Fedmsg checks for consumers and producers +command[check_fedmsg_cp_busgateway_hub]=/usr/lib/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub Nommer MonitoringProducer +command[check_fedmsg_cp_busgateway_relay]=/usr/lib/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-relay RelayConsumer MonitoringProducer +command[check_fedmsg_cp_busgateway_gateway]=/usr/lib/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-gateway GatewayConsumer MonitoringProducer +command[check_fedmsg_cp_app]=/usr/lib/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-relay RelayConsumer MonitoringProducer +command[check_fedmsg_cp_value]=/usr/lib/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-irc IRCBotConsumer MonitoringProducer +command[check_fedmsg_cp_pkgs]=/usr/lib/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub GenACLsConsumer MonitoringProducer +command[check_fedmsg_cp_summershum]=/usr/lib/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub SummerShumConsumer MonitoringProducer +command[check_fedmsg_cp_badges_backend]=/usr/lib/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub FedoraBadgesConsumer MonitoringProducer +command[check_fedmsg_cp_notifs_backend]=/usr/lib/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub FMNConsumer DigestProducer ConfirmationProducer MonitoringProducer + +command[check_fedmsg_cexceptions_busgateway_hub]=/usr/lib/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub Nommer 1 10 +command[check_fedmsg_cexceptions_busgateway_relay]=/usr/lib/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-relay RelayConsumer 1 10 +command[check_fedmsg_cexceptions_busgateway_gateway]=/usr/lib/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-gateway GatewayConsumer 1 10 +command[check_fedmsg_cexceptions_app]=/usr/lib/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-relay RelayConsumer 1 10 +command[check_fedmsg_cexceptions_value]=/usr/lib/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-irc IRCBotConsumer 1 10 +command[check_fedmsg_cexceptions_pkgs]=/usr/lib/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub GenACLsConsumer 1 10 +command[check_fedmsg_cexceptions_summershum]=/usr/lib/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub SummerShumConsumer 1 10 +command[check_fedmsg_cexceptions_badges_backend]=/usr/lib/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub FedoraBadgesConsumer 1 10 +command[check_fedmsg_cexceptions_notifs_backend]=/usr/lib/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub FMNConsumer 1 10 + +command[check_fedmsg_cbacklog_busgateway_hub]=/usr/lib/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub Nommer 50 100 +command[check_fedmsg_cbacklog_busgateway_relay]=/usr/lib/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-relay RelayConsumer 10 50 +command[check_fedmsg_cbacklog_busgateway_gateway]=/usr/lib/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-gateway GatewayConsumer 10 50 +command[check_fedmsg_cbacklog_app]=/usr/lib/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-relay RelayConsumer 10 50 +command[check_fedmsg_cbacklog_value]=/usr/lib/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-irc IRCBotConsumer 10 50 +command[check_fedmsg_cbacklog_pkgs]=/usr/lib/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub GenACLsConsumer 10 50 +command[check_fedmsg_cbacklog_summershum]=/usr/lib/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub SummerShumConsumer 10 50 +command[check_fedmsg_cbacklog_badges_backend]=/usr/lib/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub FedoraBadgesConsumer 10 50 +command[check_fedmsg_cbacklog_notifs_backend]=/usr/lib/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub FMNConsumer 10 50 # The following are 'action commands' where by an actual action is performed # like restarting httpd diff --git a/roles/nagios_server/files/plugins/check_fedmsg_consumer_backlog.py b/roles/nagios_server/files/plugins/check_fedmsg_consumer_backlog.py new file mode 100644 index 0000000000..0b9da670ea --- /dev/null +++ b/roles/nagios_server/files/plugins/check_fedmsg_consumer_backlog.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python + +import json +import os +import socket +import sys +import zmq + +try: + service = sys.argv[1] + check_consumer = sys.argv[2] + backlog_warning = int(sys.argv[3]) + backlog_critical = int(sys.argv[4]) + fname = '/var/run/fedmsg/monitoring-%s.socket' % service + + if not os.path.exists(fname): + print "UNKNOWN - %s does not exist" % fname + sys.exit(3) + + connect_to = "ipc:///%s" % fname + ctx = zmq.Context() + s = ctx.socket(zmq.SUB) + s.connect(connect_to) + s.setsockopt(zmq.SUBSCRIBE, '') + + poller = zmq.Poller() + poller.register(s, zmq.POLLIN) + + timeout = 10000 + + events = dict(poller.poll(timeout)) + if s in events and events[s] == zmq.POLLIN: + msg = s.recv() + msg = json.loads(msg) + else: + print 'UNKNOWN - ZMQ timeout. No message received in %i ms' % timeout + sys.exit(3) + + for consumer in msg['consumers']: + if consumer['name'] == check_consumer: + if consumer['backlog'] is None: + print 'ERROR: fedmsg consumer %s is not initialized' % consumer['name'] + sys.exit(3) + elif consumer['backlog'] > backlog_critical: + print 'CRITICAL: fedmsg consumer %s backlog value is %i' % (consumer['name'],consumer['backlog']) + sys.exit(2) + elif consumer['backlog'] > backlog_warning: + print 'WARNING: fedmsg consumer %s backlog value is %i' % (consumer['name'],consumer['backlog']) + sys.exit(1) + else: + print 'OK: fedmsg consumer %s backlog value is %i' % (consumer['name'],consumer['backlog']) + sys.exit(0) + + print "UNKNOWN: fedmsg consumer %s not found" % check_consumer + sys.exit(3) +except Exception as err: + print "UNKNOWN:", str(err) + sys.exit(3) diff --git a/roles/nagios_server/files/plugins/check_fedmsg_consumer_exceptions.py b/roles/nagios_server/files/plugins/check_fedmsg_consumer_exceptions.py new file mode 100644 index 0000000000..630e877410 --- /dev/null +++ b/roles/nagios_server/files/plugins/check_fedmsg_consumer_exceptions.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python + +import json +import os +import socket +import sys +import zmq + +try: + service = sys.argv[1] + check_consumer = sys.argv[2] + exceptions_warning = int(sys.argv[3]) + exceptions_critical = int(sys.argv[4]) + fname = '/var/run/fedmsg/monitoring-%s.socket' % service + + if not os.path.exists(fname): + print "UNKNOWN - %s does not exist" % fname + sys.exit(3) + + connect_to = "ipc:///%s" % fname + ctx = zmq.Context() + s = ctx.socket(zmq.SUB) + s.connect(connect_to) + s.setsockopt(zmq.SUBSCRIBE, '') + poller = zmq.Poller() + poller.register(s, zmq.POLLIN) + + timeout = 10000 + + events = dict(poller.poll(timeout)) + if s in events and events[s] == zmq.POLLIN: + msg = s.recv() + msg = json.loads(msg) + else: + print 'UNKNOWN - ZMQ timeout. No message received in %i ms' % timeout + sys.exit(3) + + for consumer in msg['consumers']: + if consumer['name'] == check_consumer: + if consumer['exceptions'] > exceptions_critical: + print 'CRITICAL: fedmsg consumer %s exceptions value is %i' % (consumer['name'],consumer['exceptions']) + sys.exit(2) + elif consumer['exceptions'] > exceptions_warning: + print 'WARNING: fedmsg consumer %s exceptions value is %i' % (consumer['name'],consumer['exceptions']) + sys.exit(1) + else: + print 'OK: fedmsg consumer %s exceptions value is %i' % (consumer['name'],consumer['exceptions']) + sys.exit(0) + + print "UNKNOWN: fedmsg consumers %s not found" % check_consumer + sys.exit(3) +except Exception as err: + print "UNKNOWN:", str(err) + sys.exit(3) diff --git a/roles/nagios_server/files/plugins/check_fedmsg_producers_consumers.py b/roles/nagios_server/files/plugins/check_fedmsg_producers_consumers.py new file mode 100644 index 0000000000..92bc2b604f --- /dev/null +++ b/roles/nagios_server/files/plugins/check_fedmsg_producers_consumers.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python + +import json +import os +import socket +import sys +import zmq + +try: + service = sys.argv[1] + check_list = frozenset(sys.argv[2:]) + fname = '/var/run/fedmsg/monitoring-%s.socket' % service + + if not check_list: + print "UNKNOWN - empty list of fedmsg consumers and producers to check" + sys.exit(3) + + if not os.path.exists(fname): + print "UNKNOWN - %s does not exist" % fname + sys.exit(3) + + connect_to = "ipc:///%s" % fname + ctx = zmq.Context() + s = ctx.socket(zmq.SUB) + s.connect(connect_to) + s.setsockopt(zmq.SUBSCRIBE, '') + poller = zmq.Poller() + poller.register(s, zmq.POLLIN) + + timeout = 10000 + + events = dict(poller.poll(timeout)) + if s in events and events[s] == zmq.POLLIN: + msg = s.recv() + msg = json.loads(msg) + else: + print 'UNKNOWN - ZMQ timeout. No message received in %i ms' % timeout + sys.exit(3) + + for consumer in msg['consumers']: + if consumer['name'] in check_list and not consumer['initialized']: + print 'ERROR: fedmsg consumer %s is not initialized' % consumer['name'] + sys.exit(2) + + for producer in msg['producers']: + if producer['name'] in check_list and not producer['initialized']: + print 'ERROR: fedmsg producer %s is not initialized' % producer['name'] + sys.exit(2) + + for item in check_list: + if item not in [p['name'] for p in msg['producers'] + msg['consumers']]: + print 'ERROR: %s not found among installed plugins' % item + sys.exit(2) + + print "OK: fedmsg consumer(s) and producer(s) initialized" + sys.exit(0) + +except Exception as err: + print "UNKNOWN:", str(err) + sys.exit(3) diff --git a/roles/nagios_server/files/plugins/restart_httpd b/roles/nagios_server/files/plugins/restart_httpd index 63790060e9..8da9981363 100755 --- a/roles/nagios_server/files/plugins/restart_httpd +++ b/roles/nagios_server/files/plugins/restart_httpd @@ -49,7 +49,7 @@ CRITICAL) 2) echo -n "Restarting HTTP service (3rd soft critical state)..." # Call the init script to restart the HTTPD server - echo "#fedora-noc $hostalias - Attempting to reload httpd. $servicedesc is $servicestate (2nd check)" | /usr/bin/nc -w 1 value03 5050 + echo "#fedora-noc $hostalias - Attempting to reload httpd. $servicedesc is $servicestate (2nd check)" | /usr/bin/nc -w 1 value01 5050 /usr/lib/nagios/plugins/check_nrpe -H $remotehost -c service_httpd_reload ;; esac @@ -62,7 +62,7 @@ CRITICAL) # point (unless you disabled notifications for this service) HARD) echo -n "Restarting HTTP service..." - echo "#fedora-noc $hostalias - Attempting to restart httpd. $servicedesc is $servicestate" | /usr/bin/nc -w 1 value03 5050 + echo "#fedora-noc $hostalias - Attempting to restart httpd. $servicedesc is $servicestate" | /usr/bin/nc -w 1 value01 5050 # Call the init script to restart the HTTPD server /usr/lib/nagios/plugins/check_nrpe -H $remotehost -c service_httpd_restart ;; diff --git a/roles/nagios_server/files/plugins/restart_rsyslog b/roles/nagios_server/files/plugins/restart_rsyslog index 8dc450aa1e..3a6728c1a7 100755 --- a/roles/nagios_server/files/plugins/restart_rsyslog +++ b/roles/nagios_server/files/plugins/restart_rsyslog @@ -49,7 +49,7 @@ CRITICAL) 2) echo -n "Restarting rsyslog service (3rd soft critical state)..." # Call the init script to restart the rsyslog server - echo "#fedora-noc $hostalias - Attempting to reload rsyslog. $servicedesc is $servicestate (2nd check)" | /usr/bin/nc -w 1 value03 5050 + echo "#fedora-noc $hostalias - Attempting to reload rsyslog. $servicedesc is $servicestate (2nd check)" | /usr/bin/nc -w 1 value01 5050 /usr/lib/nagios/plugins/check_nrpe -H $remotehost -c service_rsyslog_reload ;; esac @@ -62,7 +62,7 @@ CRITICAL) # point (unless you disabled notifications for this service) HARD) echo -n "Restarting rsyslog service..." - echo "#fedora-noc $hostalias - Attempting to restart rsyslog. $servicedesc is $servicestate" | /usr/bin/nc -w 1 value03 5050 + echo "#fedora-noc $hostalias - Attempting to restart rsyslog. $servicedesc is $servicestate" | /usr/bin/nc -w 1 value01 5050 # Call the init script to restart the HTTPD server /usr/lib/nagios/plugins/check_nrpe -H $remotehost -c service_rsyslog_restart ;; diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index 9ed32604d6..54276fd890 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -4,13 +4,6 @@ - name: Add nagios user as 420 user: name=nagios uid=420 state=present home=/var/spool/nagios comment="Nagios Monitoring User" createhome=yes system=yes shell=/bin/bash -# $nagiosDbUser = 'nagiosuser' -# include httpd::base -# include httpd::mod_auth_pgsql -# -# # For notify-by-fedmsg -# include fedmsg::config - # Add the apache user to the nagios group so that it has permissions # to do stuff in /var/spool/nagios/* - name: Add apache to nagios group @@ -44,277 +37,106 @@ - name: Restart and autostart nsca service: name=nsca state=restarted enabled=yes -- name: +- name: Copy /etc/nagios config + copy: src=nagios dest=/etc/nagios owner=nagios group=nagils - file { '/etc/nagios/nsca.cfg': - # Special-case this, because the service block below wants an actual File block. - source => "puppet:///nagios/nsca.cfg", - owner => root, - group => root, - mode => 755 - } +- name: Copy checkcommands.cfg + template: src=nagios/checkcommands.cfg dest=/etc/nagios/checkcommands.cfg owner=nagios group=nagios +- name: Copy httpd config + template: src=nagios-httpd.conf dest=/etc/httpd/conf.d/nagios.conf - file { '/etc/nagios/': - source => 'puppet:///nagios/nagios/', - owner => nagios, - group => nagios, - recurse => true, - require => Package['nagios.x86_64'], - } +- name: Create eventhandlers directory + file: dest=/usr/lib/nagios/plugins/eventhandlers/ state=directory - file { '/etc/nagios/checkcommands.cfg': - content => template('nagios/nagios/checkcommands.cfg.erb'), - owner => nagios, - group => nagios, - } +- name: Copy plugins + copy: src=plugins dest=/usr/lib/nagios/plugins/ mode=0755 owner=root group=root - file { '/etc/httpd/conf.d/nagios.conf': - content => template('nagios/nagios-http.conf.erb'), - require => [Package['httpd'], Package['mod_auth_pgsql']], - } +- name: Copy xmpp plugin config + file: src={{puppet_private}}/xmppnagios.ini dest=/etc/nagios/private/xmppnagios.ini mode=0660 owner=nagios group=nagios - file { '/usr/lib/nagios/plugins/eventhandlers/': - ensure => directory, - } +- name: Create log directory + file: dest=/var/log/nagios state=directory group=nagios owner=nagios mode=0644 - file { '/usr/lib/nagios/plugins/restart_httpd': - # Not /technically/ a plugin, but .... - source => "puppet:///nagios/plugins/restart_httpd", - owner => root, - group => root, - mode => 755 - } +- name: Create spool directory + file: dest=/var/log/nagios/spool state=directory group=nagios owner=nagios mode=0644 - file { '/usr/lib/nagios/plugins/restart_rsyslog': - # Not /technically/ a plugin, but .... - source => "puppet:///nagios/plugins/restart_rsyslog", - owner => root, - group => root, - mode => 755 - } +- name: Create checkresults directory + file: dest=/var/log/nagios/spool/checkresults state=directory group=nagios owner=nagios mode=0644 - file { '/usr/local/bin/xmppsend': - # Once again, not /technically/ a plugin... - source => "puppet:///nagios/plugins/xmppsend.py", - owner => root, - group => root, - mode => 755 - } +- name: Copy check_nagios_notifications.py + file: src=check_nagios_notifications.py dest=/usr/local/bin/check_nagios_notifications.py mode=0755 group=root owner=root - file { '/etc/nagios/private/xmppnagios.ini': - # Can this be moved to a .erb? - source => 'puppet:///config/secure/xmppnagios.ini', - owner => nagios, - group => nagios, - mode => 660 - } +- name: Nuke default nagios passwd + file: dest=/etc/nagios/passwd state=absent - file { '/usr/lib/nagios/plugins/check_email_delivery_epn': - source => "puppet:///nagios/plugins/check_email_delivery_epn", - owner => root, - group => root, - mode => 755, - require => [Package['nagios-plugins']] - } +- name: Nuke default nagios objects + file: dest=/etc/nagios/objects state=absent - file { '/usr/lib/nagios/plugins/check_imap_receive_epn': - source => "puppet:///nagios/plugins/check_imap_receive_epn", - owner => root, - group => root, - mode => 755, - require => [Package['nagios-plugins']] - } +- name: Install check_nagios_notifications cron + cron: name="check_nagios_notifications" minute=0 hour=0 weekday=1 user=nagios job="/usr/local/bin/check_nagios_notifications.py" - file { '/usr/lib/nagios/plugins/check_smtp_send_epn': - source => "puppet:///nagios/plugins/check_smtp_send_epn", - owner => root, - group => root, - mode => 755, - require => [Package['nagios-plugins']] - } +#class nagios::server_external inherits nagios::server { +# File['/etc/nagios/'] { +# source => 'puppet:///nagios/nagios-external/', +# } +# +# File['/etc/nagios/checkcommands.cfg'] { +# content => template('nagios/nagios-external/checkcommands.cfg.erb'), +# } +# +# file { '/usr/share/nagios/html/side.html': +# mode => 644, +# owner => root, +# group => root, +# source => 'puppet:///nagios/side.html' +# } +# +# file { '/usr/share/nagios/html/config.inc.php': +# mode => 644, +# owner => root, +# group => root, +# source => 'puppet:///nagios/config.inc.php' +# } +# +# +#} - file { '/usr/lib/nagios/plugins/check_dig_ssl': - source => "puppet:///nagios/plugins/check_dig_ssl", - owner => root, - group => root, - mode => 755, - require => [Package['nagios-plugins']] - } - file { '/var/log/nagios/': - ensure => directory, - owner => nagios, - group => nagios, - mode => 644, - } +#class nagiosPhysical{ +# include ipmitool-package +# file { '/usr/lib/nagios/plugins/check_ipmi': +# source => 'puppet:///nagios/plugins/check_ipmi', +# mode => 755, +# owner => root, +# group => root, +# require => [Package['nagios-plugins'], Package['ipmitool']] +# } +#} - file { '/var/log/nagios/spool': - ensure => directory, - owner => nagios, - group => nagios, - mode => 644, - } +#class nrpe { +# if ($operatingsystem == "RedHat" and $operatingsystemrelease >= 6) { +# selinux-policy::custom { 'nrpe': } +# } +# +# package { 'nrpe': ensure => installed } +# +# service { 'nrpe': +# enable => true, +# ensure => running, +# subscribe => File['/etc/nagios/nrpe.cfg'] +# } +# +# file { '/etc/nagios/nrpe.cfg': +# source => 'puppet:///nagios/nrpe.cfg', +# require => Package[nrpe], +# # notify => Service[nrpe] +# } +#} - file { '/var/log/nagios/spool/checkresults': - ensure => directory, - owner => nagios, - group => nagios, - mode => 644, - } - - file { '/usr/local/bin/check_nagios_notifications.py': - mode => 755, - owner => root, - group => root, - source => 'puppet:///nagios/check_nagios_notifications.py' - } - - # Nagios defaults that aren't used. - file { - [ - '/etc/nagios/passwd', - '/etc/nagios/objects' - ]: - ensure => absent, - force => true - } - - cron { "check_nagios_notifications": - minute => 0, - hour => 0, - monthday => absent, - month => absent, - weekday => 1, - user => "nagios", - command => "/usr/local/bin/check_nagios_notifications.py" - } -} - -class nagios::server_external inherits nagios::server { - File['/etc/nagios/'] { - source => 'puppet:///nagios/nagios-external/', - } - - File['/etc/nagios/checkcommands.cfg'] { - content => template('nagios/nagios-external/checkcommands.cfg.erb'), - } - - file { '/usr/share/nagios/html/side.html': - mode => 644, - owner => root, - group => root, - source => 'puppet:///nagios/side.html' - } - - file { '/usr/share/nagios/html/config.inc.php': - mode => 644, - owner => root, - group => root, - source => 'puppet:///nagios/config.inc.php' - } - - -} - -class nagios::client inherits nagios { - package { - [ - "nagios-plugins", - "nagios-plugins-disk", - "nagios-plugins-file_age", - "nagios-plugins-users", - "nagios-plugins-procs", - "nagios-plugins-swap", - "nagios-plugins-load", - "nagios-plugins-ping", - ]: ensure => installed, - } - - case $architecture { - x86_64: { include nagiossymlink } - ppc64: { include nagiossymlink } - } - - file { "/var/spool/nagios/": - ensure => directory, - owner => nagios, - group => nagios, - mode => 750, - - # An empty dir is an empty dir is an empty dir. - # source => "blank/" - } - - file { '/usr/lib/nagios/plugins/': - source => 'puppet:///nagios/plugins/', - mode => 755, - owner => root, - group => root, - recurse => true, - require => [Package['nagios-plugins']] - } - - # These two need to be done separately from the previous recursive - # declaration because of the additional selinux type. - file { '/usr/lib/nagios/plugins/check_haproxy_conns.py': - source => 'puppet:///nagios/plugins/check_haproxy_conns.py', - mode => 755, - owner => root, - group => root, - # Needs to be able to write a query to /var/run/haproxy-stats - seltype => 'nagios_unconfined_plugin_exec_t', - # This chunk needs to run *after* the recursive bit so selinux types - # don't toggle back and forth. - require => File['/usr/lib/nagios/plugins/'], - } - file { '/usr/lib/nagios/plugins/check_supybot_plugin': - source => 'puppet:///nagios/plugins/check_supybot_plugin', - mode => 755, - owner => root, - group => root, - # Needs to be able to connect to irc - seltype => 'nagios_unconfined_plugin_exec_t', - # This chunk needs to run *after* the recursive bit so selinux types - # don't toggle back and forth. - require => File['/usr/lib/nagios/plugins/'], - } -} - -class nagiosPhysical{ - include ipmitool-package - file { '/usr/lib/nagios/plugins/check_ipmi': - source => 'puppet:///nagios/plugins/check_ipmi', - mode => 755, - owner => root, - group => root, - require => [Package['nagios-plugins'], Package['ipmitool']] - } -} - -class nrpe { - if ($operatingsystem == "RedHat" and $operatingsystemrelease >= 6) { - selinux-policy::custom { 'nrpe': } - } - - package { 'nrpe': ensure => installed } - - service { 'nrpe': - enable => true, - ensure => running, - subscribe => File['/etc/nagios/nrpe.cfg'] - } - - file { '/etc/nagios/nrpe.cfg': - source => 'puppet:///nagios/nrpe.cfg', - require => Package[nrpe], - # notify => Service[nrpe] - } -} - -class nagiossymlink { # Is this a hack? Is it still needed? - symlink { '/usr/lib/nagios': - replace => false, - ensure => '/usr/lib64/nagios/', - require => Package['nagios-plugins'] - } -} +#class nagiossymlink { # Is this a hack? Is it still needed? +# symlink { '/usr/lib/nagios': +# replace => false, +# ensure => '/usr/lib64/nagios/', +# require => Package['nagios-plugins'] +# } +#} diff --git a/roles/nagios_server/templates/nagios-external/checkcommands.cfg.erb b/roles/nagios_server/templates/nagios-external/checkcommands.cfg similarity index 98% rename from roles/nagios_server/templates/nagios-external/checkcommands.cfg.erb rename to roles/nagios_server/templates/nagios-external/checkcommands.cfg index d4281f63c3..9ea8e301e2 100644 --- a/roles/nagios_server/templates/nagios-external/checkcommands.cfg.erb +++ b/roles/nagios_server/templates/nagios-external/checkcommands.cfg @@ -61,7 +61,7 @@ define command{ # 'pgsql' define command{ command_name check_pgsql - command_line $USER1$/check_pgsql -H $HOSTADDRESS$ -d $ARG1$ -p '<%= nagiosDbUserPassword %>' --logname '<%= nagiosDbUser %>' + command_line $USER1$/check_pgsql -H $HOSTADDRESS$ -d $ARG1$ -p '{{nagios_db_user_password}}' --logname 'nagiosuser' } # 'check_website' command definition diff --git a/roles/nagios_server/templates/nagios-http.conf.erb b/roles/nagios_server/templates/nagios-httpd.conf similarity index 96% rename from roles/nagios_server/templates/nagios-http.conf.erb rename to roles/nagios_server/templates/nagios-httpd.conf index 9e48c5a75d..c0f24b2bc6 100644 --- a/roles/nagios_server/templates/nagios-http.conf.erb +++ b/roles/nagios_server/templates/nagios-httpd.conf @@ -13,7 +13,7 @@ ScriptAlias /tac.cgi /usr/lib64/nagios/cgi-bin/tac.cgi Auth_PG_host db-fas Auth_PG_port 5432 Auth_PG_user fasreadonly - Auth_PG_pwd <%= fasReadOnlyPassword %> + Auth_PG_pwd "{{fas_readonly_password}}" Auth_PG_database fas2 Auth_PG_pwd_table people Auth_PG_uid_field username diff --git a/roles/nagios_server/templates/nagios/checkcommands.cfg.erb b/roles/nagios_server/templates/nagios/checkcommands.cfg similarity index 96% rename from roles/nagios_server/templates/nagios/checkcommands.cfg.erb rename to roles/nagios_server/templates/nagios/checkcommands.cfg index f82f262c76..3b264caba9 100644 --- a/roles/nagios_server/templates/nagios/checkcommands.cfg.erb +++ b/roles/nagios_server/templates/nagios/checkcommands.cfg @@ -70,19 +70,19 @@ define command{ # 'test nrpe' define command{ command_name test_nrpe - command_line $USER1$/check_nrpe -t 20 -H $HOSTADDRESS$ + command_line $USER1$/check_nrpe -t 30 -H $HOSTADDRESS$ } # 'check by nrpe' define command{ command_name check_by_nrpe - command_line $USER1$/check_nrpe -t 20 -H $HOSTADDRESS$ -c $ARG1$ + command_line $USER1$/check_nrpe -t 30 -H $HOSTADDRESS$ -c $ARG1$ } # 'pgsql' define command{ command_name check_pgsql - command_line $USER1$/check_pgsql -H $HOSTADDRESS$ -d $ARG1$ -p '<%= nagiosDbUserPassword %>' --logname '<%= nagiosDbUser %>' + command_line $USER1$/check_pgsql -H $HOSTADDRESS$ -d $ARG1$ -p '{{nagios_db_user_password}}' --logname 'nagiosuser' } # 'check_website' command definition @@ -131,7 +131,7 @@ define command{ # 'check_dns_fpo' command definition define command{ command_name check_dns_fpo - command_line $USER1$/check_dns -H fedoraproject.org -A -s $HOSTADDRESS$ + command_line $USER1$/check_dns -t 30 -H fedoraproject.org -A -s $HOSTADDRESS$ } # 'check_ftp' command definition @@ -266,7 +266,7 @@ define command{ # 'check-host-alive-nrpe' is better for hosts that are on vpn. define command{ command_name check-host-alive-nrpe - command_line $USER1$/check_nrpe -t 20 -H $HOSTADDRESS$ + command_line $USER1$/check_nrpe -t 30 -H $HOSTADDRESS$ } # 'check_bzr' command definition # I'd like this to actually interact with BZR, but I can't find any