From ab137d7608369b729e156c9868a68f782a4c05a0 Mon Sep 17 00:00:00 2001 From: dmius Date: Tue, 9 Jul 2019 23:38:05 +0300 Subject: [PATCH 1/2] fix: way to receive system information with uname reworked, use uname -s instead uname -o --- resources/checks/A001_system_info.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/checks/A001_system_info.sh b/resources/checks/A001_system_info.sh index fe96b45..b3020f6 100755 --- a/resources/checks/A001_system_info.sh +++ b/resources/checks/A001_system_info.sh @@ -43,8 +43,10 @@ function get_mem_info() { } function get_system_info() { - local uname_json_data="$(${CHECK_HOST_CMD} echo \"\\\"raw\\\": \\\"$( uname -a )\\\", \\\"kernel_name\\\": \\\"$( uname -s )\\\", \\\"kernel_version\\\": \\\"$( uname -v )\\\", \\\"kernel_release\\\": \\\"$( uname -r )\\\", \\\"operating_system\\\": \\\"$( uname -o )\\\"\")" - #local sys_info="$(uname -a | sed 's/"/\\"/g')" + local uname_a_cmd='$(uname -a)' + local uname_s_cmd='$(uname -s)' + local uname_r_cmd='$(uname -r)' + local uname_json_data=$(${CHECK_HOST_CMD} "echo '\"raw\":\"'$uname_a_cmd'\", \"operating_system\":\"'$uname_s_cmd'\", \"kernel_release\":\"'$uname_r_cmd'\"'") res_obj="{\"cmd2check\": \"uname -a\", $uname_json_data}" OS_INFO=$res_obj #$(jq -n "$res_obj") } -- GitLab From 965ed9b794b4c4f1a97c61d5547481ee8a908920 Mon Sep 17 00:00:00 2001 From: dmius Date: Wed, 10 Jul 2019 00:12:26 +0300 Subject: [PATCH 2/2] Apply suggestion --- resources/checks/A001_system_info.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/resources/checks/A001_system_info.sh b/resources/checks/A001_system_info.sh index b3020f6..23eae13 100755 --- a/resources/checks/A001_system_info.sh +++ b/resources/checks/A001_system_info.sh @@ -43,10 +43,7 @@ function get_mem_info() { } function get_system_info() { - local uname_a_cmd='$(uname -a)' - local uname_s_cmd='$(uname -s)' - local uname_r_cmd='$(uname -r)' - local uname_json_data=$(${CHECK_HOST_CMD} "echo '\"raw\":\"'$uname_a_cmd'\", \"operating_system\":\"'$uname_s_cmd'\", \"kernel_release\":\"'$uname_r_cmd'\"'") + local uname_json_data=$(${CHECK_HOST_CMD} 'echo \"raw\":\"$(uname -a)\", \"operating_system\":\"$(uname -s)\", \"kernel_release\":\"$(uname -r)\"') res_obj="{\"cmd2check\": \"uname -a\", $uname_json_data}" OS_INFO=$res_obj #$(jq -n "$res_obj") } -- GitLab