Module: check_mk Branch: master Commit: 893cc4e544566bd4241879850affae2a49dbeefb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=893cc4e544566b… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Oct 8 08:36:22 2018 +0200 systemd_units: minor change in check output (CMK-982) Change-Id: If2f271db52693c5a4b8132e1af676c8b1f24cc21 --- checks/systemd_units | 2 +- .../checks/generictests/datasets/systemd_units_services_1_regression.py | 2 +- .../generictests/datasets/systemd_units_services_2_failed_regression.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/systemd_units b/checks/systemd_units index beb5397..29250ca 100644 --- a/checks/systemd_units +++ b/checks/systemd_units @@ -192,7 +192,7 @@ def check_systemd_units_services_summary(_no_item, params, parsed): service_names = [s.name for s in services if s.active == active_state] cnt = len(service_names) service_names = ", ".join(service_names) - yield state, "%d service%s %s: %s" % (cnt, '' if cnt == 1 else 's', active_state, service_names) + yield state, "%d service%s %s (%s)" % (cnt, '' if cnt == 1 else 's', active_state, service_names) check_info['systemd_units.services_summary'] = { diff --git a/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py b/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py index 8798fec..3abfae6 100644 --- a/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py +++ b/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py @@ -428,7 +428,7 @@ checks = { 'services_summary': [ ('Summary', 'default', [(0, '32 services in total', []), - (2, '1 service failed: systemd-cryptsetup@cryptswap1', []), + (2, '1 service failed (systemd-cryptsetup@cryptswap1)', []), ]), ] } diff --git a/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py b/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py index 05b35ad..e51badd 100644 --- a/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py +++ b/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py @@ -27,4 +27,4 @@ discovery = {'services': [], 'services_summary': [('Summary', {})]} checks = {'services_summary': [('Summary', 'default', [(0, '2 services in total', []), - (2, '2 services failed: foo, bar', [])])]} + (2, '2 services failed (foo, bar)', [])])]}