Consistently reporting errors using cu() instead of oao()

Author: markuslf

CHANGELOG.md

@@ -49,6 +49,7 @@ Features:
 
 Monitoring Plugins:
 
+* All plugins: Consistently reporting errors using cu() instead of oao()
 * fail2ban: Improve output, add unit-test
 * grafana-version: Add Grafana v9.5
 * infomaniak-events: Add filter for service categories

check-plugins/apache-httpd-status/apache-httpd-status

@@ -24,7 +24,7 @@ from lib.globals import (STATE_CRIT, STATE_OK,  # pylint: disable=C0413
                           STATE_UNKNOWN, STATE_WARN)
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2023051201'
+__version__ = '2023071203'
 
 DESCRIPTION = 'Checks how well an Apache httpd server is performing.'
 
@@ -120,7 +120,7 @@ def main():
         # fetch the URL
         result = lib.base.coe(lib.url.fetch(URL, insecure=args.INSECURE))
         if 'Scoreboard: ' not in result:
-            lib.base.oao('Malformed Apache server info.', STATE_UNKNOWN)
+            lib.base.cu('Malformed Apache server info.')
     else:
         # do not call the command, put in test data
         stdout, stderr, retc = lib.test.test(args.TEST)
@@ -152,7 +152,7 @@ def main():
         try:
             key, value = item.split(': ')
         except:
-            lib.base.oao('Malformed Apache server info.', STATE_UNKNOWN)
+            lib.base.cu('Malformed Apache server info.')
 
         if key == 'ServerUptimeSeconds':
             apache['ServerUptimeSeconds'] = int(value) # continous counter
@@ -176,7 +176,7 @@ def main():
     # parse the "scoreboard" and count the elements
     apache['TotalWorkers'] = len(apache['Scoreboard'])
     if apache['TotalWorkers'] == 0:
-        lib.base.oao('Malformed Apache server info.', STATE_UNKNOWN)
+        lib.base.cu('Malformed Apache server info.')
 
                                                                 # from mod_status.c:
     workers['closing'] = apache['Scoreboard'].count('C')        # SERVER_CLOSING

check-plugins/apache-httpd-version/apache-httpd-version

@@ -21,7 +21,7 @@ import lib.version  # pylint: disable=C0413
 from lib.globals import (STATE_UNKNOWN) # pylint: disable=C0413
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2023071001'
+__version__ = '2023071203'
 
 DESCRIPTION = 'Tracks if Apache httpd is EOL.'
 
@@ -77,7 +77,7 @@ def main():
     # fetch data
     installed_version = get_installed_version()
     if not installed_version:
-        lib.base.oao('Apache httpd not found.', STATE_UNKNOWN)
+        lib.base.cu('Apache httpd not found.')
     try:
         installed_major, installed_minor, installed_patch = installed_version.split('.')
     except:

check-plugins/axenita-stats/axenita-stats

@@ -23,7 +23,7 @@ from lib.globals import (STATE_CRIT, STATE_OK,  # pylint: disable=C0413
                           STATE_UNKNOWN, STATE_WARN)
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2023051201'
+__version__ = '2023071201'
 
 DESCRIPTION = 'With this plugin you can track some values of the Axenita application.'
 
@@ -110,7 +110,7 @@ def main():
         try:
             stdout = json.loads(stdout)
         except:
-            lib.base.oao('ValueError: No JSON object could be decoded', STATE_UNKNOWN)
+            lib.base.cu('ValueError: No JSON object could be decoded')
 
         if 'readmodel' in args.TEST[0]:
             achilles_readmodel = stdout

check-plugins/borgbackup/borgbackup

