Changeset 1307e3f5 in nscp

Timestamp:

08/31/11 10:55:38 (21 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

81e420c

Parents:

4b1e6fe

Message:

Fixed check_battery.vbs

File:

• scripts/check_battery.vbs (modified) (2 diffs)

scripts/check_battery.vbs

@@ -9 +9 @@
 
 ' Default settings for your script.
-threshold_warning = 50
-threshold_critical = 20
+threshold_warning = "50:"
+threshold_critical = "20:"
 strComputer = "."
 
@@ -36 +36 @@
 
 For Each objInstance In colInstances
-  WScript.Echo "Battery " & objInstance.Status & " - Charge Remaining = " & objInstance.EstimatedChargeRemaining & "% | charge=" & objInstance.EstimatedChargeRemaining
+  if message <> "" then : message = message & ", "
+  if perf <> "" then : perf = perf & ", "
+  message = message & "Battery " & objInstance.Status & " - Charge Remaining = " & objInstance.EstimatedChargeRemaining & "%"
+  perf = perf & "charge=" & objInstance.EstimatedChargeRemaining
   return_code = np.escalate_check_threshold(return_code, objInstance.EstimatedChargeRemaining)
 Next
-
 ' Nice Exit with msg and exitcode
-np.nagios_exit "", return_code
+np.nagios_exit message & "|" & perf, return_code