Changeset 3ece2bd in nscp

Timestamp:

11/08/07 21:54:39 (6 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

e46ad71

Parents:

22d2739

Message:

2007-11-08 MickeM

+ Added CheckWMIValue to check result-values from a WMI Query

• Changed so performance values are "collapsed" ie 75362115584 = 70.0G (#89)

If anyone dont want this let me know and I will make an option for it.

Files:

• AutoBuild.h (modified) (1 diff)
• NSClient++.cpp (modified) (2 diffs)
• changelog (modified) (1 diff)
• include/INISettings.h (modified) (1 diff)
• include/NSCHelper.cpp (modified) (1 diff)
• include/checkHelpers.hpp (modified) (8 diffs)
• modules/CheckSystem/CheckSystem.cpp (modified) (1 diff)
• modules/CheckWMI/CheckWMI.cpp (modified) (2 diffs)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,2,7,44
-#define PRODUCTVER     0,2,7,142
-#define STRFILEVER     "0.2.7.44"
-#define STRPRODUCTVER  "0.2.7.142"
-#define STRPRODUCTDATE  "2007-11-06"
+#define FILEVER        0,2,7,51
+#define PRODUCTVER     0,2,7,149
+#define STRFILEVER     "0.2.7.51"
+#define STRPRODUCTVER  "0.2.7.149"
+#define STRPRODUCTDATE  "2007-11-08"
 #endif // AUTOBUILD_H

NSClient++.cpp

@@ -448 +448 @@
     return;
   }
+  std::string file_stl = file;
+  std::string::size_type pos = file_stl.find_last_of("\\");
+  if (pos != std::string::npos)
+    file_stl = file_stl.substr(pos);
   {
     ReadLock readLock(&m_mutexRW, true, 5000);
@@ -479 +483 @@
         break;
       }
-      std::cout << k << " " << file << "(" << line << ") " << message << std::endl;
+      std::cout << k << " " << file_stl << "(" << line << ") " << message << std::endl;
     }
     for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {

changelog

@@ -4 +4 @@
  * Fix installer (after configuration UI)
  * Add module for relaying events
- * Fix WMI module
- * Fix PDH problems
  * Add API for rehashing the daemon (or implement it the API is there but does nothing)
+
+2007-11-08 MickeM
+ + Added CheckWMIValue to check result-values from a WMI Query
+ * Changed so performance values are "collapsed" ie 75362115584 = 70.0G (#89)
+    If anyone dont want this let me know and I will make an option for it.
 
 2007-11-06 MickeM

include/INISettings.h

@@ -172 +172 @@
     for (std::list<INIFile*>::const_iterator cit = files_.begin(); cit != files_.end(); ++cit) {
       INIFile::sectionList tmp = (*cit)->getSection(section, bufferLength);
-      std::cout << "<<< Reading: " << section << " from: " << (*cit)->getFile() << std::endl;
+      std::cout << "< Reading: " << section << " from: " << (*cit)->getFile() << std::endl;
       ret.insert(ret.begin(), tmp.begin(), tmp.end());
     }

include/NSCHelper.cpp

@@ -156 +156 @@
     if ((msgType == NSCAPI::debug) && (!logDebug()))
       return;
+    /*
     std::string::size_type pos = file.find_last_of("\\");
     if (pos != std::string::npos)
       file = file.substr(pos);
+      */
     return fNSAPIMessage(msgType, file.c_str(), line, message.c_str());
   }

include/checkHelpers.hpp

@@ -134 +134 @@
       return strEx::itos_as_BKMG(value);
     }
+    static std::string print_perf(TType value) {
+      return strEx::itos_as_BKMG(value);
+    }
     static TType parse(std::string s) {
       return strEx::stoi64_as_BKMG(s);
@@ -184 +187 @@
       return strEx::itos(value);
     }
+    static std::string print_perf(TType value) {
+      return strEx::itos(value);
+    }
     static std::string key_prefix() {
       return "";
@@ -205 +211 @@
       return strEx::itos(value);
     }
+    static std::string print_perf(int value) {
+      return strEx::itos(value);
+    }
     static std::string print_unformated(int value) {
       return strEx::itos(value);
@@ -229 +238 @@
       return strEx::itos(value);
     }
+    static std::string print_perf(__int64 value) {
+      return strEx::itos(value);
+    }
     static std::string print_unformated(__int64 value) {
       return strEx::itos(value);
@@ -235 +247 @@
       return strEx::itos(value) + "%";
     }
