Changeset 7443b58 in nscp for scripts/lib

Timestamp:

03/24/11 21:38:31 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

2d69ab6

Parents:

569a179

Message:

0.4.x a lot of tweaks and fixes (now works as a replacement for 0.3.x in many ways)

File:

• scripts/lib/NagiosPlugins.vbs (modified) (7 diffs)

scripts/lib/NagiosPlugins.vbs

@@ -114 +114 @@
   Public Function get_threshold (threshold)
     ' Simple function to return the warning and critical threshold
-    If threshold = LCase("warning") Then
+    If LCase(threshold) = "warning" Then
       get_threshold = threshold_warning
     End IF
     
-    If threshold = LCase("critical") Then
+    If LCase(threshold) = "critical" Then
       get_threshold = threshold_critical
     End If
@@ -136 +136 @@
   End Function
 
-  
+
+
+  Public Function get_threshold_perfdat(string)
+
+    Dim cintw0
+    Dim cintw
+    Dim x
+    Dim colon
+    
+    cintw0=get_threshold(string)
+    x=Replace(cintw0,"~","")
+    cintw0=Replace(x,"@","")
+    
+    colon=Instr(cintw0,":")
+    
+    If (colon > 1) Then
+      cintw=Left(cintw0,colon-1)
+    Else
+      If (colon=1) Then
+        cintw=Mid(cintw0,2)
+      Else
+        cintw=cintw0
+      End If
+    End If
+    
+    get_threshold_perfdat=cintw
+  
+  End Function
+  
+
   Public Function check_threshold (value)
     ' Verify the thresholds for warning and critical
@@ -152 +181 @@
     check_threshold = 0
     
+    value = CDbl(value)
+    
     Set re = New RegExp
     re.IgnoreCase = True
@@ -232 +263 @@
         Set threshold = re.Execute(threshold)
         
-        If threshold(0) < 0 Or threshold(0) > value Then
+        If value < 0 Or value > CDbl(threshold(0)) Then
+          parse_range = 1
+        Else
           parse_range = 0
-        Else
-          parse_range = 1
         End If
 
@@ -242 +273 @@
         re.Pattern = "^([0-9]+):$"
         Set threshold = re.Execute(threshold)
-        If value > threshold(0) Then
-          parse_range = 0
-        Else
-          parse_range = 1
-        End If
-
-      Case 3
-        ' outside the range infinity <- value
-        re.Pattern = "^~:([0-9]+)$"
-        Set threshold = re.Execute(threshold)
-        If value < threshold(0) Then
-          parse_range = 0
-        Else
-          parse_range = 1
-        End If
-
-      Case 4
-        ' outside the range of value:value
-        re.Pattern = "^([0-9]+):([0-9]+)$"
-        Set threshold = re.Execute(threshold)
+
         
         For Each thres In threshold
-          If value < thres.SubMatches(0) Or value > thres.SubMatches(1) Then
+                                        'Wscript.Echo "SubMatches(0): " & thres.SubMatches(0) & " val: " & value
+          If value < CDbl(thres.SubMatches(0)) Then
             parse_range = 1
           Else
@@ -271 +284 @@
         Next
         
+
+
+      Case 3
+        ' outside the range infinity <- value
+        re.Pattern = "^~:([0-9]+)$"
+        Set threshold = re.Execute(threshold)
+
+        For Each thres In threshold
+          If value > CDbl(thres.SubMatches(0)) Then
+            parse_range = 1
+          Else
+            parse_range = 0
+          End If
+        Next
+
+
+      Case 4
+        ' outside the range of value:value
+        re.Pattern = "^([0-9]+):([0-9]+)$"
+        Set threshold = re.Execute(threshold)
+        
+        For Each thres In threshold
+          If value < CDbl(thres.SubMatches(0)) Or value > CDbl(thres.SubMatches(1)) Then
+            parse_range = 1
+          Else
+            parse_range = 0
+          End If
+        Next
+        
       Case 5
         re.Pattern = "^@([0-9]+):([0-9]+)$"
@@ -276 +318 @@
         
         For Each thres In threshold
-          If value > thres.SubMatches(0) And value < thres.SubMatches(1) Then
-            Wscript.Echo "Bigger than " & thres.SubMatches(0) & " and smaller than " & thres.SubMatches(1)
+          If value >= CDbl(thres.SubMatches(0)) And value <= CDbl(thres.SubMatches(1)) Then
+            'Wscript.Echo "Bigger than " & thres.SubMatches(0) & " and smaller than " & thres.SubMatches(1)
             parse_range = 1
           Else