Changeset 8d928dd in nscp

Timestamp:

11/21/07 21:53:18 (6 years ago)

Author:

Michael Medin <michael@…>

Children:

81cf57a

Parents:

31509a7

Message:

2007-11-21 MickeM

• Fixed process counter so checkProcState now return the *correct* number (previously it was correct-1)
• Fixed som missing exceptions that were not caught + Added "AliasCol?" option to CheckWMIValue to allow a column to be used as "alias" for a result set:

CheckWMIValue -a "Query=select Caption, ThreadCount? from Win32_Process" MaxWarn=50 MaxCrit=100 Check:threads=ThreadCount AliasCol?=Caption

will give you: "System threads: 98 > warning, svchost.exe threads: 87 > warning"

Location:

trunk

Files:

• AutoBuild.h (modified) (1 diff)
• NSClient++-2005.vcproj (modified) (1 diff)
• NSClient++.cpp (modified) (7 diffs)
• changelog (modified) (1 diff)
• include/config.h (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (1 diff)
• modules/CheckSystem/PDHCollector.cpp (modified) (3 diffs)
• modules/CheckWMI/CheckWMI.cpp (modified) (3 diffs)

trunk/AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,2,7,84
-#define PRODUCTVER     0,2,7,182
-#define STRFILEVER     "0.2.7.84"
-#define STRPRODUCTVER  "0.2.7.182"
-#define STRPRODUCTDATE  "2007-11-18"
+#define FILEVER        0,2,7,88
+#define PRODUCTVER     0,2,7,186
+#define STRFILEVER     "0.2.7.88"
+#define STRPRODUCTVER  "0.2.7.186"
+#define STRPRODUCTDATE  "2007-11-20"
 #endif // AUTOBUILD_H

trunk/NSClient++-2005.vcproj

@@ -634 +634 @@
       <Tool
         Name="VCCustomBuildTool"
-        CommandLine="echo Seting up scripts&#x0D;&#x0A;cmd /c &quot;mkdir $(InputDir)\Dist\scripts\&quot;&#x0D;&#x0A;cmd /c &quot;xcopy /Q /Y $(InputDir)\scripts\*.bat $(InputDir)\Dist\scripts\&quot;&#x0D;&#x0A;echo Removing old archive&#x0D;&#x0A;cmd /c &quot;del &quot;$(InputDir)\Dist\modules\*.pdb&quot;&quot;&#x0D;&#x0A;cmd /c &quot;del &quot;$(InputDir)\Dist\*.zip&quot;&quot;&#x0D;&#x0A;echo Making archive&#x0D;&#x0A;7z.exe a -r -tzip -bd $(TargetDir)\$(InputName)-$(PlatformName).zip $(TargetDir)\*&#x0D;&#x0A;echo Renaming archive&#x0D;&#x0A;postbuild.pl &quot;$(TargetDir)\$(InputName)-$(PlatformName).zip&quot;&#x0D;&#x0A;echo Sending to server&#x0D;&#x0A;pscp.exe $(TargetDir)\*.zip mickem@ssl.nakednuns.org:/var/www/files/nightly/&#x0D;&#x0A;"
+        CommandLine="echo Seting up scripts&#x0D;&#x0A;cmd /c &quot;mkdir &quot;$(InputDir)\Dist\scripts\&quot;&quot;&#x0D;&#x0A;cmd /c &quot;xcopy /Q /Y &quot;$(InputDir)\scripts\*.*&quot; &quot;$(InputDir)\Dist\scripts\&quot;&quot;&#x0D;&#x0A;echo Removing old archive&#x0D;&#x0A;cmd /c &quot;del &quot;$(InputDir)\Dist\modules\*.pdb&quot;&quot;&#x0D;&#x0A;cmd /c &quot;del &quot;$(InputDir)\Dist\*.zip&quot;&quot;&#x0D;&#x0A;echo Making archive&#x0D;&#x0A;7z.exe a -r -tzip -bd &quot;$(TargetDir)\$(ProjectName)-$(PlatformName).zip&quot; &quot;$(TargetDir)\*&quot;&#x0D;&#x0A;echo Renaming archive&#x0D;&#x0A;postbuild.pl &quot;$(TargetDir)\$(ProjectName)-$(PlatformName).zip&quot;&#x0D;&#x0A;echo Sending to server&#x0D;&#x0A;pscp.exe &quot;$(TargetDir)\*.zip&quot; mickem@ssl.nakednuns.org:/var/www/files/nightly/&#x0D;&#x0A;"
         Outputs="$(InputDir)\Dist\$(ProjectName).zip"
       />

trunk/NSClient++.cpp

@@ -106 +106 @@
     } else if ( _stricmp( "noboot", argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
+      mainClient.enableDebug(true);
       int nRetCode = -1;
       if (argc>=4)
@@ -181 +182 @@
   try {
     Settings::getInstance()->setFile(getBasePath(), "NSC.ini");
+    if (debug_) {
+      Settings::getInstance()->setInt("log", "debug", 1);
+    }
   } catch (SettingsException e) {
     LOG_ERROR_STD("Could not find settings: " + e.getMessage());
@@ -187 +191 @@
     LOG_ERROR_STD("Unknown exception reading settings...");
     return false;
-  }
-  if (debug_) {
-    Settings::getInstance()->setInt("log", "debug", 1);
   }
 
@@ -201 +202 @@
     return false;
   }
-
-  SettingsT::sectionList list = Settings::getInstance()->getSection("modules");
-  for (SettingsT::sectionList::iterator it = list.begin(); it != list.end(); it++) {
-    try {
-      loadPlugin(getBasePath() + "modules\\" + (*it));
-    } catch(const NSPluginException& e) {
-      LOG_ERROR_STD("Exception raised: " + e.error_ + " in module: " + e.file_);
-      return false;
-    } catch (...) {
-      LOG_ERROR_STD("Unknown exception loading plugin: " + (*it));
-      return false;
-    }
+  try {
+    SettingsT::sectionList list = Settings::getInstance()->getSection("modules");
+    for (SettingsT::sectionList::iterator it = list.begin(); it != list.end(); it++) {
+      try {
+        loadPlugin(getBasePath() + "modules\\" + (*it));
+      } catch(const NSPluginException& e) {
+        LOG_ERROR_STD("Exception raised: " + e.error_ + " in module: " + e.file_);
+        return false;
+      } catch (...) {
+        LOG_ERROR_STD("Unknown exception loading plugin: " + (*it));
+        return false;
+      }
+    }
+  } catch (SettingsException e) {
+    NSC_LOG_ERROR_STD("Failed to set settings file" + e.getMessage());
   }
   try {
@@ -472 +476 @@
   static status d = unknown;
   if (d == unknown) {
-    if (Settings::getInstance()->getInt("log", "debug", 0) == 1)
+    try {
+      if (Settings::getInstance()->getInt("log", "debug", 0) == 1)
+        d = debug;
+      else
+        d = nodebug;
+    } catch (SettingsException e) {
       d = debug;
-    else
-      d = nodebug;
+    }
   }
   return (d == debug);
@@ -554 +562 @@
   basePath = path.substr(0, pos) + "\\";
   delete [] buffer;
-  Settings::getInstance()->setFile(basePath, "NSC.ini");
+  try {
+    Settings::getInstance()->setFile(basePath, "NSC.ini");
+  } catch (SettingsException e) {
+    NSC_LOG_ERROR_STD("Failed to set settings file" + e.getMessage());
+  }
   return basePath;
 }
@@ -563 +575 @@
 }
 int NSAPIGetSettingsInt(const char* section, const char* key, int defaultValue) {
-  return Settings::getInstance()->getInt(section, key, defaultValue);
+  try {
+    return Settings::getInstance()->getInt(section, key, defaultValue);
+  } catch (SettingsException e) {
+    NSC_LOG_ERROR_STD("Failed to set settings file" + e.getMessage());
+  }
 }
 NSCAPI::errorReturn NSAPIGetBasePath(char*buffer, unsigned int bufLen) {

trunk/changelog

@@ -5 +5 @@
  * Add module for relaying events
  * Add API for rehashing the daemon (or implement it the API is there but does nothing)
+
+2007-11-21 MickeM
+ * Fixed process counter so checkProcState  now return the *correct* number (previously it was correct-1)
+ * Fixed som missing exceptions that were not caught
+ + Added "AliasCol" option to CheckWMIValue to allow a column to be used as "alias" for a result set:
+     CheckWMIValue -a "Query=select Caption, ThreadCount from Win32_Process" MaxWarn=50 MaxCrit=100 Check:threads=ThreadCount AliasCol=Caption
+    will give you: "System threads: 98 > warning, svchost.exe threads: 87 > warning"
+
+2007-11-20 MickeM
+ + Added new option to CheckSystem to override detected language (force_language=0x0014)
 
 2007-11-19 MickeM

trunk/include/config.h

@@ -108 +108 @@
 #define C_SYSTEM_AUTODETECT_PDH "auto_detect_pdh"
 #define C_SYSTEM_AUTODETECT_PDH_DEFAULT 1
+#define C_SYSTEM_FORCE_LANGUAGE "force_language"
+#define C_SYSTEM_FORCE_LANGUAGE_DEFAULT ""
 
 #define C_SYSTEM_MEM_PAGE_LIMIT "MemoryCommitLimit"

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -725 +725 @@
   for (BOOL OK = enumeration.GetProcessFirst(&entry); OK; OK = enumeration.GetProcessNext(&entry) ) {
     NSPROCLST::iterator it = ret.find(entry.sFilename);
-    if (it == ret.end())
+    if (it == ret.end()) {
       ret[entry.sFilename].entry = entry;
-    else
+      ret[entry.sFilename].count = 1;
+    } else
       (*it).second.count++;
   }

trunk/modules/CheckSystem/PDHCollector.cpp

@@ -64 +64 @@
     SettingsT settings;
     std::string prefix;
-    std::string section;
     settings.setFile(NSCModuleHelper::getBasePath(),  "counters.defs", true);
-
-    NSC_LOG_ERROR_STD("Getting counter info...");
+    std::string section = NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_FORCE_LANGUAGE, C_SYSTEM_FORCE_LANGUAGE_DEFAULT);
 
     try {
@@ -92 +90 @@
       }
 
-      section = "0000" + strEx::ihextos(langId);
-      section = "0x" + section.substr(section.length()-4);
+      if (!section.empty()) {
+        NSC_DEBUG_MSG_STD("Overriding language with: " + section);
+      } else {
+        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");
@@ -101 +103 @@
       NSC_DEBUG_MSG_STD("Detected language: " + settings.getString(section, "Description", "Not found") + " (" + section + ")");
     } catch (const systemInfo::SystemInfoException &e) {
-      //NSC_LOG_ERROR_STD("System detection failed, PDH will be disabled: " + e.getError());
       NSC_LOG_ERROR_STD("To manual set performance counters you need to first set " C_SYSTEM_AUTODETECT_PDH "=0 in the config file, and then you also need to configure the various counter.");
       return -1;

trunk/modules/CheckWMI/CheckWMI.cpp

@@ -155 +155 @@
   unsigned int truncate = 0;
   std::string query;
+  std::string aliasCol;
 
   // Query=Select ... MaxWarn=5 MaxCrit=12 Check=Col1 --(later)-- Match==test Check=Col2
@@ -163 +164 @@
       MAP_OPTIONS_NUMERIC_ALL(tmpObject, "")
       MAP_OPTIONS_STR("Alias", tmpObject.data)
+      MAP_OPTIONS_STR("AliasCol", aliasCol)
       MAP_OPTIONS_STR("Query", query)
       MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
@@ -199 +201 @@
         }
       }
