Changeset 9661f81 in nscp for modules/CheckSystem

Timestamp:

05/10/10 22:17:31 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

f40d813

Parents:

d1029bd

Message:

2010-05-10 MickeM - 0.3.8 RC2

• Fixed issue with listpdh and debugpdh (not works again) + Fixed issue and added support for IN ( ... ) and NOT IN ( ... ) operators (CheckEventLog)

2010-05-08 MickeM

+ Added new "script templating" thing to simplify adding scripts:

Two new sections: [Script Wrappings] for adding templates and [Wrapped Scripts] for adding the scripts.

%SCRIPT% is replaced with the script name
%ARGS% is replaced with arguments.

vbs=cscript.exe T:30 NoLogo scripts\wrapper.vbs %SCRIPT% %ARGS%

and

w_vbs=check_test.vbs /arg1:1 /arg2:1 /variable:1

is the same as:

w_vbs=cscript.exe T:30 NoLogo scripts\wrapper.vbs check_test.vbs /arg1:1 /arg2:1 /variable:1

• Added correct syntax for VB scripts
• Added correct syntax for powershell scripts
• Cleaned up scripts folder + Added new "NagiosPlugin? library" from op5 + Added check_no_rdp.vbs (Checks that no RDP connection is online) + Added check_battery.vbs which checks batterys via WMI + Added check_printer.vbs to check printers via WMI

File:

• modules/CheckSystem/CheckSystem.cpp (modified) (2 diffs)

modules/CheckSystem/CheckSystem.cpp

@@ -211 +211 @@
         }
       } else {
+        if ((*it).counters.size() == 0) {
+          std::wcout << _T("empty counter: ") << (*it).name << std::endl;
+        }
         for (PDH::Enumerations::Counters::const_iterator it2 = (*it).counters.begin();it2!=(*it).counters.end();++it2) {
           std::wstring counter = _T("\\") + (*it).name + _T("\\") + (*it2).name;
@@ -235 +238 @@
           }
           std::wcout << _T(" open ");
-          std::wcout << std::endl;;
+          std::wcout << std::endl;
         }
       }