Changeset 580392ac in nscp

Timestamp:

11/18/06 14:14:22 (7 years ago)

Author:

Michael Medin <michael@…>

Children:

858709e

Parents:

edbbfbb

Message:

+ Added support for empty NRPE checking (i.e.. chec_nrpe without a -c argument)

• Added error message when detected language is missing from counters.defs + Added Swedish locale to counters.defs (yes, I switched to Swedish XP on my computer :)
• Fixed : (and possibly other problems) in counters when checking from check_nt (via NSCLient protocol) + Added CheckAllExcept? to CheckDrive? to check all except the specified drives.

Location:

trunk

Files:

• changelog (modified) (4 diffs)
• counters.defs (modified) (1 diff)
• include/Socket.h (modified) (1 diff)
• include/config.h (modified) (2 diffs)
• include/thread.h (modified) (10 diffs)
• modules/CheckDisk/CheckDisk.cpp (modified) (3 diffs)
• modules/CheckSystem/CheckSystem.cpp (modified) (3 diffs)
• modules/CheckSystem/PDHCollector.cpp (modified) (3 diffs)
• modules/NRPEListener/NRPEListener.cpp (modified) (1 diff)
• modules/NSClientListener/NSClientListener.cpp (modified) (1 diff)
• modules/SysTray/SysTray.cpp (modified) (1 diff)

trunk/changelog

@@ -11 +11 @@
  * Add option to recheck DNS in real time
 
+2006-11-18 MickeM
+ + Added support for empty NRPE checking (i.e.. chec_nrpe without a -c argument)
+ * Added error message when detected language is missing from counters.defs
+ + Added Swedish locale to counters.defs (yes, I switched to Swedish XP on my computer :)
+ * Fixed : (and possibly other problems) in counters when checking from check_nt (via NSCLient protocol)
+ + Added CheckAllExcept to CheckDrive to check all except the specified drives.
+
 2006-10-05 MickeM
  * Yayyy!!! (first fix in a looong while :)
@@ -20 +27 @@
    NOTICE this is "slow" since all hosts in the list are "looked up" each time you get a NRPE/NSClient 
    request it will be "slow" but I think it is not that much of a problem really.
-   NOTICE I dont have the posibility to test this so feel free to report if it works and if it doesn't.
+   NOTICE I don't have the possibility to test this so feel free to report if it works and if it doesn't.
    Set cache_allowed_hosts=0 to disable host cache
 
@@ -100 +107 @@
    CheckWMI MaxWarn=10 MaxCrit=15 "Query:load=Select LoadPercentage from win32_Processor"
    The Max* are as every other check and sets limits. 
-   The Query works similarly to other check commands ie. Query:<name>=<WMI query>
+   The Query works similarly to other check commands i.e.. Query:<name>=<WMI query>
    So any other WMI query should work (notice this is experimental and not stable and has virtually 
    no error handling so it is likely to crash nsclient if you ask anything "non working".)
@@ -252 +259 @@
 
 2005-03-19 MickeM
- * Refactored out NSCLient Listener as a separate module
+ * Re factored out NSCLient Listener as a separate module
  + Added initial NRPE listener module (not yet implemented only a shell)
  * Changed Module API (Inject function has new syntax)

trunk/counters.defs

@@ -67 +67 @@
 NT4_MemoryCommitByte = "\Memória\Bytes confirmados"
 
+
+[0x041d]
+Description = "Swedish SE"
+
+W2K_SystemTotalProcessorTime = "\Processor(_Total)\% processortid"
+W2K_SystemSystemUpTime = "\System\Tid sedan systemstart"
+W2K_MemoryCommitLimit = "\Minne\Dedikationsgräns"
+W2K_MemoryCommitByte = "\Minne\Dedicerade byte"

trunk/include/Socket.h

@@ -247 +247 @@
 
   public:
