Changeset 7da80b5 in nscp for trunk/modules/CheckSystem

Timestamp:

05/23/05 21:24:32 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

e93e741

Parents:

3b8eb61

Message:

2005-05-23 MickeM

+ Added obfuscated password support
+ Added some more debug info on commands (returncode, and input args)
+ Added some more comments ot the NSC.ini
+ Added central password "override"
+ Added central "host override"
+ Fixed bug with external commands always getting WARNING state

2005-05-22 MickeM

+ Added debug outout for command
+ Added timestamps for log-to-file (date_mask to configure format)
+ Added support for "no password" with check_nt
+ Added log of bad password on NSClient requests.

• Some threading issues fixed (I hate threading :)

Location:

trunk/modules/CheckSystem

Files:

• CheckSystem.cpp (modified) (9 diffs)
• PDHCollector.cpp (modified) (6 diffs)
• PDHCollector.h (modified) (1 diff)

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -297 +297 @@
   NSCAPI::nagiosReturn ret = NSCAPI::returnOK;
   bool bShowAll = false;
+  bool bNSClient = false;
 
   for (arrayBuffer::arrayList::const_iterator it = stl_args.begin(); it != stl_args.end(); ++it) {
@@ -302 +303 @@
     if (t.first == SHOW_ALL)
       bShowAll = true;
+    else if (t.first == NSCLIENT)
+      bNSClient = true;
     else if (t.first == SHOW_FAIL)  {
       bShowAll = false;
@@ -339 +342 @@
   }
   if (msg.empty())
-    msg ="All services ok.";
+    msg ="All services are running.";
+  else if (!bNSClient)
+    msg = NSCHelper::translateReturn(ret) + ": " + msg;
   return ret;
 }
@@ -345 +350 @@
 
 /**
- * Check availible memory and return various check results
+ * Check available memory and return various check results
  * Example: checkMem showAll maxWarn=50 maxCrit=75
  *
@@ -468 +473 @@
   NSCAPI::nagiosReturn ret = NSCAPI::returnOK;
   bool bShowAll = false;
+  bool bNSClient = false;
 
   for (arrayBuffer::arrayList::const_iterator it = stl_args.begin(); it != stl_args.end(); ++it) {
@@ -473 +479 @@
     if (t.first == SHOW_ALL)
       bShowAll = true;
+    else if (t.first == NSCLIENT)
+      bNSClient = true;
     else if (t.first == SHOW_FAIL)  {
       bShowAll = false;
@@ -518 +526 @@
   if (msg.empty())
     msg ="All processes ok.";
+  else if (!bNSClient)
+    msg = NSCHelper::translateReturn(ret) + ": " + msg;
   return ret;
 }
@@ -583 +593 @@
     try {
       PDH::PDHQuery pdh;
-      PDHCollectors::StaticPDHCounterListener counter;
+      PDHCollectors::StaticPDHCounterListenerInt counter;
       std::string name = (*it).first;
       if (name.empty())
@@ -591 +601 @@
       pdh.collect();
       if (bNSCLientCompatible) {
+//        std::cout << counter.getValue() << std::endl;
         msg += strEx::itos(counter.getValue());
       } else {

trunk/modules/CheckSystem/PDHCollector.cpp

@@ -36 +36 @@
 
 /**
- * Thread that collects the data every "CHECK_INTERVAL" seconds.
- *
- * @param lpParameter Not used
- * @return thread exit status
- *
- * @author mickem
- *
- * @date 03-13-2004
- *
- * @bug If we have "custom named" counters ?
- * @bug This whole concept needs work I think.
- *
- */
+* Thread that collects the data every "CHECK_INTERVAL" seconds.
+*
+* @param lpParameter Not used
+* @return thread exit status
+*
+* @author mickem
+*
+* @date 03-13-2004
+*
+* @bug If we have "custom named" counters ?
+* @bug This whole concept needs work I think.
+*
+*/
 DWORD PDHCollector::threadProc(LPVOID lpParameter) {
   PDH::PDHQuery pdh;
@@ -103 +103 @@
 
 /**
- * Request termination of the thread (waiting for thread termination is not handled)
- */
+* Request termination of the thread (waiting for thread termination is not handled)
+*/
 void PDHCollector::exitThread(void) {
   MutexLock mutex(mutexHandler);
@@ -116 +116 @@
     if (!SetEvent(hStopEvent_)) {
       NSC_LOG_ERROR_STD("SetStopEvent failed");
-  }
+    }
 }
 /**
- * Get the average CPU usage for "time"
- * @param time Time to check 
- * @return average CPU usage
- */
+* Get the average CPU usage for "time"
+* @param time Time to check 
+* @return average CPU usage
+*/
 int PDHCollector::getCPUAvrage(std::string time) {
   unsigned int mseconds = strEx::stoui_as_time(time, checkIntervall_*100);
@@ -133 +133 @@
 }
 /**
- * Get uptime from counter
- * @bug Do we need to collect this all the time ? (perhaps we can collect this in real time ?)
- * @return uptime for the system
- * @bug Are we overflow protected here ? (seem to recall some issues with overflow before ?)
- */
+* Get uptime from counter
+* @bug Do we need to collect this all the time ? (perhaps we can collect this in real time ?)
+* @return uptime for the system
+* @bug Are we overflow protected here ? (seem to recall some issues with overflow before ?)
+*/
 long long PDHCollector::getUptime() {
   MutexLock mutex(mutexHandler);
@@ -147 +147 @@
 }
 /**
- * Memory commit limit (your guess is as good as mine to what this is :)
- * @return Some form of memory check
- */
+* Memory commit limit (your guess is as good as mine to what this is :)
+* @return Some form of memory check
+*/
 long long PDHCollector::getMemCommitLimit() {
   MutexLock mutex(mutexHandler);
@@ -159 +159 @@
 }
 /**
- *
- * Memory committed bytes (your guess is as good as mine to what this is :)
- * @return Some form of memory check
- */
+*
+* Memory committed bytes (your guess is as good as mine to what this is :)
+* @return Some form of memory check
+*/
 long long PDHCollector::getMemCommit() {
   MutexLock mutex(mutexHandler);

trunk/modules/CheckSystem/PDHCollector.h

@@ -30 +30 @@
   int checkIntervall_;
 
-  PDHCollectors::StaticPDHCounterListener memCmtLim;
-  PDHCollectors::StaticPDHCounterListener memCmt;
-  PDHCollectors::StaticPDHCounterListener upTime;
+  PDHCollectors::StaticPDHCounterListenerInt memCmtLim;
+  PDHCollectors::StaticPDHCounterListenerInt memCmt;
+  PDHCollectors::StaticPDHCounterListenerInt upTime;
   PDHCollectors::RoundINTPDHBufferListener cpu;