Changeset 228

Timestamp:

12/31/09 16:21:31 (2 years ago)

Author:

mickem

Message:

2009-12-31 MickeM

• Fixed CheckFile* time handling so it is "signed" This means you can check for "future dates" as well as future dates works correctly: Like so:

CheckFile2 debug path=D:\tmp\dates filter+creation=>30m MaxWarn=1 MaxCrit=1 "syntax=%filename%: %creation%"
CRITICAL:past.txt: Thursday, December 31, 2009 08:47:30, found files: 1 > critical|'found files'=1;1;1;
CheckFile2 debug path=D:\tmp\dates filter+creation=<-30m MaxWarn=1 MaxCrit=1 "syntax=%filename%: %creation%"
CRITICAL:future.txt: C: Thursday, December 31, 2009 12:47:11, found files: 1 > critical|'found files'=1;1;1;

+ Added volume support for CheckDriveSize (CHeckAll) like so:

Like so:

CheckDriveSize MinWarn=50% MinCrit=25% CheckAll?=volumes FilterType?=FIXED FilterType?=REMOTE

+ Added %user% to syntax to print user who generated message.

Like so:

CheckEventLog file=application file=system filter=new filter=out MaxWarn=1 MaxCrit=1 filter-generated=>2w filter-severity==success filter-severity==informational truncate=1023 unique descriptions "syntax=%user% (%count%)"
CRITICAL: (1), (2), NT INSTANS\SYSTEM (3), NT INSTANS\SYSTEM (3), NT INSTANS\SYSTEM (3), missing (3), missing (5), (4), missing (2), missing (2), missing (2), missing (2), (1), eventlog: 33 > critical|'eventlog'=33;1;1;

2009-12-21 MickeM

! BREAKING CHANGE!
! New perfoamcen data syntax for ALL % checks

Alias is '<alias> %' and it also has the "full" non % data as '<alias>'
Like so:

CheckDriveSize CheckAll? MaxWarnUsed?=80% MaxCritUsed?=90%
CRITICAL:CRITICAL: C:\: Total: 146G - Used: 140G (95%) - Free: 6.31G (5%) > critical, D:\: Total: 152G - Used: 148G (97%) - Free: 3.59G (3%) > critical|'C:\ %'=95%;80;90; 'C:\'=140.17G;117.18;131.83;0;146.48; 'D:\ %'=97%;80;90; 'D:\'=147.93G;121.21;136.3;0;151.52;
CheckDriveSize CheckAll? MaxWarnFree?=20% MaxCritFree?=10%
OK:OK: All drives within bounds.|'C:\ %'=5%;20;10; 'C:\'=140.17G;29.29;14.64;0;146.48; 'D:\ %'=3%;20;10; 'D:\'=147.93G;30.30;15.15;0;151.52;
CheckDriveSize CheckAll? MaxWarnUsed?=100G MaxCritUsed?=150G
WARNING:WARNING: C:\: Total: 146G - Used: 140G (95%) - Free: 6.31G (5%) > warning, D:\: Total: 152G - Used: 148G (97%) - Free: 3.59G (3%) > warning|'C:\ %'=95%;32;4294967294; 'C:\'=140.17G;100;150;0;146.48; 'D:\ %'=97%;35;2; 'D:\'=147.93G;100;150;0;151.52;
CheckDriveSize CheckAll? MaxWarnFree?=20G MaxCritFree?=10G
OK:OK: All drives within bounds.|'C:\ %'=5%;87;94; 'C:\'=140.17G;20;10;0;146.48; 'D:\ %'=3%;87;94; 'D:\'=147.93G;20;10;0;151.52;

Location:

branches/stable

Files:

• AutoBuild.h (modified) (1 diff)
• changelog (modified) (1 diff)
• include/checkHelpers.hpp (modified) (2 diffs)
• include/filter_framework.hpp (modified) (2 diffs)
• modules/CheckDisk/CheckDisk.cpp (modified) (10 diffs)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (2 diffs)

branches/stable/AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,7,512
-#define PRODUCTVER     0,3,7,512
-#define STRFILEVER     _T("0.3.7.512")
-#define STRPRODUCTVER  _T("0.3.7.512")
-#define STRPRODUCTDATE  _T("2009-12-13")
+#define FILEVER        0,3,8,3
+#define PRODUCTVER     0,3,8,3
+#define STRFILEVER     _T("0.3.8.3")
+#define STRPRODUCTVER  _T("0.3.8.3")
+#define STRPRODUCTDATE  _T("2009-12-31")
 #endif // AUTOBUILD_H

