Changeset 34e7428 in nscp for modules/CheckWMI/CheckWMI.cpp

Timestamp:

07/01/08 06:39:49 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

da1c7e1

Parents:

a720da5

Message:

Added new option (namespace) to CheckWMI and CheckWMIValue use like so:

CheckWMI namespace=root
cimv2 MaxCrit=3 MinWarn=1 "Query:load=Select * from win32_Processor"

File:

• modules/CheckWMI/CheckWMI.cpp (modified) (10 diffs)

modules/CheckWMI/CheckWMI.cpp

@@ -80 +80 @@
 
 NSCAPI::nagiosReturn CheckWMI::CheckSimpleWMI(const unsigned int argLen, TCHAR **char_args, std::wstring &message, std::wstring &perf) {
-  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBounds<checkHolders::NumericBounds<int, checkHolders::int_handler> > > WMIConatiner;
+  typedef checkHolders::CheckContainer<checkHolders::MaxMinBounds<checkHolders::NumericBounds<int, checkHolders::int_handler> > > WMIContainer;
 
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
@@ -92 +92 @@
   unsigned int truncate = 0;
   std::wstring query, alias;
+  std::wstring ns = _T("root\\cimv2");
   bool bPerfData = true;
 
-  WMIConatiner result_query;
+  WMIContainer result_query;
   try {
     MAP_OPTIONS_BEGIN(args)
     MAP_OPTIONS_STR(_T("Query"), query)
     MAP_OPTIONS_STR2INT(_T("truncate"), truncate)
+    MAP_OPTIONS_STR2INT(_T("namespace"), ns)
     MAP_OPTIONS_STR(_T("Alias"), alias)
     MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
@@ -123 +125 @@
   try {
     WMIQuery wmiQuery;
-    rows = wmiQuery.execute(query);
+    rows = wmiQuery.execute(ns, query);
   } catch (WMIException e) {
     message = _T("WMIQuery failed: ") + e.getMessage();
@@ -151 +153 @@
 
 NSCAPI::nagiosReturn CheckWMI::CheckSimpleWMIValue(const unsigned int argLen, TCHAR **char_args, std::wstring &message, std::wstring &perf) {
-  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBounds<checkHolders::NumericBounds<long long, checkHolders::int64_handler> > > WMIConatiner;
+  typedef checkHolders::CheckContainer<checkHolders::MaxMinBounds<checkHolders::NumericBounds<long long, checkHolders::int64_handler> > > WMIContainer;
   std::list<std::wstring> stl_args = arrayBuffer::arrayBuffer2list(argLen, char_args);
   if (stl_args.empty()) {
@@ -157 +159 @@
     return NSCAPI::returnUNKNOWN;
   }
-  std::list<WMIConatiner> list;
+  std::list<WMIContainer> list;
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
-  WMIConatiner tmpObject;
+  WMIContainer tmpObject;
   bool bPerfData = true;
   unsigned int truncate = 0;
   std::wstring query;
+  std::wstring ns = _T("root\\cimv2");
   std::wstring aliasCol;
 
@@ -171 +174 @@
       MAP_OPTIONS_SHOWALL(tmpObject)
       MAP_OPTIONS_NUMERIC_ALL(tmpObject, _T(""))
+      MAP_OPTIONS_STR2INT(_T("namespace"), ns)
       MAP_OPTIONS_STR(_T("Alias"), tmpObject.data)
       MAP_OPTIONS_STR(_T("AliasCol"), aliasCol)
@@ -192 +196 @@
   try {
     WMIQuery wmiQuery;
-    rows = wmiQuery.execute(query);
+    rows = wmiQuery.execute(ns, query);
   } catch (WMIException e) {
     message = _T("WMIQuery failed: ") + e.getMessage();
@@ -199 +203 @@
   int hit_count = 0;
 
-  for (std::list<WMIConatiner>::const_iterator it = list.begin(); it != list.end(); ++it) {
-    WMIConatiner itm = (*it);
+  for (std::list<WMIContainer>::const_iterator it = list.begin(); it != list.end(); ++it) {
+    WMIContainer itm = (*it);
     itm.setDefault(tmpObject);
     itm.perfData = bPerfData;
@@ -219 +223 @@
     }
     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);
+      for (std::list<WMIContainer>::const_iterator it = list.begin(); it != list.end(); ++it) {
+        WMIContainer itm = (*it);
         if (itm.data == _T("*")) {
           found = true;
@@ -258 +262 @@
   //WMIQuery wmiQuery;
   std::wstring query = command;
+  std::wstring ns = _T("root\\cimv2");
   query += _T(" ") + arrayBuffer::arrayBuffer2string(char_args, argLen, _T(" "));
   WMIQuery::result_type rows;
   try {
     WMIQuery wmiQuery;
-    rows = wmiQuery.execute(query);
+    rows = wmiQuery.execute(ns, query);
   } catch (WMIException e) {
     NSC_LOG_ERROR_STD(_T("WMIQuery failed: ") + e.getMessage());