From de5ab8f045fbe0a56cbea1d5acda1cc8a1e50c26 Mon Sep 17 00:00:00 2001 From: Andrew Heath Date: Tue, 30 May 2023 13:30:23 -0400 Subject: [PATCH] updated the script to fix issues --- .../files/scripts/check_fedmsg_consumer_backlog.py | 2 +- .../nagios_client/files/scripts/check_rabbitmq_size | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py b/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py index 56fc98c832..54b6691732 100644 --- a/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py +++ b/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py @@ -11,7 +11,7 @@ try: check_consumer = sys.argv[2] backlog_warning = int(sys.argv[3]) backlog_critical = int(sys.argv[4]) - fname = '/var/run/fedmsg/monitoring-%s.socket' % service + fname = '/var/run/fedmsg/monitoring-%s-3.socket' % service if not os.path.exists(fname): print("UNKNOWN - %s does not exist" % fname) diff --git a/roles/nagios_client/files/scripts/check_rabbitmq_size b/roles/nagios_client/files/scripts/check_rabbitmq_size index ff6154aea7..4d0b7b3604 100644 --- a/roles/nagios_client/files/scripts/check_rabbitmq_size +++ b/roles/nagios_client/files/scripts/check_rabbitmq_size @@ -1,4 +1,4 @@ -#!/bin/python +#!/bin/python3 import sys import requests @@ -11,15 +11,15 @@ messages = r['messages'] msg = 'Messages in queue: %i (%i consumers)' % (messages, consumers) if consumers < 1: - print 'CRITICAL: No consumers: %s' % msg + print ('CRITICAL: No consumers: %s' % msg) sys.exit(2) -if messages > sys.argv[2]: - print 'CRITICAL: %s' % msg +if str(messages) > sys.argv[2]: + print ('CRITICAL: %s' % msg) sys.exit(2) -if messages > sys.argv[3]: - print 'WARNING: %s' % msg +if str(messages) > sys.argv[3]: + print ('WARNING: %s' % msg) sys.exit(1) print 'OK: %s' % msg