branches/stable/changelog

@@ -6 +6 @@
  * Fix depend onservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2009-12-31 MickeM
+ * Fixed CheckFile* time handling so it is "signed"
+   This means you can check for "future dates" as well as future dates works correctly:
+   Like so:
+    CheckFile2 debug path=D:\tmp\dates filter+creation=>30m MaxWarn=1 MaxCrit=1 "syntax=%filename%: %creation%"
+    CRITICAL:past.txt: Thursday, December 31, 2009 08:47:30, found files: 1 > critical|'found files'=1;1;1;
+    CheckFile2 debug path=D:\tmp\dates filter+creation=<-30m MaxWarn=1 MaxCrit=1 "syntax=%filename%: %creation%"
+    CRITICAL:future.txt: C: Thursday, December 31, 2009 12:47:11, found files: 1 > critical|'found files'=1;1;1;
+ + Added volume support for CheckDriveSize (CHeckAll) like so:
+   Like so:
+    CheckDriveSize MinWarn=50% MinCrit=25% CheckAll=volumes FilterType=FIXED FilterType=REMOTE
+ + Added %user% to syntax to print user who generated message.
+   Like so:
+    CheckEventLog file=application file=system filter=new filter=out MaxWarn=1 MaxCrit=1 filter-generated=>2w filter-severity==success filter-severity==informational truncate=1023 unique descriptions "syntax=%user% (%count%)"
+    CRITICAL: (1),  (2), NT INSTANS\SYSTEM (3), NT INSTANS\SYSTEM (3), NT INSTANS\SYSTEM (3), missing (3), missing (5),  (4), missing (2), missing (2), missing (2), missing (2),  (1), eventlog: 33 > critical|'eventlog'=33;1;1;
+
+2009-12-21 MickeM
+ ! BREAKING CHANGE!
+ ! New perfoamcen data syntax for ALL % checks
+   Alias is '<alias> %' and it also has the "full" non % data as '<alias>'
+   Like so:
+  CheckDriveSize CheckAll MaxWarnUsed=80% MaxCritUsed=90%
+  CRITICAL:CRITICAL: C:\: Total: 146G - Used: 140G (95%) - Free: 6.31G (5%) > critical, D:\: Total: 152G - Used: 148G (97%) - Free: 3.59G (3%) > critical|'C:\ %'=95%;80;90; 'C:\'=140.17G;117.18;131.83;0;146.48; 'D:\ %'=97%;80;90; 'D:\'=147.93G;121.21;136.3;0;151.52;
+  CheckDriveSize CheckAll MaxWarnFree=20% MaxCritFree=10%
+  OK:OK: All drives within bounds.|'C:\ %'=5%;20;10; 'C:\'=140.17G;29.29;14.64;0;146.48; 'D:\ %'=3%;20;10; 'D:\'=147.93G;30.30;15.15;0;151.52;
+  CheckDriveSize CheckAll MaxWarnUsed=100G MaxCritUsed=150G
+  WARNING:WARNING: C:\: Total: 146G - Used: 140G (95%) - Free: 6.31G (5%) > warning, D:\: Total: 152G - Used: 148G (97%) - Free: 3.59G (3%) > warning|'C:\ %'=95%;32;4294967294; 'C:\'=140.17G;100;150;0;146.48; 'D:\ %'=97%;35;2; 'D:\'=147.93G;100;150;0;151.52;
+  CheckDriveSize CheckAll MaxWarnFree=20G MaxCritFree=10G
+  OK:OK: All drives within bounds.|'C:\ %'=5%;87;94; 'C:\'=140.17G;20;10;0;146.48; 'D:\ %'=3%;87;94; 'D:\'=147.93G;20;10;0;151.52;
 
 2009-12-13 MickeM

branches/stable/include/checkHelpers.hpp

@@ -25 +25 @@
 
 #define MAKE_PERFDATA(alias, value, unit, warn, crit) _T("'") + alias + _T("'=") + value + unit + _T(";") + warn + _T(";") + crit + _T("; ")
