Skip to content

Print results on one line #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jouir wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Print results on one line #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions check_docker/check_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,17 +952,25 @@ def socketfile_permissions_failure(parsed_args):
return False


def sort_by_severity(messages):
severities = ('CRITICAL: ', 'WARNING: ', 'UNKNOWN: ', 'OK: ')
rank = lambda message: next((index for index, severity in enumerate(severities)
if message.startswith(severity)), len(severities))
return sorted(messages, key=rank)


def print_results():
# Nagios notifications only carry the first line of the plugin output
if no_ok:
# Remove all the "OK"s
filtered_messages = [message for message in messages if not message.startswith('OK: ')]
if len(filtered_messages) == 0:
messages_concat = 'OK'
else:
messages_concat = '\n'.join(filtered_messages)
messages_concat = ', '.join(sort_by_severity(filtered_messages))

else:
messages_concat = '\n'.join(messages)
messages_concat = ', '.join(sort_by_severity(messages))

if no_performance or len(performance_data) == 0:
print(messages_concat)
Expand Down
10 changes: 9 additions & 1 deletion check_docker/check_swarm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,16 @@ def socketfile_permissions_failure(parsed_args):
return False


def sort_by_severity(messages):
severities = ('CRITICAL: ', 'WARNING: ', 'UNKNOWN: ', 'OK: ')
rank = lambda message: next((index for index, severity in enumerate(severities)
if message.startswith(severity)), len(severities))
return sorted(messages, key=rank)


def print_results():
print('\n'.join(messages))
# Nagios notifications only carry the first line of the plugin output
print(', '.join(sort_by_severity(messages)))


def perform_checks(raw_args):
Expand Down
12 changes: 8 additions & 4 deletions tests/test_check_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,8 +709,11 @@ def test_perform(check_docker, fs, args, called):

@pytest.mark.parametrize("messages, perf_data, expected", (
(['TEST'], [], 'TEST'),
(['FOO', 'BAR'], [], 'FOO\nBAR'),
(['FOO', 'BAR'], ['1;2;3;4;'], 'FOO\nBAR|1;2;3;4;')
(['FOO', 'BAR'], [], 'FOO, BAR'),
(['FOO', 'BAR'], ['1;2;3;4;'], 'FOO, BAR|1;2;3;4;'),
(['OK: FOO', 'WARNING: BAR', 'CRITICAL: BAZ', 'UNKNOWN: QUX'], [],
'CRITICAL: BAZ, WARNING: BAR, UNKNOWN: QUX, OK: FOO'),
(['WARNING: FOO', 'WARNING: BAR'], [], 'WARNING: FOO, WARNING: BAR')
))
def test_print_results(check_docker, capsys, messages, perf_data, expected):
# These sometimes get set to true when using random-order plugin, for example --random-order-seed=620808
Expand All @@ -726,12 +729,13 @@ def test_print_results(check_docker, capsys, messages, perf_data, expected):
@pytest.mark.parametrize("messages, perf_data, no_ok, no_performance, expected", (
([], [], False, False, ''),
(['TEST'], [], False, False, 'TEST'),
(['FOO', 'BAR'], [], False, False, 'FOO\nBAR'),
(['FOO', 'BAR'], ['1;2;3;4;'], False, False, 'FOO\nBAR|1;2;3;4;'),
(['FOO', 'BAR'], [], False, False, 'FOO, BAR'),
(['FOO', 'BAR'], ['1;2;3;4;'], False, False, 'FOO, BAR|1;2;3;4;'),
([], [], True, False, 'OK'),
(['OK: TEST'], [], True, False, 'OK'),
(['OK: FOO', 'OK: BAR'], [], True, False, 'OK'),
(['OK: FOO', 'BAR'], ['1;2;3;4;'], True, False, 'BAR|1;2;3;4;'),
(['OK: FOO', 'WARNING: BAR', 'CRITICAL: BAZ'], [], True, False, 'CRITICAL: BAZ, WARNING: BAR'),
([], [], False, True, ''),
(['OK: TEST'], [], False, True, 'OK: TEST'),
(['OK: TEST'], ['1;2;3;4;'], False, True, 'OK: TEST'),
Expand Down
4 changes: 3 additions & 1 deletion tests/test_check_swarm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,9 @@ def test_check_not_swarm_service(check_swarm, fs):
@pytest.mark.parametrize("messages, perf_data, expected", (
([], [], ''),
(['TEST'], [], 'TEST'),
(['FOO', 'BAR'], [], 'FOO\nBAR'),
(['FOO', 'BAR'], [], 'FOO, BAR'),
(['OK: FOO', 'WARNING: BAR', 'CRITICAL: BAZ', 'UNKNOWN: QUX'], [],
'CRITICAL: BAZ, WARNING: BAR, UNKNOWN: QUX, OK: FOO'),
))
def test_print_results(check_swarm, capsys, messages, perf_data, expected):
check_swarm.messages = messages
Expand Down