Skip to content

Commit 7103e33

Browse files
committed
feat(json): Fields 'target' and 'parameter' added
'target' contains the value from 'HOSTNAME', 'parameter' from 'PORT' column as defined in 'MY_HOSTNAME_FILE'. 'site' stays unchanged and contains either the 'HOSTNAME' or custom Display name information. Inspired by Cyclenerd#29
1 parent ec53f3f commit 7103e33

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

status.sh

+7-5
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ while IFS=';' read -r MY_DOWN_COMMAND MY_DOWN_HOSTNAME_STRING MY_DOWN_PORT MY_DO
970970
MY_DISPLAY_TEXT="${MY_DISPLAY_TEXT:1}"
971971
(( MY_OUTAGE_COUNT++ ))
972972
MY_OUTAGE_ITEMS+=("$(item_down)")
973-
MY_ITEMS_JSON+=("${MY_DISPLAY_TEXT:-${MY_DOWN_HOSTNAME}};$MY_DOWN_COMMAND;Fail")
973+
MY_ITEMS_JSON+=("${MY_DISPLAY_TEXT:-${MY_DOWN_HOSTNAME}};$MY_DOWN_COMMAND;Fail;${MY_DOWN_HOSTNAME};${MY_DOWN_PORT}")
974974
fi
975975

976976
done <"$MY_HOSTNAME_STATUS_DOWN"
@@ -985,7 +985,7 @@ while IFS=';' read -r MY_DEGRADE_COMMAND MY_DEGRADE_HOSTNAME_STRING MY_DEGRADE_T
985985
MY_DISPLAY_TEXT="${MY_DISPLAY_TEXT:1}"
986986
(( MY_DEGRADE_COUNT++ ))
987987
MY_DEGRADE_ITEMS+=("$(item_degrade)")
988-
MY_ITEMS_JSON+=("${MY_DISPLAY_TEXT:-${MY_DEGRADE_HOSTNAME}};$MY_DEGRADE_COMMAND;Degraded")
988+
MY_ITEMS_JSON+=("${MY_DISPLAY_TEXT:-${MY_DEGRADE_HOSTNAME}};$MY_DEGRADE_COMMAND;Degraded;${MY_DEGRADE_HOSTNAME};")
989989
fi
990990

991991
done <"$MY_HOSTNAME_STATUS_DEGRADE"
@@ -1008,7 +1008,7 @@ while IFS=';' read -r MY_OK_COMMAND MY_OK_HOSTNAME_STRING MY_OK_PORT || [[ -n "$
10081008
MY_DISPLAY_TEXT="${MY_DISPLAY_TEXT:1}"
10091009
(( MY_AVAILABLE_COUNT++ ))
10101010
MY_AVAILABLE_ITEMS+=("$(item_ok)")
1011-
MY_ITEMS_JSON+=("${MY_DISPLAY_TEXT:-${MY_OK_HOSTNAME}};$MY_OK_COMMAND;OK")
1011+
MY_ITEMS_JSON+=("${MY_DISPLAY_TEXT:-${MY_OK_HOSTNAME}};$MY_OK_COMMAND;OK;${MY_OK_HOSTNAME};${MY_OK_PORT}")
10121012
fi
10131013

10141014
done <"$MY_HOSTNAME_STATUS_OK"
@@ -1085,8 +1085,10 @@ if [ -n "$MY_STATUS_JSON" ]; then
10851085
MY_OUTAGE_ITEM=$(sed -e 's/<[^>]*>//g' <<< "${ITEMS[0]}")
10861086
MY_OUTAGE_ITEM_CMD="${ITEMS[1]}"
10871087
MY_OUTAGE_ITEM_STATUS="${ITEMS[2]}"
1088-
printf ' {\n "site": "%s",\n "command": "%s",\n "status": "%s",\n "updated": "%s"\n }' \
1089-
"$MY_OUTAGE_ITEM" "$MY_OUTAGE_ITEM_CMD" "$MY_OUTAGE_ITEM_STATUS" "$MY_DATE_TIME" >> "$MY_STATUS_JSON"
1088+
MY_OUTAGE_ITEM_TARGET="${ITEMS[3]}"
1089+
MY_OUTAGE_ITEM_PARAMETER="${ITEMS[4]}"
1090+
printf ' {\n "site": "%s",\n "command": "%s",\n "status": "%s",\n "updated": "%s"\n "target": "%s"\n "parameter": "%s"\n }' \
1091+
"$MY_OUTAGE_ITEM" "$MY_OUTAGE_ITEM_CMD" "$MY_OUTAGE_ITEM_STATUS" "$MY_DATE_TIME" "$MY_OUTAGE_ITEM_TARGET" "$MY_OUTAGE_ITEM_PARAMETER" >> "$MY_STATUS_JSON"
10901092
if [ "$position" -lt "$(( ${#MY_ITEMS_JSON[@]} - 1 ))" ]; then
10911093
printf ",\n" >> "$MY_STATUS_JSON"
10921094
else

0 commit comments

Comments
 (0)