diff --git a/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 b/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 index 997fca6470..794b8936b4 100644 --- a/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 +++ b/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 @@ -2,6 +2,7 @@ command[check_fedmsg_cp_busgateway_hub]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub Nommer MonitoringProducer command[check_fedmsg_cp_busgateway_relay]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-relay RelayConsumer MonitoringProducer command[check_fedmsg_cp_busgateway_gateway]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-gateway GatewayConsumer MonitoringProducer +command[check_fedmsg_cp_anitya_relay]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-relay RelayConsumer MonitoringProducer command[check_fedmsg_cp_app]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-relay RelayConsumer MonitoringProducer command[check_fedmsg_cp_value]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-irc IRCBotConsumer MonitoringProducer command[check_fedmsg_cp_pkgs]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub GenACLsConsumer MonitoringProducer @@ -13,6 +14,7 @@ command[check_fedmsg_cp_bugzilla2fedmsg]={{libdir}}/nagios/plugins/check_fedmsg_ command[check_fedmsg_cexceptions_busgateway_hub]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub Nommer 1 10 command[check_fedmsg_cexceptions_busgateway_relay]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-relay RelayConsumer 1 10 command[check_fedmsg_cexceptions_busgateway_gateway]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-gateway GatewayConsumer 1 10 +command[check_fedmsg_cexceptions_anitya_relay]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-relay RelayConsumer 1 10 command[check_fedmsg_cexceptions_app]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-relay RelayConsumer 1 10 command[check_fedmsg_cexceptions_value]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-irc IRCBotConsumer 1 10 command[check_fedmsg_cexceptions_pkgs]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub GenACLsConsumer 1 10 @@ -24,6 +26,7 @@ command[check_fedmsg_cexceptions_bugzilla2fedmsg]={{libdir}}/nagios/plugins/chec command[check_fedmsg_cbacklog_busgateway_hub]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub Nommer 10 50 command[check_fedmsg_cbacklog_busgateway_relay]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-relay RelayConsumer 10 50 command[check_fedmsg_cbacklog_busgateway_gateway]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-gateway GatewayConsumer 10 50 +command[check_fedmsg_cbacklog_anitya_relay]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-relay RelayConsumer 10 50 command[check_fedmsg_cbacklog_app]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-relay RelayConsumer 10 50 command[check_fedmsg_cbacklog_value]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-irc IRCBotConsumer 10 50 command[check_fedmsg_cbacklog_pkgs]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub GenACLsConsumer 10 50 diff --git a/roles/nagios_server/files/nagios/hosts/anitya-backend01.cfg b/roles/nagios_server/files/nagios/hosts/anitya-backend01.cfg new file mode 100644 index 0000000000..060dc62a74 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/anitya-backend01.cfg @@ -0,0 +1,7 @@ +define host { + host_name anitya-backend01 + alias anitya-backend01.fedoraproject.org + use defaulttemplate + address anitya-backend01.fedoraproject.org + parents osuosl03 +} diff --git a/roles/nagios_server/files/nagios/hosts/anitya-frontend01.cfg b/roles/nagios_server/files/nagios/hosts/anitya-frontend01.cfg new file mode 100644 index 0000000000..20d7aeeff3 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/anitya-frontend01.cfg @@ -0,0 +1,7 @@ +define host { + host_name anitya-frontend01 + alias anitya-frontend01.fedoraproject.org + use defaulttemplate + address anitya-frontend01.fedoraproject.org + parents osuosl03 +} diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg index d079e29c2a..582ccdc24c 100644 --- a/roles/nagios_server/files/nagios/services/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg @@ -26,6 +26,13 @@ define service { use defaulttemplate } +define service { + host_name anitya-frontend01 + 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 for fedmsg-hub proc @@ -243,6 +250,13 @@ define service { use defaulttemplate } +define service { + host_name anitya-frontend01 + 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 service_description Check fedmsg consumers and producers irc @@ -306,6 +320,13 @@ define service { use defaulttemplate } +define service { + host_name anitya-frontend01 + service_description Check fedmsg-relay consumers exceptions + check_command check_by_nrpe!check_fedmsg_cexceptions_anitya_relay + use defaulttemplate +} + define service { host_name value01 service_description Check fedmsg-irc consumers exceptions @@ -369,6 +390,13 @@ define service { use defaulttemplate } +define service { + host_name anitya-frontend01 + service_description Check fedmsg-relay consumers backlog + check_command check_by_nrpe!check_fedmsg_cbacklog_anitya_relay + use defaulttemplate +} + define service { host_name value01 service_description Check fedmsg-irc consumers backlog