Changeset 0687108 in nscp for modules

Timestamp:

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

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

d48c31a

Parents:

1a22e52

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:

modules

Files:

• CheckDisk/CheckDisk.cpp (modified) (3 diffs)
• CheckSystem/CheckSystem.cpp (modified) (3 diffs)
• CheckSystem/PDHCollector.cpp (modified) (3 diffs)
• NRPEListener/NRPEListener.cpp (modified) (1 diff)
• NSClientListener/NSClientListener.cpp (modified) (1 diff)
• SysTray/SysTray.cpp (modified) (1 diff)

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;
   }
 

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;
     }

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());

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;
 

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:

modules/SysTray/SysTray.cpp

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