From c5daa84f53da6049bab70a73bb408cab3f99ed48 Mon Sep 17 00:00:00 2001 From: Andrew Heath Date: Tue, 15 Aug 2023 16:56:33 -0400 Subject: [PATCH] Have script check for fedmsg socket --- .../files/scripts/check_fedmsg_consumer_exceptions.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py b/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py index 3cef75f633..335f858c57 100644 --- a/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py +++ b/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py @@ -11,7 +11,13 @@ try: check_consumer = sys.argv[2] exceptions_warning = int(sys.argv[3]) exceptions_critical = int(sys.argv[4]) - fname = '/var/run/fedmsg/monitoring-%s-3.socket' % service + if os.path.exists('/var/run/fedmsg/monitoring-%s-.socket' % service): + fname = '/var/run/fedmsg/monitoring-%s-.socket' % service + elif os.path.exists('/var/run/fedmsg/monitoring-%s-3.socket' % service): + fname = '/var/run/fedmsg/monitoring-%s-3.socket' % service + else: + print("UNKNOWN - socket file does not exists") + sys.exit(3) if not os.path.exists(fname): print("UNKNOWN - %s does not exist" % fname)