From 36401aada8e24dde0f6f083bf427d97ea92958c9 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 9 Jan 2017 01:32:28 +0000 Subject: [PATCH] the point where you give up templating and go home crying --- .../files/nagios/services/db_backups.cfg | 2 +- .../files/nagios/services/fedmsg.cfg | 192 +++++++++--------- .../files/nagios/services/file_age.cfg | 4 +- .../files/nagios/services/fmn.cfg | 4 +- .../nagios/services/haproxy_mirrorlist.cfg | 9 +- .../files/nagios/services/ipa.cfg | 2 +- .../files/nagios/services/koji.cfg | 2 +- .../files/nagios/services/koschei.cfg | 8 +- .../files/nagios/services/locking.cfg | 4 +- .../files/nagios/services/memcached.cfg | 16 +- .../files/nagios/services/nagios.cfg | 2 +- .../files/nagios/services/nrpe.cfg | 2 +- .../files/nagios/services/osbs.cfg | 4 +- .../files/nagios/services/pgsql.cfg | 13 +- .../files/nagios/services/ssl.cfg | 7 - 15 files changed, 119 insertions(+), 152 deletions(-) diff --git a/roles/nagios_server/files/nagios/services/db_backups.cfg b/roles/nagios_server/files/nagios/services/db_backups.cfg index c285f7d8a0..09365d1979 100644 --- a/roles/nagios_server/files/nagios/services/db_backups.cfg +++ b/roles/nagios_server/files/nagios/services/db_backups.cfg @@ -1,5 +1,5 @@ define service { - host_name db03 + host_name db03.phx2.fedoraproject.org service_description Check MySQL Backup check_command check_by_nrpe!check_mysql_backup use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg index a35f60cc28..2c1103715e 100644 --- a/roles/nagios_server/files/nagios/services/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg @@ -4,7 +4,7 @@ # BEGIN, check for the existance of processes define service { - host_name value01 + host_name value01.phx2.fedoraproject.org service_description Check for fedmsg-irc proc check_command check_by_nrpe!check_fedmsg_irc_proc use defaulttemplate @@ -68,96 +68,96 @@ define service { define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check for fedmsg-gateway proc check_command check_by_nrpe!check_fedmsg_gateway_proc use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check for fedmsg-relay proc check_command check_by_nrpe!check_fedmsg_relay_proc use defaulttemplate } define service { - host_name anitya-frontend01 + host_name anitya-frontend01.phx2.fedoraproject.org service_description Check for fedmsg-relay proc check_command check_by_nrpe!check_fedmsg_relay_proc use defaulttemplate } define service { - host_name badges-backend01 + host_name badges-backend01.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { - host_name summershum01 + host_name summershum01.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { - host_name pkgs02 + host_name pkgs02.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { - host_name fedimg01 + host_name fedimg01.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { - host_name hotness01 + host_name hotness01.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { - host_name bodhi-backend03 + host_name bodhi-backend03.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_masher_proc use defaulttemplate } define service { - host_name bodhi-backend02 + host_name bodhi-backend02.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_masher_proc use defaulttemplate } define service { - host_name packages03 + host_name packages03.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } define service { - host_name bugyou01 + host_name bugyou01.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_procs_bugyou use defaulttemplate } define service { - host_name pdc-backend01 + host_name pdc-backend01.phx2.fedoraproject.org service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate @@ -166,7 +166,7 @@ define service { # Odd one, check for the supybot fedmsg plugin define service { - host_name value01 + host_name value01.phx2.fedoraproject.org service_description Check supybot fedmsg plugin check_command check_by_nrpe!check_supybot_fedmsg_plugin use defaulttemplate @@ -175,121 +175,121 @@ define service { # BEGIN, check datanommer history define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent buildsys/koji messages check_command check_by_nrpe!check_datanommer_buildsys use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent git messages check_command check_by_nrpe!check_datanommer_git use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent bodhi messages check_command check_by_nrpe!check_datanommer_bodhi use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent wiki messages check_command check_by_nrpe!check_datanommer_wiki use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent compose messages check_command check_by_nrpe!check_datanommer_compose use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent meetbot messages check_command check_by_nrpe!check_datanommer_meetbot use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent fas messages check_command check_by_nrpe!check_datanommer_fas use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent pkgdb messages check_command check_by_nrpe!check_datanommer_pkgdb use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent fedoratagger messages check_command check_by_nrpe!check_datanommer_fedoratagger use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent fedoraplanet messages check_command check_by_nrpe!check_datanommer_planet use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent copr finished build messages check_command check_by_nrpe!check_datanommer_copr use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent trac messages check_command check_by_nrpe!check_datanommer_trac use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent askbot messages check_command check_by_nrpe!check_datanommer_askbot use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent fedbadges messages check_command check_by_nrpe!check_datanommer_fedbadges use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent fedocal messages check_command check_by_nrpe!check_datanommer_fedocal use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent ansible messages check_command check_by_nrpe!check_datanommer_ansible use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent anitya messages check_command check_by_nrpe!check_datanommer_anitya use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent fedimg messages check_command check_by_nrpe!check_datanommer_fedimg use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent hotness messages check_command check_by_nrpe!check_datanommer_hotness use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent faf messages check_command check_by_nrpe!check_datanommer_faf use defaulttemplate @@ -297,64 +297,64 @@ define service { # This one is retired since it times out all the time. Too few messages. #define service { -# host_name busgateway01 +# host_name busgateway01.phx2.fedoraproject.org # service_description Check datanommer for recent nuancier messages # check_command check_by_nrpe!check_datanommer_nuancier # use defaulttemplate #} define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent mailman messages check_command check_by_nrpe!check_datanommer_mailman use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent bugzilla messages check_command check_by_nrpe!check_datanommer_bugzilla use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent summershum messages check_command check_by_nrpe!check_datanommer_summershum use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent jenkins messages check_command check_by_nrpe!check_datanommer_jenkins use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent github messages check_command check_by_nrpe!check_datanommer_github use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent kerneltest messages check_command check_by_nrpe!check_datanommer_kerneltest use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent fmn messages check_command check_by_nrpe!check_datanommer_fmn use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent autocloud messages check_command check_by_nrpe!check_datanommer_autocloud use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent atomic compose check_command check_by_nrpe!check_datanommer_twoweekatomic use defaulttemplate @@ -363,110 +363,110 @@ define service { # BEGIN, check consumers and producers define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org 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 + host_name busgateway01.phx2.fedoraproject.org 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 + host_name busgateway01.phx2.fedoraproject.org service_description Check fedmsg consumers and producers gateway check_command check_by_nrpe!check_fedmsg_cp_busgateway_gateway use defaulttemplate } define service { - host_name anitya-frontend01 + host_name anitya-frontend01.phx2.fedoraproject.org service_description Check fedmsg consumers and producers relay check_command check_by_nrpe!check_fedmsg_cp_anitya_relay use defaulttemplate } define service { - host_name value01 + host_name value01.phx2.fedoraproject.org service_description Check fedmsg consumers and producers irc check_command check_by_nrpe!check_fedmsg_cp_value use defaulttemplate } define service { - host_name pkgs02 + host_name pkgs02.phx2.fedoraproject.org service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_pkgs use defaulttemplate } define service { - host_name summershum01 + host_name summershum01.phx2.fedoraproject.org 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 + host_name badges-backend01.phx2.fedoraproject.org service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_badges_backend use defaulttemplate } define service { - host_name bugzilla2fedmsg01 + host_name bugzilla2fedmsg01.phx2.fedoraproject.org service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_bugzilla2fedmsg use defaulttemplate } define service { - host_name fedimg01 + host_name fedimg01.phx2.fedoraproject.org service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_fedimg_backend use defaulttemplate } define service { - host_name hotness01 + host_name hotness01.phx2.fedoraproject.org service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_hotness_backend use defaulttemplate } define service { - host_name bodhi-backend03 + host_name bodhi-backend03.phx2.fedoraproject.org service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_bodhi_backend01_hub use defaulttemplate } define service { - host_name bodhi-backend02 + host_name bodhi-backend02.phx2.fedoraproject.org service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_bodhi_backend02_hub use defaulttemplate } define service { - host_name packages03 + host_name packages03.phx2.fedoraproject.org service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_packages_backend use defaulttemplate } define service { - host_name bugyou01 + host_name bugyou01.phx2.fedoraproject.org service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_bugyou_backend use defaulttemplate } define service { - host_name pdc-backend01 + host_name pdc-backend01.phx2.fedoraproject.org service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_pdc_backend use defaulttemplate @@ -475,119 +475,119 @@ define service { # BEGIN exceptions counter define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_busgateway_hub use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check fedmsg-relay consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_busgateway_relay use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check fedmsg-gateway consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_busgateway_gateway use defaulttemplate } define service { - host_name anitya-frontend01 + host_name anitya-frontend01.phx2.fedoraproject.org service_description Check fedmsg-relay consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_anitya_relay use defaulttemplate } define service { - host_name value01 + host_name value01.phx2.fedoraproject.org service_description Check fedmsg-irc consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_value use defaulttemplate } define service { - host_name pkgs02 + host_name pkgs02.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_pkgs use defaulttemplate } define service { - host_name summershum01 + host_name summershum01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_summershum use defaulttemplate } define service { - host_name badges-backend01 + host_name badges-backend01.phx2.fedoraproject.org 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 + host_name notifs-backend01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_notifs_backend use defaulttemplate } define service { - host_name bugzilla2fedmsg01 + host_name bugzilla2fedmsg01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_bugzilla2fedmsg use defaulttemplate } define service { - host_name fedimg01 + host_name fedimg01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_fedimg_backend use defaulttemplate } define service { - host_name hotness01 + host_name hotness01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_hotness_backend use defaulttemplate } define service { - host_name bodhi-backend03 + host_name bodhi-backend03.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_bodhi_backend01_hub use defaulttemplate } define service { - host_name bodhi-backend02 + host_name bodhi-backend02.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_bodhi_backend02_hub use defaulttemplate } define service { - host_name packages03 + host_name packages03.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_packages_backend use defaulttemplate } define service { - host_name bugyou01 + host_name bugyou01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_bugyou_backend use defaulttemplate } define service { - host_name pdc-backend01 + host_name pdc-backend01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_pdc_backend use defaulttemplate @@ -597,119 +597,119 @@ define service { # BEGIN backlog checking define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_busgateway_hub use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check fedmsg-relay consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_busgateway_relay use defaulttemplate } define service { - host_name busgateway01 + host_name busgateway01.phx2.fedoraproject.org service_description Check fedmsg-gateway consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_busgateway_gateway use defaulttemplate } define service { - host_name anitya-frontend01 + host_name anitya-frontend01.phx2.fedoraproject.org service_description Check fedmsg-relay consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_anitya_relay use defaulttemplate } define service { - host_name value01 + host_name value01.phx2.fedoraproject.org service_description Check fedmsg-irc consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_value use defaulttemplate } define service { - host_name pkgs02 + host_name pkgs02.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_pkgs use defaulttemplate } define service { - host_name summershum01 + host_name summershum01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_summershum use defaulttemplate } define service { - host_name badges-backend01 + host_name badges-backend01.phx2.fedoraproject.org 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 + host_name notifs-backend01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_notifs_backend use defaulttemplate } define service { - host_name bugzilla2fedmsg01 + host_name bugzilla2fedmsg01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_bugzilla2fedmsg use defaulttemplate } define service { - host_name fedimg01 + host_name fedimg01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_fedimg_backend use defaulttemplate } define service { - host_name hotness01 + host_name hotness01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_hotness_backend use defaulttemplate } define service { - host_name bodhi-backend03 + host_name bodhi-backend03.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_bodhi_backend01_hub use defaulttemplate } define service { - host_name bodhi-backend02 + host_name bodhi-backend02.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_bodhi_backend02_hub use defaulttemplate } define service { - host_name packages03 + host_name packages03.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_packages_backend use defaulttemplate } define service { - host_name bugyou01 + host_name bugyou01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_bugyou_backend use defaulttemplate } define service { - host_name pdc-backend01 + host_name pdc-backend01.phx2.fedoraproject.org service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_pdc_backend use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/file_age.cfg b/roles/nagios_server/files/nagios/services/file_age.cfg index 658ae5634f..a464de9aed 100644 --- a/roles/nagios_server/files/nagios/services/file_age.cfg +++ b/roles/nagios_server/files/nagios/services/file_age.cfg @@ -1,5 +1,5 @@ define service { - host_name mirrorlist-osuosl, mirrorlist-ibiblio, mirrorlist-ibiblio02, mirrorlist-phx2, mirrorlist-host1plus, mirrorlist-dedicatedsolutions + hostgroup_name mirrorlist2 service_description Check MirrorList Cache check_command check_by_nrpe!check_mirrorlist_cache use defaulttemplate @@ -7,7 +7,7 @@ define service { } define service { - host_name log01 + host_name log01.phx2.fedoraproject.org service_description Check Merged Log check_command check_by_nrpe!check_merged_file_age use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/fmn.cfg b/roles/nagios_server/files/nagios/services/fmn.cfg index 83c131c5e8..1faf0f0aa1 100644 --- a/roles/nagios_server/files/nagios/services/fmn.cfg +++ b/roles/nagios_server/files/nagios/services/fmn.cfg @@ -1,12 +1,12 @@ define service { - host_name notifs-backend01 + host_name notifs-backend01.phx2.fedoraproject.org service_description Check backend queue size check_command check_by_nrpe!check_fmn_backend_queue use defaulttemplate } define service { - host_name notifs-backend01 + host_name notifs-backend01.phx2.fedoraproject.org service_description Check worker queue size check_command check_by_nrpe!check_fmn_worker_queue use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/haproxy_mirrorlist.cfg b/roles/nagios_server/files/nagios/services/haproxy_mirrorlist.cfg index 30bd49ac8b..041f3d4722 100644 --- a/roles/nagios_server/files/nagios/services/haproxy_mirrorlist.cfg +++ b/roles/nagios_server/files/nagios/services/haproxy_mirrorlist.cfg @@ -1,12 +1,5 @@ define service { - host_name proxy01 - service_description Check proxy01 for DOWN mirrorlist servers - check_command check_by_nrpe!check_haproxy_mirrorlist - use defaulttemplate -} - -define service { - host_name proxy04 + hostgroup_name proxies service_description Check proxy04 for DOWN mirrorlist servers check_command check_by_nrpe!check_haproxy_mirrorlist use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/ipa.cfg b/roles/nagios_server/files/nagios/services/ipa.cfg index 7ff6eaede1..675242ec4c 100644 --- a/roles/nagios_server/files/nagios/services/ipa.cfg +++ b/roles/nagios_server/files/nagios/services/ipa.cfg @@ -1,5 +1,5 @@ define service { - host_name ipa01,ipa02 + host_name ipa01.phx2.fedoraproject.org,ipa02.phx2.fedoraproject.org service_description IPA Replication Status check_command check_by_nrpe!check_ipa_replication use lighttemplate diff --git a/roles/nagios_server/files/nagios/services/koji.cfg b/roles/nagios_server/files/nagios/services/koji.cfg index 618f44a724..e18f35c597 100644 --- a/roles/nagios_server/files/nagios/services/koji.cfg +++ b/roles/nagios_server/files/nagios/services/koji.cfg @@ -1,5 +1,5 @@ define service { - host_name koji01 + host_name koji01.phx2.fedoraproject.org service_description Check Koji check_command check_koji max_check_attempts 5 diff --git a/roles/nagios_server/files/nagios/services/koschei.cfg b/roles/nagios_server/files/nagios/services/koschei.cfg index e6acc4a28e..1754c60beb 100644 --- a/roles/nagios_server/files/nagios/services/koschei.cfg +++ b/roles/nagios_server/files/nagios/services/koschei.cfg @@ -1,26 +1,26 @@ define service { - host_name koschei-backend01 + host_name koschei-backend01.phx2.fedoraproject.org service_description koschei-polling process check_command check_by_nrpe!check_koschei_polling_proc use defaulttemplate } define service { - host_name koschei-backend01 + host_name koschei-backend01.phx2.fedoraproject.org service_description koschei-resolver process check_command check_by_nrpe!check_koschei_resolver_proc use defaulttemplate } define service { - host_name koschei-backend01 + host_name koschei-backend01.phx2.fedoraproject.org service_description koschei-scheduler process check_command check_by_nrpe!check_koschei_scheduler_proc use defaulttemplate } define service { - host_name koschei-backend01 + host_name koschei-backend01.phx2.fedoraproject.org service_description koschei-watcher process check_command check_by_nrpe!check_koschei_watcher_proc use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/locking.cfg b/roles/nagios_server/files/nagios/services/locking.cfg index 4f05012fbb..4342465ceb 100644 --- a/roles/nagios_server/files/nagios/services/locking.cfg +++ b/roles/nagios_server/files/nagios/services/locking.cfg @@ -1,12 +1,12 @@ define service { - host_name rawhide-composer, koji01 + host_name rawhide-composer.phx2.fedoraproject.org, koji01.phx2.fedoraproject.org service_description Check NFS File Locks check_command check_by_nrpe!check_lock use criticaltemplate } define service { - host_name fas01 + host_name fas01.phx2.fedoraproject.org service_description Check certificate lock check_command check_by_nrpe!check_lock_file_age use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/memcached.cfg b/roles/nagios_server/files/nagios/services/memcached.cfg index 814a5a8530..fc218db984 100644 --- a/roles/nagios_server/files/nagios/services/memcached.cfg +++ b/roles/nagios_server/files/nagios/services/memcached.cfg @@ -1,23 +1,11 @@ define service { - host_name memcached01 + hostgroup_name memcached service_description Check for the presence of the memcached daemon check_command check_by_nrpe!check_memcache use defaulttemplate } define service { - host_name memcached02 - service_description Check for the presence of the memcached daemon - check_command check_by_nrpe!check_memcache - use defaulttemplate -} -define service { - host_name memcached01 - service_description Check for connectivity to the memcached daemon - check_command check_by_nrpe!check_memcache_connect - use defaulttemplate -} -define service { - host_name memcached02 + hostgroup_name memcached service_description Check for connectivity to the memcached daemon check_command check_by_nrpe!check_memcache_connect use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/nagios.cfg b/roles/nagios_server/files/nagios/services/nagios.cfg index 6d6f3e7c3c..cfc629ad25 100644 --- a/roles/nagios_server/files/nagios/services/nagios.cfg +++ b/roles/nagios_server/files/nagios/services/nagios.cfg @@ -1,5 +1,5 @@ define service { - host_name noc02 + host_name noc02.fedoraproject.org service_description Check Nagios check_command check_by_nrpe!check_nagios use criticaltemplate diff --git a/roles/nagios_server/files/nagios/services/nrpe.cfg b/roles/nagios_server/files/nagios/services/nrpe.cfg index 68dfce5f25..f7c048618a 100644 --- a/roles/nagios_server/files/nagios/services/nrpe.cfg +++ b/roles/nagios_server/files/nagios/services/nrpe.cfg @@ -1,5 +1,5 @@ define service { - host_name hosted03, bastion02, bastion01, bastion-vpn, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg, magazine + host_name hosted03.fedoraproject.org, bastion02.phx2.fedoraproject.org, bastion01.phx2.fedoraproject.org, sundries01.phx2.fedoraproject.org, sundries01.stg.phx2.fedoraproject.org, sundries02.phx2.fedoraproject.org, wiki01.phx2.fedoraproject.org, wiki01.stg.phx2.fedoraproject.org, wiki02.phx2.fedoraproject.org, pkgdb01.phx2.fedoraproject.org, pkgdb02.phx2.fedoraproject.org, pkgdb01.stg.phx2.fedoraproject.org, magazine.fedorainfracloud.org service_description nrpe check_command test_nrpe max_check_attempts 2 diff --git a/roles/nagios_server/files/nagios/services/osbs.cfg b/roles/nagios_server/files/nagios/services/osbs.cfg index ce8f68cb48..60a5bd1eea 100644 --- a/roles/nagios_server/files/nagios/services/osbs.cfg +++ b/roles/nagios_server/files/nagios/services/osbs.cfg @@ -1,5 +1,5 @@ define service { - host_name osbs-master01 + host_name osbs-master01.phx2.fedoraproject.org service_description Check OSBS API endpoint paths check_command check_by_nrpe!check_osbs_api max_check_attempts 5 @@ -7,7 +7,7 @@ define service { } define service { - host_name osbs-master01 + host_name osbs-master01.phx2.fedoraproject.org service_description Check OSBS build listing check_command check_by_nrpe!check_osbs_builds max_check_attempts 5 diff --git a/roles/nagios_server/files/nagios/services/pgsql.cfg b/roles/nagios_server/files/nagios/services/pgsql.cfg index b442e9ffbc..b6baeedf25 100644 --- a/roles/nagios_server/files/nagios/services/pgsql.cfg +++ b/roles/nagios_server/files/nagios/services/pgsql.cfg @@ -1,26 +1,19 @@ define service { - host_name db-koji01 + host_name db-koji01.phx2.fedoraproject.org service_description Check Koji DB check_command check_pgsql!koji use criticaltemplate } -#define service { -# host_name db04 -# service_description Check Koji DB Connections -# check_command check_postgres_conns!150!175!koji -# use criticaltemplate -#} - define service { - host_name db01 + host_name db01.phx2.fedoraproject.org service_description Check PackageDB DB check_command check_pgsql!pkgdb use criticaltemplate } define service { - host_name db-fas01 + host_name db-fas01.phx2.fedoraproject.org service_description Check FAS DB check_command check_pgsql!fas2 use criticaltemplate diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg index 06390371b3..8d6585a030 100644 --- a/roles/nagios_server/files/nagios/services/ssl.cfg +++ b/roles/nagios_server/files/nagios/services/ssl.cfg @@ -32,10 +32,3 @@ define service { check_command check_ssl_cert!pkgs.fedoraproject.org!60 use defaulttemplate } - -#define service { -# host_name hosted-lists01 -# service_description fedorahosted.org Wildcard SSL Cert -# check_command check_ssl_cert!lists.fedoraproject.org!60 -# use defaulttemplate -#}