Changeset fe75eff in nscp for modules/CheckSystem

Timestamp:

08/16/11 16:54:55 (21 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

438998b

Parents:

b9498ef

Message:

2011-08-16 MickeM

• Added support for remote WMI checking using target/username/password options like so:

CheckWMI target=192.168.0.123 user=
foobar password=foobar namespace=root
cimv2 MaxCrit=3 MinWarn=1 "Query:load=Select * from win32_Processor"

• Added support for looking up targets to CheckWMI CheckWMI target=my_test_xp MaxCrit=3 MinWarn=1 "Query:load=Select * from win32_Processor" Where <target> is defined under /settings/targets as well as /settings/targets/my_test_xp

2011-08-15 MickeM

• Added support for target in default plugin helpers
• Added remote WMI commands
• Added target section under /settings/targets

Location:

modules/CheckSystem

Files:

• CheckSystem.cpp (modified) (1 diff)
• CheckSystem.h (modified) (2 diffs)

modules/CheckSystem/CheckSystem.cpp

@@ -402 +402 @@
  * @return 
  */
-NSCAPI::nagiosReturn CheckSystem::handleCommand(const std::wstring command, std::list<std::wstring> arguments, std::wstring &msg, std::wstring &perf) {
+NSCAPI::nagiosReturn CheckSystem::handleCommand(const std::wstring &target, const std::wstring &command, std::list<std::wstring> &arguments, std::wstring &message, std::wstring &perf) {
   CheckSystem::returnBundle rb;
   if (command == _T("checkcpu")) {
-    return checkCPU(arguments, msg, perf);
+    return checkCPU(arguments, message, perf);
   } else if (command == _T("checkuptime")) {
-    return checkUpTime(arguments, msg, perf);
+    return checkUpTime(arguments, message, perf);
   } else if (command == _T("checkservicestate")) {
-    return checkServiceState(arguments, msg, perf);
+    return checkServiceState(arguments, message, perf);
   } else if (command == _T("checkprocstate")) {
-    return checkProcState(arguments, msg, perf);
+    return checkProcState(arguments, message, perf);
   } else if (command == _T("checkmem")) {
-    return checkMem(arguments, msg, perf);
+    return checkMem(arguments, message, perf);
   } else if (command == _T("checkcounter")) {
-    return checkCounter(arguments, msg, perf);
+    return checkCounter(arguments, message, perf);
   } else if (command == _T("listcounterinstances")) {
-    return listCounterInstances(arguments, msg, perf);
+    return listCounterInstances(arguments, message, perf);
   } else if (command == _T("checksingleregentry")) {
-    return checkSingleRegEntry(arguments, msg, perf);
+    return checkSingleRegEntry(arguments, message, perf);
   }
   return NSCAPI::returnIgnored;

modules/CheckSystem/CheckSystem.h

@@ -28 +28 @@
 NSC_WRAPPERS_CLI();
 
-class CheckSystem : public nscapi::impl::SimpleCommand, public nscapi::impl::simple_plugin {
+class CheckSystem : public nscapi::impl::simple_command, public nscapi::impl::simple_plugin {
 private:
   CheckMemory memoryChecker;
@@ -76 +76 @@
   bool hasCommandHandler();
   bool hasMessageHandler();
-  NSCAPI::nagiosReturn handleCommand(const std::wstring command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf);
+  NSCAPI::nagiosReturn handleCommand(const std::wstring &target, const std::wstring &command, std::list<std::wstring> &arguments, std::wstring &message, std::wstring &perf);
   int commandLineExec(const wchar_t* command,const unsigned int argLen,wchar_t** args);