Changeset 2603350 in nscp for modules/CheckEventLog

Timestamp:

02/23/07 19:25:23 (6 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

2c34b97

Parents:

d48c31a

Message:

Getting ready for the 0.2.7 release, a few minor fixes here and there...

File:

• modules/CheckEventLog/CheckEventLog.cpp (modified) (8 diffs)

modules/CheckEventLog/CheckEventLog.cpp

@@ -193 +193 @@
 
 
-#define MAP_FILTER(value, obj) \
-      else if (p__.first == value) { eventlog_filter filter; filter.obj = p__.second; filter_chain.push_back(filter); }
+#define MAP_FILTER(value, obj, filtermode) \
+      else if (p__.first == value) { eventlog_filter filter; filter.obj = p__.second; filter_chain.push_back(filteritem_type(filtermode, filter)); }
 
 
@@ -201 +201 @@
   if (command != "CheckEventLog")
     return NSCAPI::returnIgnored;
-  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBoundsUInteger> EventLogQueryConatiner;
+  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBoundsULongInteger> EventLogQueryConatiner;
+  typedef std::pair<int,eventlog_filter> filteritem_type;
+  typedef std::list<filteritem_type > filterlist_type;
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
   std::list<std::string> stl_args = arrayBuffer::arrayBuffer2list(argLen, char_args);
 
   std::list<std::string> files;
-  std::list<eventlog_filter> filter_chain;
+  filterlist_type filter_chain;
   EventLogQueryConatiner query;
 
+  bool bPerfData = true;
   bool bFilterIn = true;
   bool bFilterAll = false;
+  bool bFilterNew = false;
   bool bShowDescriptions = false;
   unsigned int truncate = 0;
   std::string syntax;
+  const int filter_plus = 1;
+  const int filter_minus = 2;
+  const int filter_normal = 3;
+  const int filter_compat = 3;
 
   try {
@@ -221 +229 @@
       MAP_OPTIONS_BOOL_TRUE("descriptions", bShowDescriptions)
       MAP_OPTIONS_PUSH("file", files)
+      MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
+      MAP_OPTIONS_BOOL_EX("filter", bFilterNew, "new", "old")
       MAP_OPTIONS_BOOL_EX("filter", bFilterIn, "in", "out")
       MAP_OPTIONS_BOOL_EX("filter", bFilterAll, "all", "any")
       MAP_OPTIONS_STR("syntax", syntax)
-      MAP_FILTER("filter-eventType", eventType)
-      MAP_FILTER("filter-severity", eventSeverity)
-      MAP_FILTER("filter-eventID", eventID)
-      MAP_FILTER("filter-eventSource", eventSource)
-      MAP_FILTER("filter-generated", timeGenerated)
-      MAP_FILTER("filter-written", timeWritten)
-      MAP_FILTER("filter-message", message)
+/*
+      MAP_FILTER_OLD("filter-eventType", eventType)
+      MAP_FILTER_OLD("filter-severity", eventSeverity)
+      MAP_FILTER_OLD("filter-eventID", eventID)
+      MAP_FILTER_OLD("filter-eventSource", eventSource)
+      MAP_FILTER_OLD("filter-generated", timeGenerated)
+      MAP_FILTER_OLD("filter-written", timeWritten)
+      MAP_FILTER_OLD("filter-message", message)
+*/
+      MAP_FILTER("filter+eventType", eventType, filter_plus)
+      MAP_FILTER("filter+severity", eventSeverity, filter_plus)
+      MAP_FILTER("filter+eventID", eventID, filter_plus)
+      MAP_FILTER("filter+eventSource", eventSource, filter_plus)
+      MAP_FILTER("filter+generated", timeGenerated, filter_plus)
+      MAP_FILTER("filter+written", timeWritten, filter_plus)
+      MAP_FILTER("filter+message", message, filter_plus)
+
+      MAP_FILTER("filter.eventType", eventType, filter_normal)
+      MAP_FILTER("filter.severity", eventSeverity, filter_normal)
+      MAP_FILTER("filter.eventID", eventID, filter_normal)
+      MAP_FILTER("filter.eventSource", eventSource, filter_normal)
+      MAP_FILTER("filter.generated", timeGenerated, filter_normal)
+      MAP_FILTER("filter.written", timeWritten, filter_normal)
+      MAP_FILTER("filter.message", message, filter_normal)
+
+      MAP_FILTER("filter-eventType", eventType, filter_minus)
+      MAP_FILTER("filter-severity", eventSeverity, filter_minus)
+      MAP_FILTER("filter-eventID", eventID, filter_minus)
+      MAP_FILTER("filter-eventSource", eventSource, filter_minus)
+      MAP_FILTER("filter-generated", timeGenerated, filter_minus)
+      MAP_FILTER("filter-written", timeWritten, filter_minus)
+      MAP_FILTER("filter-message", message, filter_minus)
+
       MAP_OPTIONS_MISSING(message, "Unknown argument: ")
     MAP_OPTIONS_END()
@@ -241 +277 @@
   }
 
-  unsigned int hit_count = 0;
+  unsigned long int hit_count = 0;
 
   for (std::list<std::string>::const_iterator cit2 = files.begin(); cit2 != files.end(); ++cit2) {
@@ -250 +286 @@
     }
 
-    DWORD dwThisRecord, dwRead, dwNeeded;
+    //DWORD dwThisRecord;
+    DWORD dwRead, dwNeeded;
     EVENTLOGRECORD *pevlr;
     BYTE bBuffer[BUFFER_SIZE]; 
@@ -259 +296 @@
     _time64(&ltime);
 
-    GetOldestEventLogRecord(hLog, &dwThisRecord);
+    //GetOldestEventLogRecord(hLog, &dwThisRecord);
 
     while (ReadEventLog(hLog, EVENTLOG_FORWARDS_READ|EVENTLOG_SEQUENTIAL_READ,
@@ -269 +306 @@
         EventLogRecord record(pevlr, ltime);
 
-        for (std::list<eventlog_filter>::const_iterator cit3 = filter_chain.begin(); cit3 != filter_chain.end(); ++cit3 ) {
-          bool bTmpMatched = (*cit3).matchFilter(record);
-          if (bFilterAll) {
-            if (!bTmpMatched) {
+        for (filterlist_type::const_iterator cit3 = filter_chain.begin(); cit3 != filter_chain.end(); ++cit3 ) {
+          int mode = (*cit3).first;
+          bool bTmpMatched = (*cit3).second.matchFilter(record);
+          if (!bFilterNew) {
+            if (bFilterAll) {
+              if (!bTmpMatched) {
+                bMatch = false;
+                break;
+              }
+            } else {
+              if (bTmpMatched) {
+                bMatch = true;
+                break;
+              }
+            }
+          } else {
+            if ((mode == filter_minus)&&(bTmpMatched)) {
+              // a -<filter> hit so thrash item and bail out!
               bMatch = false;
               break;
-            }
-          } else {
-            if (bTmpMatched) {
+            } else if ((mode == filter_plus)&&(!bTmpMatched)) {
+                // a +<filter> missed hit so thrash item and bail out!
+                bMatch = false;
+                break;
+            } else if (bTmpMatched) {
               bMatch = true;
-              break;
             }
           }
         }
-
-        if ((bFilterIn&&bMatch)||(!bFilterIn&&!bMatch)) {
+        bool match = false;
+        if ((!bFilterNew)&&((bFilterIn&&bMatch)||(!bFilterIn&&!bMatch))) {
+          match = true;
+        } else if (bFilterNew&&bMatch) {
+          match = true;
+        }
+
+        if (match) {
           if (!syntax.empty()) {
             strEx::append_list(message, record.render(syntax));
-          } else if (bShowDescriptions) {
+          } else if (!bShowDescriptions) {
             strEx::append_list(message, record.eventSource());
           } else {
@@ -304 +362 @@
     CloseEventLog(hLog);
   }
+
+  if (!bPerfData)
+    query.perfData = false;
   query.runCheck(hit_count, returnCode, message, perf);
   if ((truncate > 0) && (message.length() > (truncate-4)))