Changeset df0ab60 in nscp for modules/CheckWMI/CheckWMI.cpp

Timestamp:

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

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

58a724d

Parents:

5044c09

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"

File:

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

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!");
     }
   }