diff --git a/source/check_kinds/file_timestamp.py b/source/check_kinds/file_timestamp.py index f40f2ac..ce046dd 100644 --- a/source/check_kinds/file_timestamp.py +++ b/source/check_kinds/file_timestamp.py @@ -75,7 +75,7 @@ class implementation_check_kind_file_timestamp(interface_check_kind): if (not _os.path.exists(parameters["path"])): return { "condition": condition_decode(parameters["condition_on_missing"]), - "output": "file is missing" + "info": "file is missing" } else: result = _os.stat(parameters["path"]) @@ -84,7 +84,7 @@ class implementation_check_kind_file_timestamp(interface_check_kind): if (age < 0): return { "condition": condition_decode(parameters["condition_on_implausible"]), - "output": string_coin( + "info": string_coin( "file is apparently from the future; timestamp of checking instance: {{timestamp_this}}; timestamp of file: {{timestamp_that}} (age in seconds: {{age}})", { "timestamp_this": timestamp, @@ -104,7 +104,7 @@ class implementation_check_kind_file_timestamp(interface_check_kind): raise ValueError("impossible state") return { "condition": condition, - "output": string_coin( + "info": string_coin( "age in seconds: {{age}}", { "age": ("%u" % age), diff --git a/source/check_kinds/http_request.py b/source/check_kinds/http_request.py index 02ccdcf..3c8d80e 100644 --- a/source/check_kinds/http_request.py +++ b/source/check_kinds/http_request.py @@ -120,7 +120,7 @@ class implementation_check_kind_http_request(interface_check_kind): if (not method_handled): return { "condition": enum_condition.unknown, - "output": ("invalid HTTP request method: %s" % parameters["request"]["method"]) + "info": ("invalid HTTP request method: %s" % parameters["request"]["method"]) } else: if (response is None): @@ -130,7 +130,7 @@ class implementation_check_kind_http_request(interface_check_kind): if parameters["as_warning"] else enum_condition.critical ), - "output": "HTTP request failed", + "info": "HTTP request failed", } else: lines = [] @@ -187,6 +187,6 @@ class implementation_check_kind_http_request(interface_check_kind): enum_condition.critical ) ), - "output": "\n".join(lines), + "info": "\n".join(lines), } diff --git a/source/check_kinds/script.py b/source/check_kinds/script.py index 562d4ad..28354e9 100644 --- a/source/check_kinds/script.py +++ b/source/check_kinds/script.py @@ -53,9 +53,8 @@ class implementation_check_kind_script(interface_check_kind): condition = enum_condition.critical else: raise ValueError("invalid exit code: %i" % result.returncode) - output = result.stdout.decode() return { "condition": condition, - "output": output, + "info": result.stdout.decode(), } diff --git a/source/main.py b/source/main.py index 66c7d91..aef841a 100644 --- a/source/main.py +++ b/source/main.py @@ -523,7 +523,7 @@ def main(): check_data["name"], check_data, new_item_state, - result["output"] + result["info"] ) else: raise ValueError("invalid notification kind: %s" % notification["kind"]) diff --git a/source/notification_channels/_interface.py b/source/notification_channels/_interface.py index 7a5ca1f..4b2acc5 100644 --- a/source/notification_channels/_interface.py +++ b/source/notification_channels/_interface.py @@ -8,6 +8,6 @@ class interface_notification_channel(object): raise NotImplementedError - def notify(self, parameters, name, data, state, output): + def notify(self, parameters, name, data, state, info): raise NotImplementedError diff --git a/source/notification_channels/console.py b/source/notification_channels/console.py index df75065..d69cd3b 100644 --- a/source/notification_channels/console.py +++ b/source/notification_channels/console.py @@ -28,14 +28,14 @@ class implementation_notification_channel_console(interface_notification_channel ''' [implementation] ''' - def notify(self, parameters, name, data, state, output): + def notify(self, parameters, name, data, state, info): _sys.stdout.write( string_coin( - "[{{title}}] <{{condition}}> {{output}}\n", + "[{{title}}] <{{condition}}> {{info}}\n", { "title": data["title"], "condition": condition_encode(state["condition"]), - "output": ("(no infos)" if (output is None) else output), + "info": ("(no info)" if (info is None) else info), } ) ) diff --git a/source/notification_channels/email.py b/source/notification_channels/email.py index 3631cd6..d357bfc 100644 --- a/source/notification_channels/email.py +++ b/source/notification_channels/email.py @@ -72,7 +72,7 @@ class implementation_notification_channel_email(interface_notification_channel): ''' [implementation] ''' - def notify(self, parameters, name, data, state, output): + def notify(self, parameters, name, data, state, info): smtp_connection = _smtplib.SMTP( parameters["access"]["host"] ) @@ -82,7 +82,7 @@ class implementation_notification_channel_email(interface_notification_channel): ) message = MIMEText( string_coin( - ("(no infos)" if (output is None) else output), + ("(no info)" if (info is None) else info), { } ) @@ -111,3 +111,4 @@ class implementation_notification_channel_email(interface_notification_channel): message.as_string() ) smtp_connection.quit() + diff --git a/source/notification_channels/file_touch.py b/source/notification_channels/file_touch.py index dc8106b..a0ceb63 100644 --- a/source/notification_channels/file_touch.py +++ b/source/notification_channels/file_touch.py @@ -32,6 +32,6 @@ class implementation_notification_channel_file_touch(interface_notification_chan ''' [implementation] ''' - def notify(self, parameters, name, data, state, output): + def notify(self, parameters, name, data, state, info): _os.path.touch(parameters["path"]) diff --git a/source/notification_channels/libnotify.py b/source/notification_channels/libnotify.py index f751cd1..af4c9c7 100644 --- a/source/notification_channels/libnotify.py +++ b/source/notification_channels/libnotify.py @@ -32,7 +32,7 @@ class implementation_notification_channel_libnotify(interface_notification_chann ''' [implementation] ''' - def notify(self, parameters, name, data, state, output): + def notify(self, parameters, name, data, state, info): def condition_translate(condition): if (condition == enum_condition.unknown): return "normal" @@ -90,9 +90,9 @@ class implementation_notification_channel_libnotify(interface_notification_chann ) ## body parts.append( - "(no infos)" - if (output == "") else - output + "(no info)" + if (info == "") else + info ) _subprocess.run(parts) diff --git a/todo.md b/todo.md index ceec363..52f964b 100644 --- a/todo.md +++ b/todo.md @@ -5,6 +5,5 @@ - Matrix - Möglichkeit dauerhaft laufen zulassen (evtl. als systemd-Dienst) - Versionierung -- Umbenennung: `output` zu `info` - Test-Routinen