-    } else {
-      for (WMIQuery::result_type::const_iterator citRow = rows.begin(); citRow != rows.end(); ++citRow) {
-        bool found = false;
-        for (WMIQuery::wmi_row::list_type::const_iterator citCol = (*citRow).results.begin(); citCol != (*citRow).results.end(); ++citCol) {
-          if ((*citCol).first == itm.data) {
-            found = true;
-            long long value = (*citCol).second.numeric;
-            itm.runCheck(value, returnCode, message, perf);
-          }
-        }
-        if (!found) {
-          NSC_LOG_ERROR_STD("Column: " + itm.data + " was not found!");
+    }
+  }
+  for (WMIQuery::result_type::const_iterator citRow = rows.begin(); citRow != rows.end(); ++citRow) {
+    bool found = false;
+    std::string alias;
+    if (!aliasCol.empty()) {
+      alias = (*citRow).get(aliasCol).string;
+    }
+    for (WMIQuery::wmi_row::list_type::const_iterator citCol = (*citRow).results.begin(); citCol != (*citRow).results.end(); ++citCol) {
+      for (std::list<WMIConatiner>::const_iterator it = list.begin(); it != list.end(); ++it) {
+        WMIConatiner itm = (*it);
+        if (itm.data == "*") {
+          found = true;
+        } else if ((*citCol).first == itm.data) {
+          std::string oldAlias = itm.alias;
+          if (!alias.empty())
+            itm.alias = alias + " " + itm.getAlias();
+          found = true;
+          long long value = (*citCol).second.numeric;
+          itm.runCheck(value, returnCode, message, perf);
+          itm.alias = oldAlias;
         }
       }
+    }
+    if (!found) {
+      NSC_LOG_ERROR_STD("A column was not found!");
     }
   }