Bladeren bron

corrected bugfix - check fails if nonnumeric value

Volker Tanger 3 maanden geleden
bovenliggende
commit
6575859427
2 gewijzigde bestanden met toevoegingen van 21 en 21 verwijderingen
  1. 17 21
      functions.moshel
  2. 4 0
      history.txt

+ 17 - 21
functions.moshel

@@ -8,7 +8,7 @@
 #
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-MOSHELVERSION="2.1.7"
+MOSHELVERSION="2.1.8"
 
 #---------------------------------------------------------
 # init library and files
@@ -89,11 +89,10 @@ CheckValueUnder () {
     fi
     RESULT=$( /bin/bash -c "$Command" | awk "$Awk" | cut -d "." -f 1 | cut -d "," -f 1  )
 
-#    if [ -z "$RESULT" ]; then
-#    	TextsAndGraphs "${Name}" 2 "Check failed"
-#	RESULT=-1
-#    el
-    if [ "$RESULT" -ge $Value ]; then
+    if [ -z "$RESULT" ]; then
+    	TextsAndGraphs "${Name}" 2 "Check failed"
+	RESULT=0
+    elif [ "$RESULT" -ge $Value ]; then
     	TextsAndGraphs "${Name}" 1 "(${RESULT} !over! ${Value}) ${Message}"
     else
     	TextsAndGraphs "${Name}" 0 "(${RESULT} under ${Value}) ok"
@@ -116,11 +115,10 @@ CheckValueOver () {
     fi
     RESULT=$( /bin/bash -c "$Command" | awk "$Awk" | cut -d "." -f 1 | cut -d "," -f 1  )
 
-#    if [ -z "$RESULT" ]; then
-#   	TextsAndGraphs "${Name}" 2 "Check failed"
-#	RESULT=-1
-#    el
-    if [ "$RESULT" -le $Value ]; then
+    if [ -z "$RESULT" ]; then
+   	TextsAndGraphs "${Name}" 2 "Check failed"
+	RESULT=0
+    elif [ "$RESULT" -le $Value ]; then
     	TextsAndGraphs "${Name}" 1 "(${RESULT} !under! ${Value}) ${Message}"
     else
     	TextsAndGraphs "${Name}" 0 "(${RESULT} over ${Value}) ok"
@@ -143,11 +141,10 @@ CheckCountLessThan () {
     fi
     RESULT=$( /bin/bash -c "$Command" | awk "$Awk" | wc -l  )
 
-#    if [ -z "$RESULT" ]; then
-#    	TextsAndGraphs "${Name}" 2 "Check failed"
-#	RESULT=-1
-#    el
-    if [ "$RESULT" -ge $Value ]; then
+    if [ -z "$RESULT" ]; then
+    	TextsAndGraphs "${Name}" 2 "Check failed"
+	RESULT=0
+    elif [ "$RESULT" -ge $Value ]; then
     	TextsAndGraphs "${Name}" 1 "(${RESULT} !above! ${Value}) ${Message}"
     else
     	TextsAndGraphs "${Name}" 0 "(${RESULT} below ${Value}) ok"
@@ -169,11 +166,10 @@ CheckCountMoreThan () {
     fi
     RESULT=$( /bin/bash -c "$Command" | awk "$Awk" | wc -l  )
 
-#    if [ -z "$RESULT" ]; then
-#    	TextsAndGraphs "${Name}" 2 "Check failed"
-#	RESULT=-1
-#    el
-    if [ "$RESULT" -le $Value ]; then
+    if [ -z "$RESULT" ]; then
+    	TextsAndGraphs "${Name}" 2 "Check failed"
+	RESULT=0
+    elif [ "$RESULT" -le $Value ]; then
     	TextsAndGraphs "${Name}" 1 "(${RESULT} !below! ${Value}) ${Message}"
     else
     	TextsAndGraphs "${Name}" 0 "(${RESULT} above ${Value}) ok"

+ 4 - 0
history.txt

@@ -66,6 +66,10 @@ wanted checks (examples)
 
 ------------------------------------------------------------------------
 
+2024-08-27
+    Volker Tanger <volker.tanger@wyae.de>
+	* bugfix: corrected bugfix before: check for non-numeric values.
+	
 2024-08-05
     Volker Tanger <volker.tanger@wyae.de>
 	* bugfix: removed old "check failed" when value is 0