diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b25c15b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/CHANGELOG.md b/CHANGELOG.md index 11be77c..8216bb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,6 @@ All notable changes to rattail-shinken will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [0.6] - 2019-10-14 -### Changed -- Add the `check_systemd_service` command. - ## [0.5] - 2018-12-12 ### Changed - Add `check_supervisor_process` command. diff --git a/libexec/check_rattail_daemon_by_ssh.py b/libexec/check_rattail_daemon_by_ssh.py index 5aa0391..1ce64c2 100755 --- a/libexec/check_rattail_daemon_by_ssh.py +++ b/libexec/check_rattail_daemon_by_ssh.py @@ -108,11 +108,7 @@ if __name__ == '__main__': # Ok now connect, and try to get values for memory client = schecks.connect(hostname, port, ssh_key_file, passphrase, user) - result = execute_check(client, check_path) - if result is False: - print("failed to execute remote check!") - sys.exit(3) - else: - output, exitcode = result - print(output) - sys.exit(exitcode) + result, exitcode = execute_check(client, check_path) + + print result + sys.exit(exitcode) diff --git a/pack/commands.cfg b/pack/commands.cfg index 29be142..96260fa 100644 --- a/pack/commands.cfg +++ b/pack/commands.cfg @@ -9,8 +9,3 @@ define command { command_name check_supervisor_process command_line $PLUGINSDIR$/check_rattail_daemon_by_ssh.py -H $HOSTADDRESS$ -p $_HOSTSSH_PORT$ -u $_HOSTSSH_USER$ -i $_HOSTSSH_KEY$ -P "$_HOSTSSH_KEY_PASSPHRASE$" -r "check-supervisor-process $ARG1$" } - -define command { - command_name check_systemd_service - command_line $PLUGINSDIR$/check_rattail_daemon_by_ssh.py -H $HOSTADDRESS$ -p $_HOSTSSH_PORT$ -u $_HOSTSSH_USER$ -i $_HOSTSSH_KEY$ -P "$_HOSTSSH_KEY_PASSPHRASE$" -r "check-systemd-service $ARG1$" -} diff --git a/package.json b/package.json index 4f01fd1..7c865eb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "rattail", "types": ["pack"], - "version": "0.6", + "version": "0.5", "homepage": "https://rattailproject.org/", "author": "Lance Edgar", "contributors": [