@@ -22,7 +22,7 @@ from lib.globals import (STATE_CRIT, STATE_OK,  # pylint: disable=C0413
                           STATE_UNKNOWN, STATE_WARN)
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2023051201'
+__version__ = '2023071203'
 
 DESCRIPTION = '''Checks the date and return code of the last borgbackup, according to the logfile.
 `cat /var/log/borg/borg-prune.log`
@@ -88,7 +88,7 @@ def main():
         # end: 2020-04-08 23:00:13
 
     if os.path.exists(path) <= 0 and not os.path.isfile(path):
-        lib.base.oao('Logfile {} not found or empty.'.format(path), STATE_UNKNOWN)
+        lib.base.cu('Logfile {} not found or empty.'.format(path))
 
     mount_lines = ''
     with open('/proc/mounts') as mountlist:
@@ -122,7 +122,7 @@ def main():
         create_retc
         prune_retc
     except UnboundLocalError as e:
-        lib.base.oao('Could not find all expected values in the logfile.\n{}'.format(e), STATE_UNKNOWN)
+        lib.base.cu('Could not find all expected values in the logfile.\n{}'.format(e))
 
     # We ignore retc 1, as it means operation reached its normal end, but there were warnings from borg.
     state = STATE_OK

check-plugins/cometsystem/cometsystem

@@ -25,7 +25,7 @@ from lib.globals import (STATE_CRIT, STATE_OK,  # pylint: disable=C0413
 
 __author__ = """Linuxfabrik GmbH, Zurich/Switzerland;
                 originally written by Dominik Riva, Universitätsspital Basel/Switzerland"""
-__version__ = '2023051201'
+__version__ = '2023071203'
 
 DESCRIPTION = """This check targets the JSON endpoint of https://www.cometsystem.com/ Web Sensors.
               """
@@ -168,7 +168,7 @@ def main():
         stdout, stderr, retc = lib.test.test(args.TEST)
         result = json.loads(stdout)
     if 'ch1' not in result:
-        lib.base.oao('Malformed Comet System Web Sensors status file.', STATE_UNKNOWN)
+        lib.base.cu('Malformed Comet System Web Sensors status file.')
 
     # init some vars
     msg = ''

check-plugins/countdown/countdown

@@ -23,7 +23,7 @@ from lib.globals import (STATE_CRIT, STATE_OK,  # pylint: disable=C0413
                           STATE_UNKNOWN, STATE_WARN)
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2023051201'
+__version__ = '2023071203'
 
 DESCRIPTION = 'Warns before an expiration date is scheduled to occur.'
 
@@ -117,7 +117,7 @@ def main():
         lib.base.oao(msg, state, always_ok=args.ALWAYS_OK)
 
     except Exception as e:
-        lib.base.oao('Something seems to be wrong with the input parameter format or its timestamps. The error was: {}'.format(e), STATE_UNKNOWN)
+        lib.base.cu('Something seems to be wrong with the input parameter format or its timestamps. The error was: {}'.format(e))
 
 
 if __name__ == '__main__':

check-plugins/cpu-usage/cpu-usage

@@ -25,11 +25,11 @@ from lib.globals import (STATE_CRIT, STATE_OK,  # pylint: disable=C0413
 try:
     import psutil  # pylint: disable=C0413
 except ImportError:
-    lib.base.oao('Python module "psutil" is not installed.', STATE_UNKNOWN)
+    lib.base.cu('Python module "psutil" is not installed.')
 
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2023051201'
+__version__ = '2023071203'
 
 DESCRIPTION = """Mainly provides utilization percentages for each specific CPU time. Takes a time
                 period into account: the cpu usage within a certain amount of time has to be equal
@@ -139,7 +139,7 @@ def main():
         cpu_times_percent = psutil.cpu_times_percent(interval=1.25, percpu=False)
     except ValueError as e:
         lib.db_sqlite.close(conn)
-        lib.base.oao('psutil raised error "{}"'.format(e), STATE_UNKNOWN)
+        lib.base.cu('psutil raised error "{}"'.format(e))
 
     # this is what we want to warn about: 100% - idle - nice
     stats['cpu_usage'] = round(

check-plugins/crypto-policy/crypto-policy

@@ -20,7 +20,7 @@ from lib.globals import (STATE_OK, STATE_UNKNOWN,  # pylint: disable=C0413
                           STATE_WARN)
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2023051201'
+__version__ = '2023071203'
 
 DESCRIPTION = """Checks the current crypto policy against a desired one,
                  and returns a warning on a non-match."""
@@ -72,7 +72,7 @@ def main():
     # execute the shell command and return its result and exit code
     success, result = lib.shell.shell_exec(CMD)
     if not success:
-        lib.base.oao('Crypto policies are not applicable to your system.', STATE_UNKNOWN)
+        lib.base.cu('Crypto policies are not applicable to your system.')
     stdout, stderr, retc = result
     crypto_policy = stdout.strip()
 

check-plugins/csv-values/csv-values

@@ -32,7 +32,7 @@ from lib.globals import (STATE_CRIT, STATE_OK,  # pylint: disable=C0413
                           STATE_UNKNOWN, STATE_WARN)
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2023051201'
+__version__ = '2023071201'
 
 DESCRIPTION = """This check imports a CSV file into an SQLite database and can then run a separate
                  warning query and/or a critical query against it. The result - the number of
@@ -247,7 +247,7 @@ def main():
         sys.exit(STATE_UNKNOWN)
 
     if args.WARNING_QUERY is None and args.CRITICAL_QUERY is None:
-        lib.base.oao('Nothing to check, no queries provided.', STATE_UNKNOWN)
+        lib.base.cu('Nothing to check, no queries provided.')
     if args.WARNING_QUERY is None:
         args.WARNING_QUERY = ''
     if args.CRITICAL_QUERY is None:
@@ -278,7 +278,7 @@ def main():
             )
         proto, url = split_url
         if proto not in ['http', 'https', 'smb']:
-            lib.base.oao('The protocol "{}" is not supported.'.format(proto), STATE_UNKNOWN)
+            lib.base.cu('The protocol "{}" is not supported.'.format(proto))
 
         if proto in ['http', 'https']:
             header = {}