From 5fc2a5653c3a40dd6560de3d495b5a96ef7f9065 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Wed, 24 Jan 2024 11:41:58 +0100
Subject: [PATCH] remove emoji icons; handle "null" in license info
---
check_docker_info | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/check_docker_info b/check_docker_info
index 06947de..1f35666 100755
--- a/check_docker_info
+++ b/check_docker_info
@@ -14,6 +14,7 @@
# 2024-01-18 v1.0 <axel.hahn@unibe.ch> init
# 2024-01-22 v1.1 <axel.hahn@unibe.ch> detect DOCKER; use sudo; add debug
# 2024-01-23 v1.2 <axel.hahn@unibe.ch> Show a list of docker containers; add path
+# 2024-01-24 v1.3 <axel.hahn@unibe.ch> remove emoji icons; handle "null" in license info
# ======================================================================
@@ -117,6 +118,8 @@ iImages=$( _getString "$data" ".Images" )
sVersion=$( _getString "$data" ".ServerVersion")
sLicense=$( _getString "$data" ".ProductLicense" )
+test "$sLicense" = "null" && sLicense="no license info"
+
# --- generate result
if [ "$iCTotal" -eq "0" ]; then
@@ -159,13 +162,14 @@ if [ $bOptContainers -eq 1 ] && [ "$iCTotal" -gt "0" ]; then
sName=$( _getString "$line" ".Names" )
sState=$( _getString "$line" ".State" )
sStatus=$( _getString "$line" ".Status" )
-
- sIco="🔶"
- grep "exited" <<< "${sState}" >/dev/null && sIco="❌"
- grep "running" <<< "${sState}" >/dev/null && sIco="✅"
+ sIco=
+ # Icinga ui does not show these characters
+ # sIco="🔶"
+ # grep "exited" <<< "${sState}" >/dev/null && sIco="❌"
+ # grep "running" <<< "${sState}" >/dev/null && sIco="✅"
printf " %-14s %-40s %-20s\n" "$sIco $sState" "$sName" "$sStatus"
- # echo "$line" | jq
+
done
echo
--
GitLab