From 15b754ed22cb725cf571a46e3c94f8ed1aa399cc Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 5 Jan 2017 01:08:09 +0000 Subject: [PATCH] I doubt very much I will be able to build a working box but good first try --- .../files/nagios/services/autocloud.cfg | 4 +- .../files/nagios/services/basset.cfg | 8 +- .../files/nagios/services/copr.cfg | 2 +- .../files/nagios/services/disk.cfg | 23 ---- .../files/nagios/services/fedmsg.cfg | 112 +++++++++--------- .../files/nagios/services/ssl.cfg | 6 +- 6 files changed, 68 insertions(+), 87 deletions(-) diff --git a/roles/nagios_server/files/nagios/services/autocloud.cfg b/roles/nagios_server/files/nagios/services/autocloud.cfg index 28dcb8f7fd..00d3fb8fa2 100644 --- a/roles/nagios_server/files/nagios/services/autocloud.cfg +++ b/roles/nagios_server/files/nagios/services/autocloud.cfg @@ -1,12 +1,12 @@ define service { - host_name autocloud-backend-libvirt2,autocloud-backend-vbox2 + hostgroup_name autocloud-backend service_description Check for autocloud proc check_command check_by_nrpe!check_autocloud_proc use defaulttemplate } define service { - host_name autocloud-backend-libvirt2,autocloud-backend-vbox2 + hostgroup_name autocloud-backend service_description Check for redis proc check_command check_by_nrpe!check_redis_proc use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/basset.cfg b/roles/nagios_server/files/nagios/services/basset.cfg index 4ea295aaa6..ba0bc9ff28 100644 --- a/roles/nagios_server/files/nagios/services/basset.cfg +++ b/roles/nagios_server/files/nagios/services/basset.cfg @@ -1,26 +1,26 @@ define service { - host_name basset01 + hostgroup_name basset service_description mongo process check_command check_by_nrpe!check_mongo_proc use defaulttemplate } define service { - host_name basset01 + hostgroup_name basset service_description rabbitmq process check_command check_by_nrpe!check_rabbitmq_proc use defaulttemplate } define service { - host_name basset01 + hostgroup_name basset service_description basset worker processes check_command check_by_nrpe!check_worker_proc use defaulttemplate } define service { - host_name basset01 + 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/copr.cfg b/roles/nagios_server/files/nagios/services/copr.cfg index f7ab32985c..add3021854 100644 --- a/roles/nagios_server/files/nagios/services/copr.cfg +++ b/roles/nagios_server/files/nagios/services/copr.cfg @@ -1,5 +1,5 @@ define service { - host_name copr-be + hostgroup_name copr-back service_description Check Copr backend consecutive build failures check_command check_by_nrpe!check_copr_backend_failed use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg index 6e084000dc..cb84143f4b 100644 --- a/roles/nagios_server/files/nagios/services/disk.cfg +++ b/roles/nagios_server/files/nagios/services/disk.cfg @@ -5,14 +5,6 @@ define service { use disktemplate } -#define service { -# hostgroup buildservers -# service_description Disk Space / -# check_command check_by_nrpe!check_disk_/ -# use builderdisktemplate -# retry_check_interval 5 -#} - define service { host_name noc01, proxy01, proxy02, rawhide-composer, db01 service_description Disk Space /boot @@ -48,14 +40,6 @@ define service { use disktemplate } - -#define service { -# host_name hosted04 -# service_description Disk Space /srv -# check_command check_by_nrpe!check_disk_/srv -# use disktemplate -#} - define service { host_name log01 service_description Disk space /var/log @@ -63,13 +47,6 @@ 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 pkgs02 service_description Check read-only filesystem diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg index 7012d87dc7..a35f60cc28 100644 --- a/roles/nagios_server/files/nagios/services/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg @@ -10,6 +10,63 @@ define service { 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 { + hostgroup_name autocloud-backend + service_description Check for fedmsg-hub proc + check_command check_by_nrpe!check_fedmsg_hub_proc + use defaulttemplate +} + +define service { + hostgroup_name autocloud-backend + service_description Check fedmsg consumers and producers hub + check_command check_by_nrpe!check_fedmsg_cp_autocloud_backend + use defaulttemplate +} + +define service { + hostgroup_name autocloud-backend + service_description Check fedmsg-hub consumers exceptions + check_command check_by_nrpe!check_fedmsg_cexceptions_autocloud_backend + use defaulttemplate +} + +define service { + hostgroup_name autocloud-backend + service_description Check fedmsg-hub consumers backlog + check_command check_by_nrpe!check_fedmsg_cbacklog_autocloud_backend + use defaulttemplate +} + + define service { host_name busgateway01 service_description Check for fedmsg-hub proc @@ -31,13 +88,6 @@ define service { use defaulttemplate } -define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy05,proxy06,proxy08,proxy09,proxy10,proxy11,proxy12 - service_description Check for existence fedmsg-gateway proc - check_command check_by_nrpe!check_fedmsg_gateway_proc - use defaulttemplate -} - define service { host_name anitya-frontend01 service_description Check for fedmsg-relay proc @@ -93,12 +143,7 @@ define service { check_command check_by_nrpe!check_fedmsg_masher_proc use defaulttemplate } -define service { - host_name autocloud-backend-libvirt2,autocloud-backend-vbox2 - service_description Check for fedmsg-hub proc - check_command check_by_nrpe!check_fedmsg_hub_proc - use defaulttemplate -} + define service { host_name packages03 service_description Check for fedmsg-hub proc @@ -338,13 +383,6 @@ define service { use defaulttemplate } -define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 - service_description Check fedmsg consumers and producers gateway - check_command check_by_nrpe!check_fedmsg_cp_busgateway_gateway - use defaulttemplate -} - define service { host_name anitya-frontend01 service_description Check fedmsg consumers and producers relay @@ -415,12 +453,6 @@ define service { use defaulttemplate } -define service { - host_name autocloud-backend-libvirt2,autocloud-backend-vbox2 - service_description Check fedmsg consumers and producers hub - check_command check_by_nrpe!check_fedmsg_cp_autocloud_backend - use defaulttemplate -} define service { host_name packages03 service_description Check fedmsg consumers and producers hub @@ -463,13 +495,6 @@ define service { use defaulttemplate } -define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 - service_description Check fedmsg-gateway consumers exceptions - check_command check_by_nrpe!check_fedmsg_cexceptions_busgateway_gateway - use defaulttemplate -} - define service { host_name anitya-frontend01 service_description Check fedmsg-relay consumers exceptions @@ -547,13 +572,6 @@ define service { use defaulttemplate } -define service { - host_name autocloud-backend-libvirt2,autocloud-backend-vbox2 - service_description Check fedmsg-hub consumers exceptions - check_command check_by_nrpe!check_fedmsg_cexceptions_autocloud_backend - use defaulttemplate -} - define service { host_name packages03 service_description Check fedmsg-hub consumers exceptions @@ -599,13 +617,6 @@ define service { use defaulttemplate } -define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 - 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 service_description Check fedmsg-relay consumers backlog @@ -683,13 +694,6 @@ define service { use defaulttemplate } -define service { - host_name autocloud-backend-libvirt2,autocloud-backend-vbox2 - service_description Check fedmsg-hub consumers backlog - check_command check_by_nrpe!check_fedmsg_cbacklog_autocloud_backend - use defaulttemplate -} - define service { host_name packages03 service_description Check fedmsg-hub consumers backlog diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg index 2b8a265a09..6d898c6d0d 100644 --- a/roles/nagios_server/files/nagios/services/ssl.cfg +++ b/roles/nagios_server/files/nagios/services/ssl.cfg @@ -1,19 +1,19 @@ define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + hostgroup_name proxies service_description admin.fedoraproject.org SSL Cert check_command check_ssl_cert!admin.fedoraproject.org!60 use defaulttemplate } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + hostgroup_name proxies service_description fedoraproject.org SSL Cert check_command check_ssl_cert!fedoraproject.org!60 use defaulttemplate } define service { - host_name proxy01, proxy02, proxy03, proxy04, proxy06, proxy08, proxy05, proxy09, proxy10, proxy11, proxy12 + hostgroup_name proxies service_description translate.fedoraproject.org SSL Cert check_command check_ssl_cert!translate.fedoraproject.org!60 use defaulttemplate