From 3a49418e45a6af3625deaa41b229f8d279d9b445 Mon Sep 17 00:00:00 2001 From: Konstantin Shalygin Date: Sat, 30 Dec 2023 12:55:10 +0300 Subject: [PATCH] collect-smartctl-json: shell fixes for script (#188) * Remove `"`, `(` and `)` from file names (see #188) * Added regex ignore for some devices, fixes: ``` Collecting data for '/dev/sda'... Saving to sat-Intel_S4510_S4610_S4500_S4600_Series_SSDs-INTEL_SSDSC2KB240G8-sda.json Collecting data for '/dev/sdb'... Saving to sat-Intel_S4510_S4610_S4500_S4600_Series_SSDs-INTEL_SSDSC2KB240G8-sdb.json Collecting data for '/dev/bus/0'...jq: error (at :34): null (null) cannot be matched, as it is not a string Saving to null-null--0.json Collecting data for '/dev/bus/0'...jq: error (at :34): null (null) cannot be matched, as it is not a string Saving to null-null--0.json Collecting data for '/dev/nvme0'... Saving to nvme-null-HUSMR7632BHP301-nvme0.json Collecting data for '/dev/nvme1'... Saving to nvme-null-HUSMR7632BHP301-nvme1.json Collecting data for '/dev/nvme2'... Saving to nvme-null-HUSMR7632BHP301-nvme2.json Collecting data for '/dev/nvme3'... Saving to nvme-null-HUSMR7632BHP301-nvme3.json Collecting data for '/dev/nvme4'... Saving to nvme-null-HUSMR7632BHP301-nvme4.json ``` The `/dev/bus/*` is some pseudo-device comes with Broadcom driver, after fix: ``` Collecting data for '/dev/sda'... Saving to sat-Intel_S4510_S4610_S4500_S4600_Series_SSDs-INTEL_SSDSC2KB240G8-sda.json Collecting data for '/dev/sdb'... Saving to sat-Intel_S4510_S4610_S4500_S4600_Series_SSDs-INTEL_SSDSC2KB240G8-sdb.json Collecting data for '/dev/nvme0'... Saving to nvme-null-HUSMR7632BHP301-nvme0.json Collecting data for '/dev/nvme1'... Saving to nvme-null-HUSMR7632BHP301-nvme1.json Collecting data for '/dev/nvme2'... Saving to nvme-null-HUSMR7632BHP301-nvme2.json Collecting data for '/dev/nvme3'... Saving to nvme-null-HUSMR7632BHP301-nvme3.json Collecting data for '/dev/nvme4'... Saving to nvme-null-HUSMR7632BHP301-nvme4.json ``` Signed-off-by: Konstantin Shalygin --- collect-smartctl-json.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/collect-smartctl-json.sh b/collect-smartctl-json.sh index 89144c1..a658c37 100755 --- a/collect-smartctl-json.sh +++ b/collect-smartctl-json.sh @@ -11,6 +11,9 @@ data_dir="${script_dir}/smartctl-data" smartctl_args="--json --info --health --attributes --tolerance=verypermissive \ --nocheck=standby --format=brief --log=error" +# Ignore this devices +smartctl_ignore_dev_regex="^(/dev/bus)" + # Determine the json query tool to use if command -v jq >/dev/null; then json_tool="jq" @@ -42,7 +45,7 @@ if [[ $# -ne 0 ]]; then devices="${1}" else devices="$(smartctl --scan --json | "${json_tool}" "${json_args}" \ -'.devices[].name')" +".devices[].name | select(test(\"${smartctl_ignore_dev_regex}\") | not)")" mapfile -t devices <<< "${devices[@]}" fi @@ -53,9 +56,10 @@ for device in "${devices[@]}" data="$($SUDO smartctl ${smartctl_args} ${device})" type="$(echo "${data}" | "${json_tool}" "${json_args}" '.device.type')" family="$(echo "${data}" | "${json_tool}" "${json_args}" \ -'select(.model_family != null) | .model_family | sub(" |/" ; "_" ; "g")')" +'select(.model_family != null) | .model_family | sub(" |/" ; "_" ; "g") + | sub("\"|\\(|\\)" ; "" ; "g")')" model="$(echo "${data}" | "${json_tool}" "${json_args}" \ -'.model_name | sub(" |/" ; "_" ; "g")')" +'.model_name | sub(" |/" ; "_" ; "g") | sub("\"|\\(|\\)" ; "" ; "g")')" device_name="$(basename "${device}")" echo -e "\tSaving to ${type}-${family:=null}-${model}-${device_name}.json" echo "${data}" > \