+#define MAKE_PERFDATA_EX(alias, value, unit, warn, crit, xmin, xmax) _T("'") + alias + _T("'=") + value + unit + _T(";") + warn + _T(";") + crit + _T(";") + xmin + _T(";") + xmax + _T("; ")
 
 namespace checkHolders {
@@ -694 +695 @@
     }
     std::wstring gatherPerfData(std::wstring alias, TType &value, typename TType::TValueType warn, typename TType::TValueType crit) {
+      unsigned int value_p, warn_p, crit_p;
+      TType::TValueType value_v, warn_v, crit_v;
       if (type_ == percentage_upper) {
-        return 
-          MAKE_PERFDATA(alias, THandler::print_unformated(value.getUpperPercentage()), _T("%"), 
-          THandler::print_unformated(warn), THandler::print_unformated(crit));
+        value_p = value.getUpperPercentage();
+        warn_p = warn;
+        crit_p = crit;
+        warn_v = static_cast<double>(value.total)*static_cast<double>(warn)/100.0;
+        crit_v = value.total*(double(crit)/100);;
       } else if (type_ == percentage_lower) {
-          return 
-            MAKE_PERFDATA(alias, THandler::print_unformated(value.getLowerPercentage()), _T("%"), 
-            THandler::print_unformated(warn), THandler::print_unformated(crit));
+        value_p = value.getLowerPercentage();
+        warn_p = warn;
+        crit_p = crit;
+        warn_v = static_cast<double>(value.total)*static_cast<double>(warn)/100.0;
+        crit_v = value.total*(double(crit)/100);
       } else if (type_ == value_upper) {
-        std::wstring unit = THandler::get_perf_unit(min(warn, min(crit, value.value)));
-        return 
-          MAKE_PERFDATA(alias, THandler::print_perf((value.value), unit), unit, 
-          THandler::print_perf(value.total-warn, unit), THandler::print_perf(value.total-crit, unit));
+        value_p = value.getUpperPercentage();
+        warn_p = 100-(warn*100/value.total);
+        crit_p = 100-(crit*100/value.total);
+        warn_v = warn;
+        crit_v = crit;
       } else {
-        std::wstring unit = THandler::get_perf_unit(min(warn, min(crit, value.value)));
-        return 
-          MAKE_PERFDATA(alias, THandler::print_perf(value.value, unit), unit, 
-          THandler::print_perf(warn, unit), THandler::print_perf(crit, unit));
-      }
+        value_p = value.getLowerPercentage();
+        warn_p = 100-(warn*100/value.total);
+        crit_p = 100-(crit*100/value.total);
+        warn_v = warn;
+        crit_v = crit;
+      }
+      std::wstring unit = THandler::get_perf_unit(min(warn_v, min(crit_v, value.value)));
+      return 
+        MAKE_PERFDATA(alias + _T(" %"), THandler::print_unformated(value_p), _T("%"), THandler::print_unformated(warn_p), THandler::print_unformated(crit_p))
+        + 
+        MAKE_PERFDATA_EX(alias, THandler::print_perf(value.value, unit), unit, THandler::print_perf(warn_v, unit), THandler::print_perf(crit_v, unit), 
+          THandler::print_perf(0, unit), THandler::print_perf(value.total, unit))
+        ;
     }
   private:

branches/stable/include/filter_framework.hpp

@@ -55 +55 @@
     struct not_string_filter {
       static bool filter(std::wstring filter, std::wstring str) {
-        std::wcout << str << _T("=") << filter << _T(": ") << (!(bool)(str == filter)) << std::endl;
         return !(str == filter);
       }
@@ -380 +379 @@
     }
   };
-  typedef filter_all_numeric<unsigned long long, checkHolders::time_handler<unsigned long long> > filter_all_times;
+  typedef filter_all_numeric<__int64, checkHolders::time_handler<__int64> > filter_all_times;
   typedef filter_all_numeric<unsigned long, checkHolders::int_handler > filter_all_num_ul;
 

branches/stable/modules/CheckDisk/CheckDisk.cpp

@@ -169 +169 @@
   bool bFilterFixed = false;
   bool bFilterCDROM = false;