+    static std::string key_prefix() {
+      return "";
+    }
+    static std::string key_postfix() {
+      return "";
+    }
   };
   class double_handler {
@@ -243 +261 @@
     static double parse_percent(std::string s) {
       return strEx::stod(s);
+    }
+    static std::string print_perf(double value) {
+      return strEx::itos(value);
     }
     static std::string print(double value) {
@@ -335 +356 @@
     }
     static std::string gatherPerfData(std::string alias, TType &value, TType warn, TType crit) {
-      return MAKE_PERFDATA(alias, THandler::print_unformated(value), "", THandler::print_unformated(warn), THandler::print_unformated(crit));
+      return MAKE_PERFDATA(alias, THandler::print_perf(value), "", THandler::print_perf(warn), THandler::print_perf(crit));
     }
 
@@ -471 +492 @@
       } else {
         return 
-          MAKE_PERFDATA(alias, THandler::print_unformated(value.value), "", 
-          THandler::print_unformated(warn), THandler::print_unformated(crit));
+          MAKE_PERFDATA(alias, THandler::print_perf(value.value), "", 
+          THandler::print_perf(warn), THandler::print_perf(crit));
       }
     }

modules/CheckSystem/CheckSystem.cpp

@@ -313 +313 @@
     return strEx::itos(value);
   }
+  static std::string print_perf(int value) {
+    return strEx::itos(value);
+  }
   static std::string print_percent(int value) {
     return strEx::itos(value) + "%";

modules/CheckWMI/CheckWMI.cpp

@@ -143 +143 @@
 
 NSCAPI::nagiosReturn CheckWMI::CheckSimpleWMIValue(const unsigned int argLen, char **char_args, std::string &message, std::string &perf) {
-  message = "Not yet implemented :(";
-  return NSCAPI::returnCRIT;
+  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBounds<checkHolders::NumericBounds<long long, checkHolders::int64_handler> > > WMIConatiner;
+  std::list<std::string> stl_args = arrayBuffer::arrayBuffer2list(argLen, char_args);
+  if (stl_args.empty()) {
+    message = "ERROR: Missing argument exception.";
+    return NSCAPI::returnUNKNOWN;
+  }
+  std::list<WMIConatiner> list;
+  NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
+  WMIConatiner tmpObject;
+  bool bPerfData = true;
+  unsigned int truncate = 0;
+  std::string query;
+
+  // Query=Select ... MaxWarn=5 MaxCrit=12 Check=Col1 --(later)-- Match==test Check=Col2
+  // MaxWarnNumeric:ID=>5
+  try {
+    MAP_OPTIONS_BEGIN(stl_args)
+      MAP_OPTIONS_SHOWALL(tmpObject)
+      MAP_OPTIONS_NUMERIC_ALL(tmpObject, "")
+      MAP_OPTIONS_STR("Alias", tmpObject.data)
+      MAP_OPTIONS_STR("Query", query)
+      MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
+      MAP_OPTIONS_STR_AND("Check", tmpObject.data, list.push_back(tmpObject))
+      MAP_OPTIONS_STR("Alias", tmpObject.data)
+      MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
+        MAP_OPTIONS_SECONDARY_STR_AND(p2,"Check", tmpObject.data, tmpObject.alias, list.push_back(tmpObject))
+        MAP_OPTIONS_MISSING_EX(p2, message, "Unknown argument: ")
+      MAP_OPTIONS_SECONDARY_END()
+      MAP_OPTIONS_MISSING(message, "Unknown argument: ")
+    MAP_OPTIONS_END()
+
+  } catch (filters::parse_exception e) {
+    message = "WMIQuery failed: " + e.getMessage();
+    return NSCAPI::returnCRIT;
+  }
+
+  WMIQuery::result_type rows;
+  try {
+    rows = wmiQuery.execute(query);
+  } catch (WMIException e) {
+    message = "WMIQuery failed: " + e.getMessage();
+    return NSCAPI::returnCRIT;
+  }
+  int hit_count = 0;
+
+  for (std::list<WMIConatiner>::const_iterator it = list.begin(); it != list.end(); ++it) {
+    WMIConatiner itm = (*it);
+    itm.setDefault(tmpObject);
+    itm.perfData = bPerfData;
+    if (itm.data == "*") {
+      for (WMIQuery::result_type::const_iterator citRow = rows.begin(); citRow != rows.end(); ++citRow) {
+        for (WMIQuery::wmi_row::list_type::const_iterator citCol = (*citRow).results.begin(); citCol != (*citRow).results.end(); ++citCol) {
+          long long value = (*citCol).second.numeric;
+          itm.runCheck(value, returnCode, message, perf);
+        }
+      }
+    } 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!");
+        }
+      }
+    }
+  }
+
+  if ((truncate > 0) && (message.length() > (truncate-4)))
+    message = message.substr(0, truncate-4) + "...";
+  if (message.empty())
+    message = "OK: WMI Query returned no results.";
+  return returnCode;
 }
 
@@ -168 +244 @@
   }
   std::vector<int> widths;
-  for (WMIQuery::result_type::iterator citRow = rows.begin(); citRow != rows.end(); ++citRow) {
+  for (WMIQuery::result_type::const_iterator citRow = rows.begin(); citRow != rows.end(); ++citRow) {
     const WMIQuery::wmi_row vals = *citRow;
     if (citRow == rows.begin()) {