From 88ab378bba8f94ba3e951e9d547ca8fcb284963f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Jun 30 2020 21:40:14 +0000 Subject: nagios_server: drop phx2_internal stuff, fix mailman01 to use iad2 Signed-off-by: Kevin Fenzi --- diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/basset.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/basset.cfg deleted file mode 100644 index ba0bc9f..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/basset.cfg +++ /dev/null @@ -1,27 +0,0 @@ -define service { - hostgroup_name basset - service_description mongo process - check_command check_by_nrpe!check_mongo_proc - use defaulttemplate -} - -define service { - hostgroup_name basset - service_description rabbitmq process - check_command check_by_nrpe!check_rabbitmq_proc - use defaulttemplate -} - -define service { - hostgroup_name basset - service_description basset worker processes - check_command check_by_nrpe!check_worker_proc - use defaulttemplate -} - -define service { - hostgroup_name basset - service_description basset processing queue - check_command check_by_nrpe!check_basset_queue - use defaulttemplate -} diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/certgetter.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/certgetter.cfg deleted file mode 100644 index 2b143ed..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/certgetter.cfg +++ /dev/null @@ -1,6 +0,0 @@ -define service { - host_name certgetter01.phx2.fedoraproject.org - service_description certgetter-http - check_command check_http!certgetter01.phx2.fedoraproject.org - use defaulttemplate -} diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/db_backups.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/db_backups.cfg deleted file mode 100644 index d991e71..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/db_backups.cfg +++ /dev/null @@ -1,7 +0,0 @@ -define service { - 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/phx2_internal/disk.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/disk.cfg deleted file mode 100644 index 75a7f24..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/disk.cfg +++ /dev/null @@ -1,76 +0,0 @@ -define service { - hostgroup_name all, !mincheckgrp - service_description Disk_Space_/ - check_command check_by_nrpe!check_disk_/ - use disktemplate -} - -define service { - hostgroup_name all, !mincheckgrp - service_description Disk Space /boot - check_command check_by_nrpe!check_disk_/boot - use disktemplate -} - -define service { - hostgroup_name qahardware - service_description Disk Space /srv - check_command check_by_nrpe!check_disk_/srv - use disktemplate -} - -define service { - host_name log01.phx2.fedoraproject.org - service_description Disk space /var/log - check_command check_by_nrpe!check_disk_/var/log - use disktemplate -} - -define service { - hostgroup_name pkgs - service_description Check read-only filesystem - check_command check_by_nrpe!check_readonly_fs - use disktemplate -} - -define service { - hostgroup_name pkgs - service_description Disk space /srv/cache/lookaside - check_command check_by_nrpe!check_disk_/srv/cache/lookaside - use disktemplate -} - -define service { - hostgroup_name koji - service_description Disk space / - check_command check_by_nrpe!check_disk_/ - use ppc-secondarytemplate -} - -define service { - hostgroup_name retrace - service_description Disk space / - check_command check_by_nrpe!check_disk_/ - use retracetemplate -} - -define service { - hostgroup_name retrace - service_description Disk Space for huge /srv - check_command check_by_nrpe!check_disk_huge_/srv - use disktemplate -} - -define service { - hostgroup_name people - service_description Disk space /project - check_command check_by_nrpe!check_disk_/project/ - use disktemplate -} - -define service { - hostgroup_name oci_registry - service_description Disk space /srv/registry - check_command check_by_nrpe!check_disk_/srv/registry - use disktemplate -} diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/fedmsg.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/fedmsg.cfg deleted file mode 100644 index 897bad4..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/fedmsg.cfg +++ /dev/null @@ -1,487 +0,0 @@ -## There are lots of different sections in this now-enormous file -## Each one starts with a 'BEGIN' comment. - - -# BEGIN, check for the existance of processes -define service { - host_name value01.phx2.fedoraproject.org - service_description Check for fedmsg-irc proc - check_command check_by_nrpe!check_fedmsg_irc_proc - use defaulttemplate -} - -define service { - hostgroup_name proxies - service_description Check fedmsg-gateway consumers backlog - check_command check_by_nrpe!check_fedmsg_cbacklog_busgateway_gateway - use defaulttemplate -} - -define service { - hostgroup_name proxies - service_description Check for existence fedmsg-gateway proc - check_command check_by_nrpe!check_fedmsg_gateway_proc - use defaulttemplate -} - -define service { - hostgroup_name proxies - service_description Check fedmsg consumers and producers gateway - check_command check_by_nrpe!check_fedmsg_cp_busgateway_gateway - use defaulttemplate -} - -define service { - hostgroup_name proxies - service_description Check fedmsg-gateway consumers exceptions - check_command check_by_nrpe!check_fedmsg_cexceptions_busgateway_gateway - use defaulttemplate -} - -define service { - 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.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.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.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.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.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 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 pdc-backend01.phx2.fedoraproject.org - service_description Check for fedmsg-hub proc - check_command check_by_nrpe!check_fedmsg_hub_proc - use defaulttemplate -} - - -# Odd one, check for the supybot fedmsg plugin -define service { - host_name value01.phx2.fedoraproject.org - service_description Check supybot fedmsg plugin - check_command check_by_nrpe!check_supybot_fedmsg_plugin - use defaulttemplate -} - - -# BEGIN, check datanommer history -define service { - 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.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.phx2.fedoraproject.org - service_description Check datanommer for recent bodhi compose messages - check_command check_by_nrpe!check_datanommer_bodhi_composes - use defaulttemplate -} -define service { - 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.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.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.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.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.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.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.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.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.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.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.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.phx2.fedoraproject.org - service_description Check datanommer for recent faf messages - check_command check_by_nrpe!check_datanommer_faf - use defaulttemplate -} - -define service { - 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.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.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.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.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.phx2.fedoraproject.org - service_description Check datanommer for recent rpm sign messages - check_command check_by_nrpe!check_datanommer_rpmsign - use defaulttemplate -} -define service { - host_name busgateway01.phx2.fedoraproject.org - service_description Check datanommer for recent mdapi messages - check_command check_by_nrpe!check_datanommer_mdapi - use defaulttemplate -} -define service { - host_name busgateway01.phx2.fedoraproject.org - service_description Check datanommer for recent greenwave messages - check_command check_by_nrpe!check_datanommer_greenwave - use defaulttemplate -} -define service { - host_name busgateway01.phx2.fedoraproject.org - service_description Check datanommer for recent resultsdb messages - check_command check_by_nrpe!check_datanommer_resultsdb - use defaulttemplate -} - - -# BEGIN, check consumers and producers -define service { - 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.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.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 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 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.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.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 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 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 -} -define service { - host_name mbs-backend01.phx2.fedoraproject.org - service_description Check fedmsg consumers and producers hub - check_command check_by_nrpe!check_fedmsg_cp_mbs_backend - use defaulttemplate -} - - -# BEGIN exceptions counter -define service { - 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.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.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 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 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.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.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.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 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 pdc-backend01.phx2.fedoraproject.org - service_description Check fedmsg-hub consumers exceptions - check_command check_by_nrpe!check_fedmsg_cexceptions_pdc_backend - use defaulttemplate -} -define service { - host_name mbs-backend01.phx2.fedoraproject.org - service_description Check fedmsg-hub consumers exceptions - check_command check_by_nrpe!check_fedmsg_cexceptions_mbs_backend - use defaulttemplate -} - - - -# BEGIN backlog checking -define service { - 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.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.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 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 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.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.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.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 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 pdc-backend01.phx2.fedoraproject.org - service_description Check fedmsg-hub consumers backlog - check_command check_by_nrpe!check_fedmsg_cbacklog_pdc_backend - use defaulttemplate -} - -define service { - host_name mbs-backend01.phx2.fedoraproject.org - service_description Check fedmsg-hub consumers backlog - check_command check_by_nrpe!check_fedmsg_cbacklog_mbs_backend - use defaulttemplate -} diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/file_age.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/file_age.cfg deleted file mode 100644 index cb843f2..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/file_age.cfg +++ /dev/null @@ -1,45 +0,0 @@ -define service { - hostgroup_name proxies - service_description Check MirrorList 1 Cache - check_command check_by_nrpe!check_mirrorlist1_cache - use defaulttemplate - check_interval 120 - notification_interval 130 -} - -define service { - hostgroup_name proxies - service_description Check MirrorList 2 Cache - check_command check_by_nrpe!check_mirrorlist2_cache - use defaulttemplate - check_interval 120 - notification_interval 130 -} - -define service { - hostgroup_name proxies - service_description Check TicketKey age - check_command check_by_nrpe!check_ticketkey_age - use defaulttemplate - check_interval 120 - notification_interval 130 -} - -define service { - hostgroup_name proxies - service_description Check ostree summary age - check_command check_by_nrpe!check_ostree_summary_file_age - use defaulttemplate - check_interval 120 - notification_interval 130 -} - -define service { - host_name log01.phx2.fedoraproject.org - service_description Check Merged Log - check_command check_by_nrpe!check_merged_file_age - use defaulttemplate - check_interval 120 - notification_interval 130 - event_handler restart_rsyslog -} diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/fmn.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/fmn.cfg deleted file mode 100644 index 5df39f2..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/fmn.cfg +++ /dev/null @@ -1,20 +0,0 @@ -define service { - host_name notifs-backend01.phx2.fedoraproject.org - service_description Check backend irc queue size - check_command check_by_nrpe!check_fmn_backend_irc_queue - use defaulttemplate -} - -define service { - host_name notifs-backend01.phx2.fedoraproject.org - service_description Check backend email queue size - check_command check_by_nrpe!check_fmn_backend_email_queue - use defaulttemplate -} - -define service { - 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/phx2_internal/koji.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/koji.cfg deleted file mode 100644 index 89a371c..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/koji.cfg +++ /dev/null @@ -1,16 +0,0 @@ -define service { - host_name koji01.phx2.fedoraproject.org - service_description Check Koji - check_command check_koji - max_check_attempts 5 - use criticaltemplate -} - - -define service { - host_name koji01.phx2.fedoraproject.org - service_description Check Koji wellness - check_command check_koji_wellness.py!koji.fedoraproject.org!koji - max_check_attempts 5 - use criticaltemplate -} diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/locking.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/locking.cfg deleted file mode 100644 index 4342465..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/locking.cfg +++ /dev/null @@ -1,14 +0,0 @@ -define service { - 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.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/phx2_internal/mailman.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/mailman.cfg deleted file mode 100644 index 27dc576..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/mailman.cfg +++ /dev/null @@ -1,7 +0,0 @@ -define service { - host_name mailman01.phx2.fedoraproject.org - service_description check mailman api - check_command check_by_nrpe!check_mailman_api - max_check_attempts 5 - use defaulttemplate -} diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/nrpe.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/nrpe.cfg deleted file mode 100644 index fe0569b..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/nrpe.cfg +++ /dev/null @@ -1,8 +0,0 @@ -define service { - host_name bastion02.phx2.fedoraproject.org, bastion01.phx2.fedoraproject.org, sundries01.phx2.fedoraproject.org, sundries02.phx2.fedoraproject.org, wiki01.phx2.fedoraproject.org, wiki02.phx2.fedoraproject.org - service_description nrpe - check_command test_nrpe - max_check_attempts 2 - check_interval 2 - use defaulttemplate -} diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/osbs.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/osbs.cfg deleted file mode 100644 index 9ba5286..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/osbs.cfg +++ /dev/null @@ -1,7 +0,0 @@ -define service { - 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 - use defaulttemplate -} diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/pgsql.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/pgsql.cfg deleted file mode 100644 index c2b2b7c..0000000 --- a/roles/nagios_server/files/nagios/services/phx2_internal/pgsql.cfg +++ /dev/null @@ -1,14 +0,0 @@ -define service { - host_name db-koji01.phx2.fedoraproject.org - service_description Check Koji DB - check_command check_pgsql!koji - use criticaltemplate -} - -define service { - host_name db-fas01.phx2.fedoraproject.org - service_description Check FAS DB - check_command check_pgsql!fas2 - use criticaltemplate - servicegroups fas -} diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index 687188e..1d85bee 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -316,9 +316,9 @@ define service { {% if vars['nagios_location'] == 'iad2_internal' %} define service { - host_name mailman01.phx2.fedoraproject.org + host_name mailman01.iad2.fedoraproject.org service_description http-mailman-internal - check_command check_website!mailman01.phx2.fedoraproject.org!/archives/!Fedora Mailing-Lists + check_command check_website!mailman01.iad2.fedoraproject.org!/archives/!Fedora Mailing-Lists use websitetemplate }