-  bool bCheckAll = false;
+  bool bCheckAllDrives = false;
   bool bCheckAllOthers = false;
   bool bNSClient = false;
   bool bPerfData = true;
   std::list<DriveContainer> drives;
+  std::wstring strCheckAll;
 
   MAP_OPTIONS_BEGIN(args)
@@ -185 +186 @@
     MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
-    MAP_OPTIONS_BOOL_TRUE(CHECK_ALL, bCheckAll)
+    //MAP_OPTIONS_BOOL_TRUE(CHECK_ALL, bCheckAll)
+    MAP_OPTIONS_STR(CHECK_ALL, strCheckAll)
     MAP_OPTIONS_BOOL_TRUE(CHECK_ALL_OTHERS, bCheckAllOthers)
     MAP_OPTIONS_SECONDARY_BEGIN(_T(":"), p2)
@@ -199 +201 @@
   bFilter = bFilterFixed || bFilterCDROM  || bFilterRemote || bFilterRemovable;
 
-  if (drives.size() == 0)
-    bCheckAll = true;
-
-  if (bCheckAll) {
+  if ((drives.size() == 0) && strCheckAll.empty())
+    bCheckAllDrives = true;
+
+  if (strCheckAll == _T("volumes")) {
+
+    DWORD bufSize = GetLogicalDriveStrings(0, NULL)+5;
+    TCHAR *buffer = new TCHAR[bufSize+10];
+    if (GetLogicalDriveStrings(bufSize, buffer)>0) {
+      while (buffer[0] != 0) {
+        std::wstring drv = buffer;
+
+        UINT drvType = GetDriveType(drv.c_str());
+        if ( ((!bFilter)&&(drvType == DRIVE_FIXED))  ||
+          ((bFilter)&&(bFilterFixed)&&(drvType==DRIVE_FIXED)) ||
+          ((bFilter)&&(bFilterCDROM)&&(drvType==DRIVE_CDROM)) ||
+          ((bFilter)&&(bFilterRemote)&&(drvType==DRIVE_REMOTE)) ||
+          ((bFilter)&&(bFilterRemovable)&&(drvType==DRIVE_REMOVABLE)) )
+          drives.push_back(DriveContainer(drv, tmpObject.warn, tmpObject.crit));
+
+        buffer = &buffer[drv.size()];
+        buffer++;
+      }
+    } else {
+      NSC_LOG_ERROR_STD(_T("Failed to get buffer size: ") + error::lookup::last_error());
+    }
+  }
+
+  if (bCheckAllDrives) {
     DWORD dwDrives = GetLogicalDrives();
     int idx = 0;
@@ -429 +455 @@
     , cached_count(false, 0)
   {
+    std::wcout << _T("[") << filename_ << _T("]") << std::endl;
+    std::cout << "C: " << info.ftCreationTime.dwHighDateTime << ":" << info.ftCreationTime.dwLowDateTime << std::endl;
+    std::cout << "A: " << info.ftLastAccessTime.dwHighDateTime << ":" << info.ftLastAccessTime.dwLowDateTime << std::endl;
+    std::cout << "M: " << info.ftLastWriteTime.dwHighDateTime << ":" << info.ftLastWriteTime.dwLowDateTime << std::endl;
     ullSize = ((info.nFileSizeHigh * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)info.nFileSizeLow);
     ullCreationTime = ((info.ftCreationTime.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)info.ftCreationTime.dwLowDateTime);
@@ -447 +477 @@
 
   unsigned long long ullSize;
-  unsigned long long ullCreationTime;
-  unsigned long long ullLastAccessTime;
-  unsigned long long ullLastWriteTime;
-  unsigned long long ullNow;
+  __int64 ullCreationTime;
+  __int64 ullLastAccessTime;
+  __int64 ullLastWriteTime;
+  __int64 ullNow;
   std::wstring filename;
   std::wstring path;
@@ -456 +486 @@
   std::pair<bool,unsigned long> cached_count;
 
+  static const __int64 MSECS_TO_100NS = 10000;
+
+  __int64 get_creation() {
+    return (ullNow-ullCreationTime)/MSECS_TO_100NS;
+  }
+  __int64 get_access() {
+    return (ullNow-ullLastAccessTime)/MSECS_TO_100NS;
+  }
+  __int64 get_write() {
+    return (ullNow-ullLastWriteTime)/MSECS_TO_100NS;
+  }
   std::wstring render(std::wstring syntax) {
     strEx::replace(syntax, _T("%path%"), path);
@@ -462 +503 @@
     strEx::replace(syntax, _T("%access%"), strEx::format_filetime(ullLastAccessTime, DATE_FORMAT));
     strEx::replace(syntax, _T("%write%"), strEx::format_filetime(ullLastWriteTime, DATE_FORMAT));
+/*
+    strEx::replace(syntax, _T("%creation-d%"), strEx::format_filetime(ullCreationTime, DATE_FORMAT));
+    strEx::replace(syntax, _T("%access-d%"), strEx::format_filetime(ullLastAccessTime, DATE_FORMAT));
+    strEx::replace(syntax, _T("%write-d%"), strEx::format_filetime(ullLastWriteTime, DATE_FORMAT));
+*/
     strEx::replace(syntax, _T("%size%"), strEx::itos_as_BKMG(ullSize));
     if (cached_version.first)
@@ -531 +577 @@
   filters::filter_all_strings version;
   filters::filter_all_num_ul line_count;
-  static const __int64 MSECS_TO_100NS = 10000;
 
   inline bool hasFilter() {
@@ -540 +585 @@
     if ((size.hasFilter())&&(size.matchFilter(value.ullSize)))
       return true;
-    else if ((creation.hasFilter())&&(creation.matchFilter((value.ullNow-value.ullCreationTime)/MSECS_TO_100NS)))
+    else if (creation.hasFilter()&&creation.matchFilter(value.get_creation()))
       return true;
-    else if ((accessed.hasFilter())&&(accessed.matchFilter((value.ullNow-value.ullLastAccessTime)/MSECS_TO_100NS)))
+    else if (accessed.hasFilter()&&accessed.matchFilter(value.get_access()))
       return true;
-    else if ((written.hasFilter())&&(written.matchFilter((value.ullNow-value.ullLastWriteTime)/MSECS_TO_100NS)))
+    else if (written.hasFilter()&&written.matchFilter(value.get_write()))
       return true;
     else if ((version.hasFilter())&&(version.matchFilter(value.get_version())))
@@ -970 +1015 @@
     finder.debug_ = debug;
     finder.now = ((now.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now.dwLowDateTime);
+    if (debug)
+      NSC_DEBUG_MSG_STD(_T("NOW: ") + strEx::format_filetime(finder.now));
     finder.syntax = syntax;
     NSC_error errors;

branches/stable/modules/CheckEventLog/CheckEventLog.cpp

@@ -223 +223 @@
     return pevlr_->EventType;
   }
-/*
+
   std::wstring userSID() const {
     if (pevlr_->UserSidOffset == 0)
-      return "";
+      return _T("");
     PSID p = reinterpret_cast<PSID>(reinterpret_cast<LPBYTE>(pevlr_) + + pevlr_->UserSidOffset);
-    LPSTR user = new CHAR[1025];
-    LPSTR domain = new CHAR[1025];
-    DWORD userLen = 1024;
-    DWORD domainLen = 1024;
+    DWORD userLen = 0;
+    DWORD domainLen = 0;
     SID_NAME_USE sidName;
+
+    LookupAccountSid(NULL, p, NULL, &userLen, NULL, &domainLen, &sidName);
+    LPTSTR user = new TCHAR[userLen+10];
+    LPTSTR domain = new TCHAR[domainLen+10];
+
     LookupAccountSid(NULL, p, user, &userLen, domain, &domainLen, &sidName);
     user[userLen] = 0;
     domain[domainLen] = 0;
-    return std::wstring(domain) + "\\" + std::wstring(user);
-  }
-  */
+    std::wstring ustr = user;
+    std::wstring dstr = domain;
+    delete [] user;
+    delete [] domain;
+    if (!dstr.empty())
+      dstr = dstr + _T("\\");
+    if (ustr.empty() && dstr.empty())
+      return _T("missing");
+
+    return dstr + ustr;
+  }
 
   std::wstring enumStrings() const {
@@ -394 +405 @@
     strEx::replace(syntax, _T("%strings%"), enumStrings());
     strEx::replace(syntax, _T("%id%"), strEx::itos(eventID()));
+    strEx::replace(syntax, _T("%user%"), userSID());
     return syntax;
   }