-    Listener() : pHandler_(NULL), bindPort_(0), bindAddres_(INADDR_ANY), listenQue_(0) {};
+    Listener() : pHandler_(NULL), bindPort_(0), bindAddres_(INADDR_ANY), listenQue_(0), threadManager_("listenThreadManager") {};
     virtual ~Listener() {
       if (responderList_.size() > 0) {

trunk/include/config.h

@@ -5 +5 @@
 
 // Version
-#define SZVERSION "0.2.5h 2006-03-01"
+#define SZVERSION "0.2.6 2006-11-18"
 
 // internal name of the service
@@ -32 +32 @@
 #define NSCLIENT "nsclient"
 #define CHECK_ALL "CheckAll"
+#define CHECK_ALL_OTHERS "CheckAllOthers"
 
 // NSClient Setting headlines

trunk/include/thread.h

@@ -8 +8 @@
   std::string e_;
   ThreadException(std::string e) : e_(e) {
-    std::cout << e << std::endl;
+    std::cerr << e << std::endl;
   }
 };
@@ -38 +38 @@
 class Thread {
 private:
+  std::string threadid_;
   HANDLE hThread_;    // Thread handle
   T* pObject_;      // Wrapped object
@@ -60 +61 @@
    * Sets up default values
    */
-  Thread() : hThread_(NULL), pObject_(NULL), uThreadID(-1), bThreadHasTerminated(false), bThreadHasBeenClosed(false) {
+  Thread(std::string threadid) : threadid_(threadid), hThread_(NULL), pObject_(NULL), uThreadID(-1), bThreadHasTerminated(false), bThreadHasBeenClosed(false) {
     hMutex_ = CreateMutex(NULL, FALSE, NULL);
     assert(hMutex_ != NULL);
@@ -74 +75 @@
         ;
       else if (bThreadHasBeenClosed||bThreadHasTerminated)
-        std::cout << "Thread has not terminated correctly..." << std::endl;
+        std::cout << "Thread has not terminated correctly: " << threadid_ << "..." << std::endl;
       /*
       MutexLock mutex(hMutex_, 5000L);
@@ -132 +133 @@
       MutexLock mutex(hMutex_, 5000L);
       if (!mutex.hasMutex()) {
-        throw ThreadException("Could not retrieve mutex, thread not started...");
+        throw ThreadException("Could not retrieve mutex, thread (" + threadid_ + ") not started...");
       }
       if (pObject_) {
-        throw ThreadException("Thread already started, thread not started...");
+        throw ThreadException("Thread already started, thread (" + threadid_ + ") not started...");
       }
 //      assert(hStopEvent_ == NULL);
@@ -158 +159 @@
       MutexLock mutex(hMutex_, delay);
       if (!mutex.hasMutex()) {
-        throw ThreadException("Could not retrieve mutex, thread not stopped...");
+        throw ThreadException("Could not retrieve mutex, thread (" + threadid_ + ") not stopped...");
       }
       if (!pObject_)
@@ -172 +173 @@
       return true;
     }
-    std::cout << "Failed to terminate thread..." << std::endl;
+    std::cerr << "Failed to terminate thread: " << threadid_ << "..." << std::endl;
     assert(false);
     return false;
@@ -179 +180 @@
     MutexLock mutex(hMutex_, 5000L);
     if (!mutex.hasMutex()) {
-      throw ThreadException("Could not retrieve mutex, thread not stopped...");
+      throw ThreadException("Could not retrieve mutex, thread (" + threadid_ + ") not stopped...");
     }
     return pObject_ != NULL;
@@ -186 +187 @@
     MutexLock mutex(hMutex_, 5000L);
     if (!mutex.hasMutex()) {
-      throw ThreadException("Could not retrieve mutex, thread not stopped...");
+      throw ThreadException("Could not retrieve mutex, thread (" + threadid_ + ") not stopped...");
     }
     return pObject_;
@@ -193 +194 @@
     MutexLock mutex(hMutex_, 5000L);
     if (!mutex.hasMutex()) {
-      throw ThreadException("Could not retrieve mutex, thread not stopped...");
+      throw ThreadException("Could not retrieve mutex, thread (" + threadid_ + ") not stopped...");
     }
     return pObject_;

trunk/modules/CheckDisk/CheckDisk.cpp

@@ -100 +100 @@
   bool bFilterCDROM = false;
   bool bCheckAll = false;
+  bool bCheckAllOthers = false;
   bool bNSClient = false;
   std::list<DriveConatiner> drives;
@@ -113 +114 @@
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
     MAP_OPTIONS_BOOL_TRUE(CHECK_ALL, bCheckAll)
+    MAP_OPTIONS_BOOL_TRUE(CHECK_ALL_OTHERS, bCheckAllOthers)
     MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
       else if (p2.first == "Drive") {
@@ -143 +145 @@
       dwDrives >>= 1;
     }
+  }
+  if (bCheckAllOthers) {
+    std::list<DriveConatiner> checkdrives;
+    DWORD dwDrives = GetLogicalDrives();
+    int idx = 0;
+    while (dwDrives != 0) {
+      if (dwDrives & 0x1) {
+        std::string drv;
+        drv += static_cast<char>('A' + idx); drv += ":\\";
+        UINT drvType = GetDriveType(drv.c_str());
+        if ( ((!bFilter)&&(drvType == DRIVE_FIXED))  ||
+          ((bFilter)&&(bFilterFixed)&&(drvType==DRIVE_FIXED)) ||
+          ((bFilter)&&(bFilterCDROM)&&(drvType==DRIVE_CDROM)) ||
+          ((bFilter)&&(bFilterRemote)&&(drvType==DRIVE_REMOTE)) ||
+          ((bFilter)&&(bFilterRemovable)&&(drvType==DRIVE_REMOVABLE)) )  
+        {
+          bool bFound = false;
+          for (std::list<DriveConatiner>::const_iterator pit = drives.begin();pit!=drives.end();++pit) {
+            DriveConatiner drive = (*pit);
+            if (drive.data == drv)
+              bFound = true;
+          }
+          if (!bFound)
+            checkdrives.push_back(DriveConatiner(drv, tmpObject.warn, tmpObject.crit));
+        }
+      }
+      idx++;
+      dwDrives >>= 1;
+    }
+    drives = checkdrives;
   }
 

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -31 +31 @@
  * @return 
  */
-CheckSystem::CheckSystem() : processMethod_(0) {}
+CheckSystem::CheckSystem() : processMethod_(0), pdhThread("pdhThread") {}
 /**
  * Default d-tor
@@ -796 +796 @@
       if (!PDH::Enumerations::validate(counter.data, tstr)) {
         msg = tstr;
+        msg += " (" + counter.getAlias() + "|" + counter.data + ")";
         return NSCAPI::returnUNKNOWN;
       }
@@ -817 +818 @@
       }
     } catch (const PDH::PDHException e) {
-      NSC_LOG_ERROR_STD("ERROR: " + e.getError() + " (" + counter.getAlias() + ")");
-      msg = static_cast<std::string>("ERROR: ") + e.getError();
+      NSC_LOG_ERROR_STD("ERROR: " + e.getError() + " (" + counter.getAlias() + "|" + counter.data + ")");
+      msg = static_cast<std::string>("ERROR: ") + e.getError()+ " (" + counter.getAlias() + "|" + counter.data + ")";
       return NSCAPI::returnUNKNOWN;
     }

trunk/modules/CheckSystem/PDHCollector.cpp

@@ -67 +67 @@
     settings.setFile(NSCModuleHelper::getBasePath() + "\\counters.defs", true);
 
+    NSC_LOG_ERROR_STD("Getting counter info...");
 
     try {
@@ -93 +94 @@
       section = "0000" + strEx::ihextos(langId);
       section = "0x" + section.substr(section.length()-4);
+      if (settings.getString(section, "Description", "_NOT_FOUND") == "_NOT_FOUND") {
+        NSC_LOG_ERROR_STD("Detected language: " + section + " but it could not be found in: counters.defs");
+        NSC_LOG_ERROR_STD("You need to manually configure performance counters!");
+        return 0;
+      }
       NSC_DEBUG_MSG_STD("Detected language: " + settings.getString(section, "Description", "Not found") + " (" + section + ")");
     } catch (systemInfo::SystemInfoException e) {
@@ -111 +117 @@
   }
 
+  NSC_LOG_ERROR_STD("Attempting to open counter...");
   try {
     pdh.open();
+    NSC_LOG_ERROR_STD("Counters opend...");
   } catch (const PDH::PDHException &e) {
     NSC_LOG_ERROR_STD("Failed to open performance counters: " + e.getError());

trunk/modules/NRPEListener/NRPEListener.cpp

@@ -325 +325 @@
   }
   strEx::token cmd = strEx::getToken(p.getPayload(), '!');
+  if (cmd.first == "_NRPE_CHECK") {
+    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnOK, "I ("SZVERSION") seem to be doing fine...");
+  }
   std::string msg, perf;
 

trunk/modules/NSClientListener/NSClientListener.cpp

@@ -160 +160 @@
     case REQ_COUNTER:
       cmd.first = "checkCounter";
-      cmd.second += "&nsclient";
+      cmd.second = "Counter=" + cmd.second + "&nsclient";
       break;
     case REQ_FILEAGE:

trunk/modules/SysTray/SysTray.cpp

@@ -16 +16 @@
 }
 
-SysTray::SysTray() {}
+SysTray::SysTray() : icon("SysTray") {}
 SysTray::~SysTray() {}
 bool SysTray::loadModule() {