Changeset ec3fbc5 in nscp

Timestamp:

02/22/06 23:25:11 (7 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

f42280d

Parents:

1b7ae3d

Message:

Added syntax option and some date formating code.

Files:

• changelog (modified) (3 diffs)
• include/strEx.h (modified) (2 diffs)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (4 diffs)
• modules/CheckEventLog/CheckEventLog.h (modified) (1 diff)

changelog

@@ -7 +7 @@
  * Add module for relaying events
  * Check multitasking problems on the sockets.
+ * Add filtering to WMI module
+ * Fix WMI module
+ * Check date/time on eventlogs
+ * Add support for rendering results (eventlog etc) [In progress]
 
 2006-02-12 MickeM
- + Added new Interface for MOdules (NSCommandLineExec that allows modules to execute things give from command line.
-   Syntax is NSClient++ <module name> <command> [arguments] and if a mpodule doesn't support this it is simply ignored.
+ + Added new Interface for Modules (NSCommandLineExec that allows modules to execute things give from command line.
+   Syntax is NSClient++ <module name> <command> [arguments] and if a module doesn't support this it is simply ignored.
  + Added new install/uninstall command to SystemTray module:
    NSClient++.exe SystemTray install 
@@ -16 +20 @@
    That will install/uninstall the system tray module this sets the "Allow Service to Interact with Desktop" flag for the service.
  * Removed the "Allow Service to Interact with Desktop" flag from the /install option so that it no longer defaults to on (see commands to set this above).
- * Fixed so checkProcess isn't case sensetive.
+ * Fixed so checkProcess isn't case sensitive.
+ * Added (not finished) syntax option to event log checker to format the outputted data
 
 2006-02-12 MickeM
@@ -33 +38 @@
    This new command (in development) will allow various file checks such as age, size, date, etc on single or multiple files.
  + Added FILEAGE support to NSClient
- + Started to convert the webpage to WIKI
+ + Started to convert the web page to WIKI
  
 2006-01-21 MickeM

include/strEx.h

@@ -7 +7 @@
 #include <list>
 #include <functional>
+#include <time.h>
 #ifdef _DEBUG
 #include <iostream>
@@ -19 +20 @@
   }
 
+  inline std::string format_date(time_t time, std::string format) {
+    char buf[51];
+    size_t l = strftime(buf, 50, format.c_str(), gmtime(&time));
+    if (l <= 0 || l >= 50)
+      return "";
+    buf[l] = 0;
+    return buf;
+  }
 
   inline void replace(std::string &string, std::string replace, std::string with) {

modules/CheckEventLog/CheckEventLog.cpp

@@ -147 +147 @@
     return strEx::itos(dwType);
   }
+  std::string render(std::string syntax) {
+    strEx::replace(syntax, "%source%", eventSource());
+    strEx::replace(syntax, "%generated%", strEx::format_date(pevlr_->TimeGenerated, DATE_FORMAT));
+    strEx::replace(syntax, "%written%", strEx::format_date(pevlr_->TimeWritten, DATE_FORMAT));
+    strEx::replace(syntax, "%type%", translateType(eventType()));
+    strEx::replace(syntax, "%severity%", translateSeverity(severity()));
+    strEx::replace(syntax, "%strings%", enumStrings());
+    strEx::replace(syntax, "%id%", strEx::itos(eventID()));
+    return syntax;
+  }
 };
 
@@ -203 +213 @@
   bool bShowDescriptions = false;
   unsigned int truncate = 0;
+  std::string syntax;
 
   try {
@@ -212 +223 @@
       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)
@@ -273 +285 @@
 
         if ((bFilterIn&&bMatch)||(!bFilterIn&&!bMatch)) {
-          strEx::append_list(message, record.eventSource());
-          if (bShowDescriptions) {
+          if (!syntax.empty()) {
+            strEx::append_list(message, record.render(syntax));
+          } else if (bShowDescriptions) {
+            strEx::append_list(message, record.eventSource());
+          } else {
+            strEx::append_list(message, record.eventSource());
             message += "(" + EventLogRecord::translateType(record.eventType()) + ", " + strEx::itos(record.eventID()) + ", " + EventLogRecord::translateSeverity(record.severity()) + ")";
             message += "[" + record.enumStrings() + "]";

modules/CheckEventLog/CheckEventLog.h

@@ -4 +4 @@
 #include <checkHelpers.hpp>
 #include <filter_framework.hpp>
+
+
+#define DATE_FORMAT "%#c"
 
 class CheckEventLog {