Changeset 5da0459 in nscp for modules/NSCAAgent/NSCAAgent.h

Timestamp:

10/31/09 16:00:26 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

f0eb62d

Parents:

37e6081 (diff), 3d782f8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

BROKEN!
First attempt at merging...

File:

• modules/NSCAAgent/NSCAAgent.h (modified) (3 diffs)

modules/NSCAAgent/NSCAAgent.h

@@ -49 +49 @@
   */
   std::wstring getModuleName() {
+#ifdef HAVE_LIBCRYPTOPP
+    return _T("NSCAAgent (w/ encryption)");
+#else
     return _T("NSCAAgent");
+#endif
   }
   /**
@@ -60 +64 @@
   }
   std::wstring getModuleDescription() {
-    return _T("Various system related checks, such as CPU load, process state, service state memory usage and PDH counters.");
+    return std::wstring(_T("Passive check support (needs NSCA on nagios server).\nAvalible crypto are: ")) + getCryptos();
   }
 
@@ -68 +72 @@
   int commandLineExec(const TCHAR* command, const unsigned int argLen, TCHAR** args);
 
-  NSCAPI::nagiosReturn checkCPU(const unsigned int argLen, char **char_args, std::wstring &msg, std::wstring &perf);
-  NSCAPI::nagiosReturn checkUpTime(const unsigned int argLen, char **char_args, std::wstring &msg, std::wstring &perf);
-  NSCAPI::nagiosReturn checkServiceState(const unsigned int argLen, char **char_args, std::wstring &msg, std::wstring &perf);
-  NSCAPI::nagiosReturn checkMem(const unsigned int argLen, char **char_args, std::wstring &msg, std::wstring &perf);
-  NSCAPI::nagiosReturn checkProcState(const unsigned int argLen, char **char_args, std::wstring &msg, std::wstring &perf);
-  NSCAPI::nagiosReturn checkCounter(const unsigned int argLen, char **char_args, std::wstring &msg, std::wstring &perf);
+  std::wstring getCryptos();
 
 };