From 98e4389cd8fbd77452ad0b071b5d742a4e4003c6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 13 May 2018 01:45:48 +0000 Subject: [PATCH] Revert "koji_wellness plugin" This reverts commit 3f5e36799acb02cea2eb84a6ec672d5c0650884a. --- .../files/nagios/commands/koji.cfg | 6 -- .../nagios/plugins/check_koji_wellness.py | 86 ------------------- .../files/nagios/services/koji.cfg | 8 -- 3 files changed, 100 deletions(-) delete mode 100755 roles/nagios_server/files/nagios/plugins/check_koji_wellness.py diff --git a/roles/nagios_server/files/nagios/commands/koji.cfg b/roles/nagios_server/files/nagios/commands/koji.cfg index ae3ead6db3..03ab1d33f7 100644 --- a/roles/nagios_server/files/nagios/commands/koji.cfg +++ b/roles/nagios_server/files/nagios/commands/koji.cfg @@ -27,9 +27,3 @@ define command{ command_line $USER1$/check_koji } -# 'check_koji_wellness' -define command { - command_name check_koji_wellness.py - command_line $USER1$/check_koji_wellness -} - diff --git a/roles/nagios_server/files/nagios/plugins/check_koji_wellness.py b/roles/nagios_server/files/nagios/plugins/check_koji_wellness.py deleted file mode 100755 index 08a576bb6a..0000000000 --- a/roles/nagios_server/files/nagios/plugins/check_koji_wellness.py +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env python -import sys -import re - -import requests - -koji_host = sys.argv[1] -try: - koji_pkg = sys.argv[2] -except IndexError: - koji_pkg = 'koji' - -NAGIOS = { - 'OK': 0, - 'WARN': 1, - 'CRIT': 2 -} - -TARGETS = { - 'web': 'https://%s/koji/' % koji_host, - 'hub': 'https://%s/kojihub/' % koji_host, - 'pkg': 'https://%s/packages/%s/' % (koji_host, koji_pkg) -} - - -def do_request(url, method='GET', headers=None, body=None): - try: - res = getattr(requests, method.lower())(url, headers=headers, data=body) - except requests.exceptions.ConnectionError as e: - return (500, e.message) - return (res.status_code, res.text) - - -def check_web(): - url = TARGETS['web'] - (status_code, data) = do_request(url) - if status_code != 200: - return (NAGIOS['CRIT'], 'Unable to access "%s"' % url) - if not re.search(r'', data): - return (NAGIOS['WARN'], 'Unable to match content from "%s"' % url) - return (NAGIOS['OK'], '') - - -def check_hub(method='system.listMethods'): - url = TARGETS['hub'] - xmlrpc = ''' - - %s - - ''' % method - headers = { - 'Content-Type': 'text/xml' - } - (status_code, data) = do_request(url, method='POST', headers=headers, body=xmlrpc) - if status_code != 200: - return (NAGIOS['CRIT'], 'Unable to access "%s"' % url) - if len(re.findall(r'[a-zA-Z0-9\._]+', data)) == 0: - return (NAGIOS['WARN'], 'Unable to parse content from "%s"' % url) - return (NAGIOS['OK'], None) - - -def check_pkg(): - url = TARGETS['pkg'] - (status_code, data) = do_request(url) - if status_code != 200: - return (NAGIOS['CRIT'], 'Unable to access "%s"' % url) - if len(re.findall(r'\[DIR\] [0-9.\/]+', data)) == 0: - return (NAGIOS['WARN'], 'Unable to match content from "%s"' % url) - return (NAGIOS['OK'], None) - - -def main(): - ok = NAGIOS['OK'] - for (code, msg) in (check_web(), check_hub(), check_pkg()): - if code != ok: - return (code, msg) - return (ok, None) - - -if __name__ == '__main__': - (code, reason) = main() - if code != NAGIOS['OK']: - sys.stderr.write('%s\n' % reason) - else: - sys.stdout.write('All checks passed.\n') - sys.exit(code) diff --git a/roles/nagios_server/files/nagios/services/koji.cfg b/roles/nagios_server/files/nagios/services/koji.cfg index 851e9b2115..e18f35c597 100644 --- a/roles/nagios_server/files/nagios/services/koji.cfg +++ b/roles/nagios_server/files/nagios/services/koji.cfg @@ -6,11 +6,3 @@ define service { use criticaltemplate } - -define service { - host_name koji.fedoraproject.org - service_description Check Koji wellness - check_command check_koji_wellness!koji.fedoraproject.org!koji - max_check_attempts 5 - use criticaltemplate -}