[checkmk-commits] mssql_backup: display error messages

Module: check_mk Branch: master Commit: 6caac7f1fdea68cafc83245337600acc67ae9d8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6caac7f1fdea68… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 28 11:43:47 2019 +0100 mssql_backup: display error messages CMK-1570 Change-Id: I884fcb24e80862b02b0f7d2780d53d38eec058e4 --- checks/mssql_backup | 5 ++++- tests/unit/checks/generictests/datasets/mssql_backup_regression.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/checks/mssql_backup b/checks/mssql_backup index cf09005..516487e 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -101,7 +101,7 @@ def parse_mssql_backup(info): timestamp = _parse_date_and_time(b_date, b_time) item = "%s %s" % (inst, tablespace) - backup = Backup(timestamp, map_backup_types.get(b_type), b_state) + backup = Backup(timestamp, map_backup_types.get(b_type), b_state or "") parsed.setdefault(item, []).append(backup) return parsed @@ -137,6 +137,9 @@ def check_mssql_backup(item, params, parsed): if backup.state == "no backup found": yield params.get("not_found", 1), "No backup found" continue + if backup.state.startswith("ERROR: "): + yield 2, backup.state[7:] + continue if backup.type is None: backup_type_var = "database" perfkey = "seconds" diff --git a/tests/unit/checks/generictests/datasets/mssql_backup_regression.py b/tests/unit/checks/generictests/datasets/mssql_backup_regression.py index c4edb74..8feb8fc 100644 --- a/tests/unit/checks/generictests/datasets/mssql_backup_regression.py +++ b/tests/unit/checks/generictests/datasets/mssql_backup_regression.py @@ -12,6 +12,7 @@ info = [ ['MSSQL_SQL0x4', 'msdb', '-', '-', '-', 'no backup found'], ['MSSQL_SQL0x4', 'foo'], ['MSSQL_SQL0x4', 'bar', '12345678'], + ['MSSQL_Parrot', 'Polly', '-', '-', '-', 'ERROR: Polly has no crackers'] ] @@ -21,6 +22,7 @@ discovery = { ("MSSQL_SQL0x4 model", {}), ("MSSQL_SQL0x4 msdb", {}), ("MSSQL_SQL0x4 bar", {}), + ("MSSQL_Parrot Polly", {}), ], 'per_type': [], }