Changeset 75d5e70 in nscp

Timestamp:

08/15/05 18:48:14 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

89f1a84

Parents:

e26cfe0

Message:

Alot of fixes and some changes (se changelog for details)

Files:

• NSCPlugin.cpp (modified) (1 diff)
• NSClient++.cpp (modified) (2 diffs)
• NSClient++.vcproj (modified) (3 diffs)
• changelog (modified) (1 diff)
• docs/CheckDisk/index.html (modified) (5 diffs)
• docs/CheckEventLog/index.html (modified) (9 diffs)
• docs/CheckSystem/index.html (modified) (5 diffs)
• docs/welcome.html (modified) (2 diffs)
• include/NSCAPI.h (modified) (2 diffs)
• include/PDHCounter.h (modified) (3 diffs)
• include/ServiceCmd.cpp (modified) (2 diffs)
• include/ServiceCmd.h (modified) (1 diff)
• include/checkHelpers.hpp (modified) (19 diffs)
• include/config.h (modified) (2 diffs)
• include/strEx.h (modified) (2 diffs)
• include/thread.h (modified) (9 diffs)
• include/utils.h (modified) (2 diffs)
• modules/CheckDisk/CheckDisk.cpp (modified) (6 diffs)
• modules/CheckDisk/CheckDisk.vcproj (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (4 diffs)
• modules/CheckEventLog/CheckEventLog.h (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (22 diffs)
• modules/CheckSystem/PDHCollector.cpp (modified) (3 diffs)
• modules/SysTray/TrayIcon.cpp (modified) (1 diff)
• modules/SysTray/TrayIcon.h (modified) (1 diff)

NSCPlugin.cpp

@@ -121 +121 @@
   if (!fGetVersion)
     throw NSPluginException(file_, "Critical error (fGetVersion)");
-  return fGetVersion(major, minor, revision);
+  return fGetVersion(major, minor, revision)?true:false;
 }
 /**

NSClient++.cpp

@@ -44 +44 @@
       try {
         serviceControll::Install(SZSERVICENAME, SZSERVICEDISPLAYNAME, SZDEPENDENCIES);
+        serviceControll::SetDescription(SZSERVICENAME, SZSERVICEDESCRIPTION);
       } catch (const serviceControll::SCException& e) {
         LOG_MESSAGE_STD("Service installation failed: " + e.error_);
@@ -85 +86 @@
 
     } else if ( _stricmp( "listpdh", argv[1]+1 ) == 0 ) {
-      PDH::Enumerations::str_lst lst = PDH::Enumerations::EnumObjects();
-      for (PDH::Enumerations::str_lst::iterator it = lst.begin();it!=lst.end();++it) {
-        PDH::Enumerations::str_lst lst = PDH::Enumerations::EnumObjectItems(*it);
-        for (PDH::Enumerations::str_lst::iterator it2 = lst.begin();it2!=lst.end();++it2) {
-          std::cout << "\\" << *it <<"\\" << *it2 << std::endl;;
+      PDH::Enumerations::Objects lst = PDH::Enumerations::EnumObjects();
+      for (PDH::Enumerations::Objects::iterator it = lst.begin();it!=lst.end();++it) {
+        if ((*it).instances.size() > 0) {
+          for (PDH::Enumerations::Instances::const_iterator it2 = (*it).instances.begin();it2!=(*it).instances.end();++it2) {
+            for (PDH::Enumerations::Counters::const_iterator it3 = (*it).counters.begin();it3!=(*it).counters.end();++it3) {
+              std::cout << "\\" << (*it).name << "(" << (*it2).name << ")\\" << (*it3).name << std::endl;;
+            }
+          }
+        } else {
+          for (PDH::Enumerations::Counters::const_iterator it2 = (*it).counters.begin();it2!=(*it).counters.end();++it2) {
+            std::cout << "\\" << (*it).name << "\\" << (*it2).name << std::endl;;
+          }
         }
       }

NSClient++.vcproj

@@ -333 +333 @@
       </File>
       <File
+        RelativePath=".\include\PDHCounter.h">
+      </File>
+      <File
         RelativePath=".\Settings.h">
       </File>
@@ -439 +442 @@
       </File>
       <File
+        RelativePath=".\NSC.dist">
+        <FileConfiguration
+          Name="Distribution|Win32">
+          <Tool
+            Name="VCCustomBuildTool"
+            CommandLine="echo Copying $(InputFileName)...
+cmd /c &quot;copy $(InputDir)\$(InputFileName) $(InputDir)\Dist\$(InputName).ini&quot;
+"
+            Outputs="$(InputDir)\Dist\$(InputName).ini"/>
+        </FileConfiguration>
+      </File>
+      <File
         RelativePath=".\NSC.ini">
         <FileConfiguration
@@ -460 +475 @@
         </FileConfiguration>
         <FileConfiguration
-          Name="Distribution|Win32">
+          Name="Distribution|Win32"
+          ExcludedFromBuild="TRUE">
           <Tool
             Name="VCCustomBuildTool"

changelog

@@ +1 @@
+2005-07-31 MickeM
+ + /install now sets the serive to autostart
+ * Did some cleanup of minor code sctions
+ * (done before but not repported i think) /listpdh option added to list all pdh counters (nsclient++ /listpdh)
+ + Added service description
+ * Eventlog reworked (again) this time I hope it is better (and even usefull, but syntax has changed)
+
+2005-07-26 MickeM
+ + Added support for ShowAll=long (to show long and short info, only applies to some areas, but avalible everywhere)
+ + Extended Drive and memory check syntax to facilitate both Free and Used space checks: MaxWarnFree / MaxWarnUsed etc)
+
+2005-07-19 MickeM
+ * Changed thread API to use _creatthreadex as opposed to _creatthread (works better now!)
+ * Fixed UNKNOWN return code (was 4 should have been 3)
+
+2005-07-16 MickeM
+ * Fixed drivechecks from NSClient
+
 2005-07-11 MickeM
  * *ALOT* of bugfixes and enhancements all checking code has been centralzed and rewritten also my nternal check scripts 

docs/CheckDisk/index.html

@@ -156 +156 @@
       <th valign="top">Option </th>
       <th valign="top">Values </th>
-      <th valign="top">Description </td>
+      <th valign="top" width="690">Description </td>
       </th>
     </tr>
     <tr>
-      <td valign="top">MaxWarn&lt; </td>
+      <td valign="top">MaxWarnFree</td>
       <td valign="top">Size with optional postfix (g, m, k, b, %)</td>
-      <td valign="top">The maximum size the directory is allowed before a 
-      warning state is returned.</td>
-    </tr>
-    <tr>
-      <td valign="top">MaxCrit </td>
-      <td valign="top">Size with optional postfix (g, m, k, b, %) </td>
-      <td valign="top">The maximum size the directory is allowed before a 
-      critical state is returned. </td>
-    </tr>
-    <tr>
-      <td valign="top">MinWarn </td>
-      <td valign="top">Size with optional postfix (g, m, k, b, %) </td>
-      <td valign="top">The minimum size the directory is allowed before a 
-      warning state is returned. </td>
-    </tr>
-    <tr>
-      <td valign="top">MinCrit </td>
-      <td valign="top">Size with optional postfix (g, m, k, b, %) </td>
-      <td valign="top">The minimum size the directory is allowed before a 
-      critical state is returned. </td>
+      <td valign="top" width="690">The maximum allowed free space for the 
+      drive(s).</td>
+    </tr>
+    <tr>
+      <td valign="top">MaxCritFree</td>
+      <td valign="top">Size with optional postfix (g, m, k, b, %) </td>
+      <td valign="top" width="690">The maximum allowed free space for the 
+      drive(s).</td>
+    </tr>
+    <tr>
+      <td valign="top">MinWarnFree</td>
+      <td valign="top">Size with optional postfix (g, m, k, b, %) </td>
+      <td valign="top" width="690">The minimum allowed free space for the 
+      drive(s).</td>
+    </tr>
+    <tr>
+      <td valign="top">MinCritFree</td>
+      <td valign="top">Size with optional postfix (g, m, k, b, %) </td>
+      <td valign="top" width="690">The minimum allowed free space for the 
+      drive(s).</td>
+    </tr>
+    <tr>
+      <td valign="top">MaxWarnUsed</td>
+      <td valign="top">Size with optional postfix (g, m, k, b, %)</td>
+      <td valign="top" width="690">The maximum allowed used space for the 
+      drive(s).</td>
+    </tr>
+    <tr>
+      <td valign="top">MaxCritUsed</td>
+      <td valign="top">Size with optional postfix (g, m, k, b, %) </td>
+      <td valign="top" width="690">The maximum allowed used space for the 
+      drive(s).</td>
+    </tr>
+    <tr>
+      <td valign="top">MinWarnUsed</td>
+      <td valign="top">Size with optional postfix (g, m, k, b, %) </td>
+      <td valign="top" width="690">The minimum allowed used space for the 
+      drive(s).</td>
+    </tr>
+    <tr>
+      <td valign="top">MinCritUsed</td>
+      <td valign="top">Size with optional postfix (g, m, k, b, %) </td>
+      <td valign="top" width="690">The minimum allowed used space for the 
+      drive(s).</td>
     </tr>
     <tr>
       <td valign="top">ShowAll </td>
-      <td valign="top"><i>None</i> </td>
-      <td valign="top">
-      <p>A Boolean flag to show size of directories that are not in an alarm 
-      state. If this is not specified only drives with an alarm state will 
-      be listed in the resulting string.</p>
+      <td valign="top">Emtpy, long</td>
+      <td valign="top" width="690">
+      <p>If present will display information even if an item is not 
+      reporting a state. If set to long will display more information.</p>
       </td>
     </tr>
@@ -195 +218 @@
       <td valign="top">Drive </td>
       <td valign="top">A Drive letter or the path of a mounted Volume </td>
-      <td valign="top">The letter of the drive to check. Notice that the drive 
-      has to be a fixed drive. </td>
+      <td valign="top" width="690">The letter of the drive to check.</td>
     </tr>
     <tr>
       <td valign="top">FilterType</td>
-      <td valign="top">FIXED, CDROM, REMOVABLE</td>
-      <td valign="top">Filter for drive type to prevent checking drives of 
+      <td valign="top">FIXED, CDROM, REMOVABLE, REMOTE</td>
+      <td valign="top" width="690">Filter for drive type to prevent checking drives of 
       certain kinds (most useful when using CheckAll). The default is FIXED</td>
     </tr>
@@ -207 +229 @@
       <td valign="top">CheckAll</td>
       <td valign="top"><i>None</i></td>
-      <td valign="top">Check all available drives</td>
+      <td valign="top" width="690">Check all available drives</td>
     </tr>
   </table>
@@ -217 +239 @@
     <ul>
       <li>
-      <p><b>Check the size of C:\ and make sure it has 50% free space:</b></p>
-      <p><code>CheckDriveSize ShowAll MaxWarn=50% MaxCrit=75% Drive=c:\</code></p>
-      <p><code>OK: c:: 63G (68374007808B)|c:=85% 50;75;</code></p>
+      <p><b>Check the size of C:\ and make sure it has 10% free space:</b></p>
+      <p><code>CheckDriveSize ShowAll MinWarnFree=10% MinCritFree=5% Drive=c:\</code></p>
+      <p><code>CRITICAL: C:: Total: 74.5G - Used: 71.2G (95%) - Free: 3.28G (5%) < critical|C:;5%;10;5;</code></p>
       <div class="config">
         <p>define command { </p>
@@ -241 +263 @@
       <li>
       <p><b>To check the size of all fixed and network drives and make sure they 
-      are at least 50% full</b></p>
+      have atleast 1gig free space</b></p>
       <p><code>CheckDriveSize -a MinWarn=50% MinCrit=25% CheckAll FilterType=FIXED 
       FilterType=REMOTE</code></p>
-      <p><code>WARNING: X:\: 28% &lt; warning|C:\=84% 50%;25%; X:\=28% 50%;25%; 
-      Y:\=98% 50%;25%;</code></p>
+      <p><code>CRITICAL: D:\: Total: 186G - Used: 186G (99%) - Free: 709M (1%) < warning, Y:\: Total: 279G - Used: 279G (99%) - Free: 384M (1%) < critical|C:\;76514398208;1073741824;536870912; D:\;199303897088;1073741824;536870912; X:\;35467034624;1073741824;536870912; Y:\;299649466368;1073741824;536870912;
+</code></p>
       <div class="config">
         <p>define command { </p>
         <p>&nbsp;&nbsp;&nbsp; command_name CheckAllDrives </p>
         <p>&nbsp;&nbsp;&nbsp; command_line check_nrpe -H $HOSTADDRESS$ -p 
-        5666 -c CheckDriveSize -a Drive=$ARG1$ CheckAll FilterType=FIXED 
+        5666 -c CheckDriveSize -a CheckAll FilterType=FIXED 
       FilterType=REMOTE MinWarn=$ARG1$ MinCrit=$ARG2$ </p>
         <p>}</p>

docs/CheckEventLog/index.html

@@ -41 +41 @@
     <tr>
       <td valign="top">filter</td>
-      <td valign="top">in, out</td>
-      <td valign="top">Specify if you want to filter out or in records.</td>
+      <td valign="top">in, out, any, all</td>
+      <td valign="top">Specify the way you want to filter things.<p><b>in</b> 
+      means any thing matching this filter will be included in the result.</p>
+      <p><b>out</b> means any thing matching this filter will be excluded 
+      from the result.</p>
+      <p><b>any</b> means any of the filter rules has to match.</p>
+      <p><b>all</b> means all of the filter rules have to match.</p>
+      <p>Thus filter=all filter=in and filter=any filter=out is the 
+      combinations that makes the most sence depending on your filter 
+      concept.</td>
     </tr>
     <tr>
@@ -48 +56 @@
       <td valign="top"><i>None</i></td>
       <td valign="top">Flag to specify if you want to include string 
-      representationof the error messages.</td>
+      representation of the error messages.</td>
     </tr>
     <tr>
       <td valign="top">truncate</td>
       <td valign="top">length of the returned set</td>
-      <td valign="top">This wil ltruncate the output after the specified 
+      <td valign="top">This will truncate the output after the specified 
       length. As NRPE can only handle 1024 chars you need to truncate the 
       output.</td>
     </tr>
     <tr>
-      <td valign="top">warning-count</td>
+      <td valign="top">MaxWarn</td>
       <td valign="top">number of records</td>
       <td valign="top">The maximum records to allow before reporting a 
@@ -64 +72 @@
     </tr>
     <tr>
-      <td valign="top">critical-count</td>
+      <td valign="top">MaxCrit</td>
       <td valign="top">number of records</td>
       <td valign="top">The maximum records to allow before reporting a 
@@ -82 +90 @@
       filter-eventSource</td>
       <td valign="top">
-      regexp</td>
+      string expression</td>
       <td valign="top">
-      The name of the source of the event.</td>
+      The name of the source of the event. Can be a substring or 
+      regularexpression</td>
     </tr>
     <tr>
@@ -90 +99 @@
       filter-generated</td>
       <td valign="top">
-      Time with optional postfix</td>
+      time expression</td>
       <td valign="top">
       Time ago the message was generated</td>
@@ -98 +107 @@
       filter-written</td>
       <td valign="top">
-      Time with optional postfix</td>
+      time expression</td>
       <td valign="top">
       Time ago the message was written to the log</td>
@@ -106 +115 @@
       filter-message</td>
       <td valign="top">
-      regexp</td>
+      string expression</td>
       <td valign="top">
-      Filter strings in the message.</td>
+      Filter strings in the message. Can be a substring or 
+      regularexpression</td>
     </tr>
   </table>
-  <p>The “Time with optional postfix” is a way to simply specify large times by 
-  adding unit postfix. The available postfixes are S for Second, M for Minute, 
-  H for Hour, D for Day and W for week. </p>
+  <p>&nbsp;</p>
+  <p>A time expression is a date/time intervall as a number prefixed by a 
+  filter prefix (&lt;, &gt;, =, !=) and followed by a unit postfix (m, s, h, d, w). 
+  A few examples of time expression are: filter-generated=&gt;2d means filter 
+  will match any records older than 2 days, filter-generated=&lt;2h means match 
+  any records newver then 2 hours.</p>
+  <p>A string expression is a key followed by a string that specifies a string 
+  expression. Currently substr and regexp are supported. Thus you enter 
+  filter-message=regexp:(foo|bar) to enter a regular expression and 
+  filter-message=substr:foo to enter a substring patter match.</p>
   <h3>Examples</h3>
   <div class="example">
@@ -122 +139 @@
       all warnings. Allow 3 errors before a warning is issued and 7 before 
       a critical state.</b></p>
-      <p><code>checkEventLog file=system file=application filter-eventType=warning filter-generated=1d filter-eventSource=Cdrom filter-eventSource=NSClient warning-count=3 critical-count=7</code></p>
+      <p><code>checkEventLog file=system file=application 
+      MaxWarn=1 MaxCrit=1 filter-generated=&gt;2d filter-eventSource=substr:Service 
+      filter-eventSource=substr:Tcpip filter=out filter=any</code></p>
       <p><code>CRITICAL: 27 > critical: ESENT, ESENT, ESENT, ESENT,...</code></p>
       <div class="config">
@@ -128 +147 @@
         <p>&nbsp;&nbsp;&nbsp; command_name check_event_log </p>
         <p>&nbsp;&nbsp;&nbsp; command_line check_nrpe -H $HOSTADDRESS$ -p 
-        5666 -c checkEventLog -a file=system file=application filter-eventType=warning filter-generated=1d filter-eventSource=Cdrom filter-eventSource=NSClient warning-count=3 critical-count=7 </p>
+        5666 -c checkEventLog -a file=system file=application MaxWarn=1 MaxCrit=1 
+      filter-generated=&gt;2d filter-eventSource=substr:Service 
+      filter-eventSource=substr:Tcpip filter=out filter=any</p>
         <p>}</p>
         <p>&nbsp;&nbsp;&nbsp; check_command check_event_log

docs/CheckSystem/index.html

@@ -152 +152 @@
     </tr>
     <tr>
-      <td valign="top">warn</td>
-      <td valign="top">time</td>
-      <td valign="top">Minimum uptime time to not generate a warning state.</td>
-    </tr>
-    <tr>
-      <td valign="top">crit</td>
-      <td valign="top">time</td>
-      <td valign="top">Minimum uptime time to not generate a critical state.</td>
+      <td valign="top">MaxCrit</td>
+      <td valign="top">time</td>
+      <td valign="top">Maximum time the system is allowed to be up</td>
+    </tr>
+    <tr>
+      <td valign="top">MinCrit</td>
+      <td valign="top">time</td>
+      <td valign="top">Minimum time the system is allowed to be up</td>
+    </tr>
+    <tr>
+      <td valign="top">MaxWarn</td>
+      <td valign="top">time</td>
+      <td valign="top">Maximum time the system is allowed to be up</td>
+    </tr>
+    <tr>
+      <td valign="top">MinWarn</td>
+      <td valign="top">time</td>
+      <td valign="top">Minimum time the system is allowed to be up</td>
     </tr>
     <tr>
@@ -173 +183 @@
       <li>
       <p>Check that the system has been running for at least a day:</p>
-      <p><code>checkUpTime warn=1d crit=12h</code></p>
+      <p><code>checkUpTime MinWarn=1d MinWarn=12h</code></p>
       <p><code>Client has uptime (19h) &lt; warning (24h)</code></p>
       </li>
@@ -316 +326 @@
   can be check as there are a lot of performance counter. To find performance 
   counters use the program perfmon that is shipped with windows. An important 
-  note is that performance counters are language and version specific.</p>
-  <p><i><b>This is currently broken and will be fixed in the next version.</b></i></p>
+  note is that performance counters are language and version specific. You can 
+  list all avalible performance counters using the /listpdh command line 
+  option.</p>
   <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" id="table16">
     <tr>
@@ -326 +337 @@
     <tr>
       <td valign="top">MaxWarn</td>
-      <td valign="top">Size GMKB%</td>
-      <td valign="top">The maximum size allowed before a warning state is 
-      returned.</td>
+      <td valign="top">Number</td>
+      <td valign="top">Maximum allowed number</td>
     </tr>
     <tr>
       <td valign="top">MaxCrit</td>
-      <td valign="top">Size GMKB%</td>
-      <td valign="top">The maximum size allowed before a critical state is 
-      returned.</td>
+      <td valign="top">Number</td>
+      <td valign="top">Maximum allowed number</td>
     </tr>
     <tr>
       <td valign="top">MinWarn</td>
-      <td valign="top">Size GMKB%</td>
-      <td valign="top">The minimum size allowed before a warning state is 
-      returned.</td>
+      <td valign="top">Number</td>
+      <td valign="top">Minimum allowed number</td>
     </tr>
     <tr>
       <td valign="top">MinCrit</td>
-      <td valign="top">Size GMKB%</td>
-      <td valign="top">The minimum size allowed before a critical state is 
-      returned.</td>
+      <td valign="top">Number</td>
+      <td valign="top">Minimumallowed number</td>
     </tr>
     <tr>
       <td valign="top">ShowAll</td>
       <td valign="top"><i>None</i></td>
-      <td valign="top">A Boolean flag to show size even if no state is returned 
-      (?).</td>
+      <td valign="top">A Boolean flag to show value even if no state is returned.</td>
     </tr>
     <tr>
@@ -372 +378 @@
       <p>Check that mutex count (on WinXP) is below 500:</p>
       <p><code>checkCounter "Counter:mutex=\\Objects\\Mutexes" ShowAll MaxWarn=500 MaxCrit=1000</code></p>
-      <p><code>WARNING: mutex: 673 > warning|page=673;500;1000;</code></p>
+      <p><code>WARNING: mutex: 673 > warning|mutex=673;500;1000;</code></p>
       </li>
     </ul>

docs/welcome.html

@@ -33 +33 @@
   <table id="table17" border="0" cellspacing="0" cellpadding="0" class="MsoNormalTable">
     <tr>
-      <td valign="top">2005-06-09</td>
-      <td>Update with a lot of nice things that will simplify 
-      configuration (I hope).<p>Enhances/Fixes:</p>
-      <ul>
-        <li>Autodecteds windows version and language. Hopefully this 
-        will reduce configuration problems.</li>
-        <li>Fixed &quot; escapes in nsc.ini (NRPE Copmmands section)</li>
-      </ul>
-      <p>Added:</p>
-      <ul>
-        <li>A decent CheckEventLog (it can now be used, and I think as 
-        soon as I have time to update the docs a bit more might be a 
-        nice and usable addition.</li>
-      </ul>
-      </td>
-    </tr>
-    <tr>
-      <td valign="top">2005-05-29</td>
-      <td>Minor update that fixes a few bugs.<p>Enhances/Fixes:</p>
-      <ul>
-        <li>Fixed PROCSTATE and SERVICESTATE return state.</li>
-        <li>Fixed performance data for drives (and possibly other places)</li>
-      </ul>
-      <p>Added:</p>
-      <ul>
-        <li>Added support for individual size in CheckDriveSize and CheckFileSize 
-        (size has to be specified before a drive/path).</li>
-      </ul>
+      <td valign="top">2005-07-31</td>
+      <td>Mainly fixes some minor issues, also adds support for FreeSpace 
+      checks (in addition to UsedSpace check) as well as &quot;long description 
+      support&quot; and a reworked EventLog checker.<br>
+      <br>
+      No updated documentation yet but hopefully all outstanding issues 
+      has been fixed.<br>
+      <br>
+      Extract from change log:<br>
+      + /install now sets the serivice to autostart<br>
+      + Added service description<br>
+      * added /listpdh option added to list all pdh counters<br>
+      * Eventlog reworked (again) this time I hope it is better <br>
+      + Added support for ShowAll=long (to show more information)<br>
+      + Extended Drive and memory check syntax to facilitate both Free and 
+      Used space checks: MaxWarnFree / MaxWarnUsed etc)<br>
+      * Changed thread API to use _creatthreadex as opposed to _creatthread 
+      (works better now!)<br>
+      * Fixed UNKNOWN return code (was 4 should have been 3)<br>
+      * Fixed drivechecks from NSClient<br>
+&nbsp;</td>
+    </tr>
+    <tr>
+      <td valign="top">2005-07-12</td>
+      <td>Update with a lot bugfixes
       </td>
     </tr>
@@ -68 +65 @@
   <a href="http://nscplus.sf.net" target="_top">http://nscplus.sf.net</a></p>
   <p>Latest version is
-  <a href="http://prdownloads.sourceforge.net/nscplus/NSClient++-0.2.2.zip?download">
-  NSClient++ 0.2.2.zip</a></p>
+  <a href="http://prdownloads.sourceforge.net/nscplus/NSClient++-0.2.4d.zip?download">
+  NSClient++ 0.2.4.zip</a></p>
   <h1>Modules</h1>
   <p>NSClient++ comes with a few modules out of the box that does various checks. 

include/NSCAPI.h

@@ -8 +8 @@
     returnOK = 0,
     returnWARN = 1,
-    returnUNKNOWN = 4,
+    returnUNKNOWN = 3,
     returnInvalidBufferLen = -2,
     returnIgnored = -1
@@ -25 +25 @@
   const int returnWARN = 1;
   const int returnCRIT = 2;
-  const int returnUNKNOWN = 4;
+  const int returnUNKNOWN = 3;
   const int returnInvalidBufferLen = -2;
   const int returnIgnored = -1;

include/PDHCounter.h

@@ -262 +262 @@
   class Enumerations {
   public:
-    typedef std::list<std::string> str_lst;
-    static str_lst EnumObjects() {
+
+    struct Counter {
+      std::string name;
+    };
+    typedef std::list<Counter> Counters;
+    struct Instance {
+      std::string name;
+    };
+    typedef std::list<Instance> Instances;
+    struct Object {
+      std::string name;
+      Instances instances;
+      Counters counters;
+    };
+
+    typedef std::list<Object> Objects;
+    static Objects EnumObjects(DWORD dwDetailLevel = PERF_DETAIL_WIZARD) {
+      Objects ret;
+
+      DWORD dwObjectBufLen = 0;
+      LPTSTR szObjectBuffer = NULL;
+      PDH_STATUS status = PdhEnumObjects(NULL, NULL, szObjectBuffer, &dwObjectBufLen, dwDetailLevel, FALSE);
+      if (status != PDH_MORE_DATA)
+        throw PDHException("PdhEnumObjects failed when trying to retrieve size of object buffer", status);
+
+      szObjectBuffer = new char[dwObjectBufLen+1024];
+      status = PdhEnumObjects(NULL, NULL, szObjectBuffer, &dwObjectBufLen, dwDetailLevel, FALSE);
+      if (status != ERROR_SUCCESS)
+        throw PDHException("PdhEnumObjects failed when trying to retrieve object buffer", status);
+
+      char *cp=szObjectBuffer;
+      while(*cp != '\0') {
+        Object o;
+        o.name = cp;
+        ret.push_back(o);
+        cp += lstrlen(cp)+1;
+      }
+      delete [] szObjectBuffer;
+
+      for (Objects::iterator it = ret.begin(); it != ret.end(); ++it) {
+        DWORD dwCounterBufLen = 0;
+        LPTSTR szCounterBuffer = NULL;
+        DWORD dwInstanceBufLen = 0;
+        LPTSTR szInstanceBuffer = NULL;
+        status = PdhEnumObjectItems(NULL, NULL, (*it).name.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
+        if (status != PDH_MORE_DATA)
+          throw PDHException("PdhEnumObjectItems failed when trying to retrieve size for " + (*it).name, status);
+        szCounterBuffer = new char[dwCounterBufLen+1024];
+        szInstanceBuffer = new char[dwInstanceBufLen+1024];
+        status = PdhEnumObjectItems(NULL, NULL, (*it).name.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
+        if (status != ERROR_SUCCESS)
+          throw PDHException("PdhEnumObjectItems failed when trying to retrieve buffer for " + (*it).name, status);
+
+        if (dwCounterBufLen > 0) {
+          cp=szCounterBuffer;
+          while(*cp != '\0') {
+            Counter o;
+            o.name = cp;
+            (*it).counters.push_back(o);
+            cp += lstrlen(cp)+1;
+          }
+        }
+        if (dwInstanceBufLen > 0) {
+          cp=szInstanceBuffer;
+          while(*cp != '\0') {
+            Instance o;
+            o.name = cp;
+            (*it).instances.push_back(o);
+            cp += lstrlen(cp)+1;
+          }
+        }
+        delete [] szCounterBuffer;
+        delete [] szInstanceBuffer;
+      }
+      return ret;
+    }
+    /*
+    static str_lst EnumObjectItems(std::string object) {
       str_lst ret;
       DWORD bufLen = 4096;
+      DWORD bufLen2 = 0;
       LPTSTR buf = new char[bufLen+1];
-      PDH_STATUS status = PdhEnumObjects(NULL, NULL, buf, &bufLen, PERF_DETAIL_EXPERT, FALSE);
+      PDH_STATUS status = PdhEnumObjectItems(NULL, NULL, object.c_str(), buf, &bufLen, NULL, &bufLen2, PERF_DETAIL_WIZARD, 0);
       if (status == ERROR_SUCCESS) {
         char *cp=buf;
@@ -277 +354 @@
       return ret;
     }
-    static str_lst EnumObjectItems(std::string object) {
+    static str_lst EnumObjectInstances(std::string object) {
       str_lst ret;
       DWORD bufLen = 4096;
       DWORD bufLen2 = 0;
       LPTSTR buf = new char[bufLen+1];
-      PDH_STATUS status = PdhEnumObjectItems(NULL, NULL, object.c_str(), buf, &bufLen, NULL, &bufLen2, PERF_DETAIL_EXPERT, 0);
+      PDH_STATUS status = PdhEnumObjectItems(NULL, NULL, object.c_str(), NULL, &bufLen2, buf, &bufLen, PERF_DETAIL_WIZARD, 0);
       if (status == ERROR_SUCCESS) {
         char *cp=buf;
@@ -292 +369 @@
       return ret;
     }
+    */
     static bool validate(std::string counter, std::string &error) {
       PDH_STATUS status = PdhValidatePath(counter.c_str());

include/ServiceCmd.cpp

@@ -47 +47 @@
       SERVICE_ALL_ACCESS,         // desired access
       SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS ,  // service type
-      SERVICE_DEMAND_START,       // start type
+      SERVICE_AUTO_START,       // start type
       SERVICE_ERROR_NORMAL,       // error control type
       szPath,                     // service's binary
@@ -187 +187 @@
     CloseServiceHandle(schSCManager);
   }
+
+  void SetDescription(std::string name, std::string desc) {
+    SERVICE_DESCRIPTION descr;
+    SC_HANDLE schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+    if (!schSCManager)
+      throw SCException("OpenSCManager failed.");
+    SC_HANDLE schService = OpenService(schSCManager, TEXT(name.c_str()), SERVICE_ALL_ACCESS);
+    if (!schService) {
+      CloseServiceHandle(schSCManager);
+      throw SCException("OpenService failed.");
+    }
+
+    LPSTR d = new char[desc.length()+1];
+    strncpy(d, desc.c_str(), desc.length());
+    descr.lpDescription = d;
+    BOOL bResult = ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &descr);
+    delete [] d;
+    CloseServiceHandle(schService);
+    CloseServiceHandle(schSCManager);
+    if (!bResult)
+      throw SCException("ChangeServiceConfig2 failed.");
+  }
 }

include/ServiceCmd.h

@@ -12 +12 @@
   void Start(std::string);
   void Stop(std::string);
+  void SetDescription(std::string,std::string);
 }

include/checkHelpers.hpp

@@ -35 +35 @@
     return str + " (unknown)";
   }
-
+  std::string formatNotFound(std::string str, ResultType what) {
+    if (what == warning)
+      return str + "not found (warning)";
+    else if (what == critical)
+      return str + "not found (critical)";
+    return str + "not found (unknown)";
+  }
+
+  typedef enum {showLong, showShort, showProblems, showUnknown} showType;
   template <class TContents>
   struct CheckConatiner {
@@ -43 +51 @@
     std::string data;
     std::string alias;
-    CheckConatiner() 
+
+    showType show;
+
+
+    CheckConatiner() : show(showUnknown)
     {}
     CheckConatiner(std::string data_, TContents warn_, TContents crit_) 
-      : data(data_), warn(warn_), crit(crit_) 
+      : data(data_), warn(warn_), crit(crit_), show(showUnknown) 
     {}
     CheckConatiner(std::string name_, std::string alias_, TContents warn_, TContents crit_) 
-      : data(data_), alias(alias_), warn(warn_), crit(crit_) 
+      : data(data_), alias(alias_), warn(warn_), crit(crit_), show(showUnknown) 
+    {}
+    CheckConatiner(const TThisType &other) 
+      : data(other.data), alias(other.alias), warn(other.warn), crit(other.crit), show(other.show) 
     {}
     std::string getAlias() {
@@ -61 +76 @@
       if (!crit.hasBounds())
         crit = def.crit;
-    }
-    void formatString(std::string &message, typename TContents::TValueType &value) {
-      crit.formatString(message, value);
-      message = getAlias() + ": " + message;
+      if (show == showUnknown)
+        show = def.show;
+    }
+    bool showAll() {
+      return show != showProblems;
     }
     std::string gatherPerfData(typename TContents::TValueType &value) {
       return crit.gatherPerfData(getAlias(), value, warn, crit);
     }
-    void runCheck(typename TContents::TValueType &value, NSCAPI::nagiosReturn &returnCode, std::string &message, std::string &perf, bool bShowAll) {
+    void runCheck(typename TContents::TValueType &value, NSCAPI::nagiosReturn &returnCode, std::string &message, std::string &perf) {
       std::string tstr;
       if (crit.check(value, getAlias(), tstr, critical)) {
@@ -75 +91 @@
       } else if (warn.check(value, getAlias(), tstr, warning)) {
         NSCHelper::escalteReturnCodeToWARN(returnCode);
-      }else if (bShowAll) {
-        formatString(tstr, value);
+      }else if (show == showLong) {
+        tstr = getAlias() + ": " + TContents::toStringLong(value);
+      }else if (show == showShort) {
+        tstr = getAlias() + ": " + TContents::toStringShort(value);
       }
       perf += gatherPerfData(value);
@@ -90 +108 @@
   class disk_size_handler {
   public:
+    static std::string print(TType value) {
+      return strEx::itos_as_BKMG(value);
+    }
     static TType parse(std::string s) {
       return strEx::stoi64_as_BKMG(s);
@@ -96 +117 @@
       return strEx::stoi64(s);
     }
-    static std::string print(TType value) {
-      return strEx::itos_as_BKMG(value);
-    }
     static std::string print_percent(TType value) {
       return strEx::itos(value) + "%";
@@ -104 +122 @@
     static std::string print_unformated(TType value) {
       return strEx::itos(value);
+    }
+
+    static std::string key_total() {
+      return "Total: ";
+    }
+    static std::string key_lower() {
+      return "Used: ";
+    }
+    static std::string key_upper() {
+      return "Free: ";
     }
   };
@@ -239 +267 @@
     }
 
-    std::string toString(TType value) const {
+    static std::string toStringLong(TType value) {
+      return THandler::print(value);
+    }
+    static std::string toStringShort(TType value) {
       return THandler::print(value);
     }
@@ -246 +277 @@
     }
 
-    inline bool isAbove(TType value) const {
-      return check(value)==above;
-    }
-    inline bool isBelow(TType value) const {
-      return check(value)==below;
-    }
     const NumericBounds & operator=(std::string value) {
       set(value);
@@ -274 +299 @@
   };
 
+
+  template <typename TTypeValue, typename TTypeTotal = TTypeValue>
+  struct PercentageValueType {
+    typedef TTypeValue TValueType;
+    TTypeValue value;
+    TTypeTotal total;
+
+    TTypeValue getUpperPercentage() {
+      return 100-(value*100/total);
+    }
+    TTypeValue getLowerPercentage() {
+      return (value*100)/total;
+    }
+  };
+
   template <typename TType = int, class THandler = int_handler >
   class NumericPercentageBounds {
   public:
     typedef enum {
-      none,
-      percentage,
-      size,
+      none = 0,
+      percentage_upper = 1,
+      percentage_lower = 2,
+      value_upper = 3,
+      value_lower = 4,
     } checkTypes;
 
+    class InternalValue {
+      NumericPercentageBounds *pParent_;
+      bool isUpper_;
+    public:
+
+      InternalValue(bool isUpper) : pParent_(NULL), isUpper_(isUpper) {}
+      void setParent(NumericPercentageBounds *pParent) {
+        pParent_ = pParent;
+      }
+      const InternalValue & operator=(std::string value) {
+        std::cout << "Setting value: " << value << std::endl;
+        std::string::size_type p = value.find_first_of('%');
+        if (p != std::string::npos) {
+          if (isUpper_)
+            pParent_->setPercentageUpper(value);
+          else
+            pParent_->setPercentageLower(value);
+        } else {
+          if (isUpper_)
+            pParent_->setUpper(value);
+          else
+            pParent_->setLower(value);
+        }
+        return *this;
+      }
+
+    };
+
     checkTypes type_;
-    TType value_;
-    TType max_;
+    typename TType::TValueType value_;
     typedef typename TType TValueType;
     typedef THandler TFormatType;
     typedef NumericPercentageBounds<TType, THandler> TMyType;
-
-    NumericPercentageBounds() : type_(none), value_(0), max_(0) {}
+    InternalValue upper;
+    InternalValue lower;
+
+    NumericPercentageBounds() : type_(none), upper(true), lower(false) {
+      upper.setParent(this);
+      lower.setParent(this);
+    }
 
     NumericPercentageBounds(const NumericPercentageBounds &other) {
       type_ = other.type_;
       value_ = other.value_;
-      max_ = other.max_;
-    }
-    void setMax(TType max) { max_ = max; }
-
+    }
     checkResultType check(TType value) const {
-      if (type_ == percentage) {
-        if (((value*100)/max_) == value_)
+      if (type_ == percentage_lower) {
+        std::cout << "Checking: percentage_lower " << value.getLowerPercentage() << " < " << value_ << std::endl;
+        if (value.getLowerPercentage() == value_)
           return same;
-        else if (((value*100)/max_) > value_)
+        else if (value.getLowerPercentage() > value_)
           return above;
-        else
-          return below;
+      } else if (type_ == percentage_upper) {
+        std::cout << "Checking: percentage_upper " << value.getUpperPercentage() << " < " << value_ << std::endl;
+        if (value.getUpperPercentage() == value_)
+          return same;
+        else if (value.getUpperPercentage() > value_)
+          return above;
+      } else if (type_ == value_lower) {
+        std::cout << "Checking: value_lower " << value.total << " < " << value_ << std::endl;
+        if (value.value == value_)
+          return same;
+        else if (value.value > value_)
+          return above;
+      } else if (type_ == value_upper) {
+        std::cout << "Checking: value_upper " << (value.total-value.value) << " < " << value_ << std::endl;
+        if ((value.total-value.value) == value_)
+          return same;
+        else if ((value.total-value.value) > value_)
+          return above;
       } else {
-        if (value == value_)
-          return same;
-        else if (value > value_)
-          return above;
-        return below;
-      }
-    }
-    std::string toString(TType value) const {
-      if (type_ == percentage)
-        return THandler::print_percent((value*100)/max_);
-      return THandler::print(value);
+        std::cout << "Damn...: " << type_ << std::endl;
+        throw "Damn...";
+      }
+      return below;
+    }
+    static std::string toStringShort(TType value) {
+      return THandler::print(value.value);
+
+    }
+    static std::string toStringLong(TType value) {
+      return 
+        THandler::key_total() + THandler::print(value.total) + 
+        " - " + THandler::key_lower() + THandler::print(value.value) + 
+          " (" + THandler::print_percent(value.getLowerPercentage()) + ")" +
+        " - " + THandler::key_upper() + THandler::print(value.total-value.value) + 
+          " (" + THandler::print_percent(value.getUpperPercentage()) + ")";
     }
     inline bool hasBounds() const {
       return type_ != none;
     }
-    inline bool isPercentage() const {
-      return type_ == percentage;
-    }
-    inline bool isAbove(TType value, TType max) const {
-      return check(value, max)==above;
-    }
-    inline bool isBelow(TType value, TType max) const {
-      return check(value, max)==below;
-    }
-    TType getPerfBound(TType value) {
+    typename TType::TValueType getPerfBound(TType value) {
       return value_;
     }
-    std::string gatherPerfData(std::string alias, TType &value, TType warn, TType crit) {
-      if (isPercentage()) {
+    std::string gatherPerfData(std::string alias, TType &value, typename TType::TValueType warn, typename TType::TValueType crit) {
+      if (type_ == percentage_upper) {
         return alias + ";"
-          + THandler::print_unformated((value*100)/max_) + "%;"
+          + THandler::print_unformated(value.getUpperPercentage()) + "%;"
           + THandler::print_unformated(warn) + ";"
           + THandler::print_unformated(crit) + "; ";
+      } else if (type_ == percentage_lower) {
+          return alias + ";"
+            + THandler::print_unformated(value.getLowerPercentage()) + "%;"
+            + THandler::print_unformated(warn) + ";"
+            + THandler::print_unformated(crit) + "; ";
       } else {
         return alias + ";"
-          + THandler::print_unformated(value) + ";"
-          + THandler::print_unformated((warn*max_)/100) + ";"
-          + THandler::print_unformated((crit*max_)/100) + "; ";
-      }
-    }
-    const NumericPercentageBounds & operator=(std::string value) {
-      set(value);
-      return *this;
+          + THandler::print_unformated(value.value) + ";"
+          + THandler::print_unformated(warn) + ";"
+          + THandler::print_unformated(crit) + "; ";
+      }
     }
   private:
-    void set(std::string s) {
-      std::string::size_type p = s.find_first_of('%');
-      if (p == std::string::npos) {
-        value_ = THandler::parse(s);
-        type_ = size;
-      } else {
-        value_ = THandler::parse_percent(s);
-        type_ = percentage;
-      }
+    void setUpper(std::string s) {
+      std::cout << "Setting value:U " << s << std::endl;
+      value_ = THandler::parse(s);
+      type_ = value_upper;
+    }
+    void setLower(std::string s) {
+      std::cout << "Setting value:L " << s << std::endl;
+      value_ = THandler::parse(s);
+      type_ = value_lower;
+    }
+    void setPercentageUpper(std::string s) {
+      value_ = THandler::parse_percent(s);
+      type_ = percentage_upper;
+    }
+    void setPercentageLower(std::string s) {
+      value_ = THandler::parse_percent(s);
+      type_ = percentage_lower;
     }
   };
@@ -379 +472 @@
       return (value & value_) != 0;
     }
-    std::string toString(TType value) const {
+    static std::string toStringLong(TType value) {
+      return THandler::print(value);
+    }
+    static std::string toStringShort(TType value) {
       return THandler::print(value);
     }
@@ -427 +523 @@
       return state.hasBounds() ||  max.hasBounds() || min.hasBounds();
     }
+
+    static std::string toStringLong(typename TValueType &value) {
+      return TNumericHolder::toStringLong(value.count) + ", " + TStateHolder::toStringLong(value.state);
+    }
+    static std::string toStringShort(typename TValueType &value) {
+      return TNumericHolder::toStringShort(value.count);
+    }
+/*
     void formatString(std::string &message, typename TValueType &value) {
       if (state.hasBounds())
@@ -435 +539 @@
         message = max.toString(value.count);
     }
+    */
     std::string gatherPerfData(std::string alias, typename TValueType &value, TMyType &warn, TMyType &crit) {
       if (state.hasBounds()) {
@@ -447 +552 @@
     bool check(typename TValueType &value, std::string lable, std::string &message, ResultType type) {
       if ((state.hasBounds())&&(!state.check(value.state))) {
-        message = lable + ": " + formatState(state.toString(value.state), type);
+        message = lable + ": " + formatState(TStateHolder::toStringShort(value.state), type);
         return true;
       } else if ((max.hasBounds())&&(max.check(value.count) != below)) {
-        message = lable + ": " + formatAbove(max.toString(value.count), type);
+        message = lable + ": " + formatAbove(TNumericHolder::toStringShort(value.count), type);
         return true;
       } else if ((min.hasBounds())&&(min.check(value.count) != above)) {
-        message = lable + ": " + formatBelow(min.toString(value.count), type);
+        message = lable + ": " + formatBelow(TNumericHolder::toStringShort(value.count), type);
         return true;
       } else {
@@ -478 +583 @@
       return state.hasBounds();
     }
-    void formatString(std::string &message, typename TValueType &value) {
-      message = state.toString(value);
+    static std::string toStringLong(typename TValueType &value) {
+      return TStateHolder::toStringLong(value);
+    }
+    static std::string toStringShort(typename TValueType &value) {
+      return TStateHolder::toStringShort(value);
     }
     std::string gatherPerfData(std::string alias, typename TValueType &value, TMyType &warn, TMyType &crit) {
@@ -489 +597 @@
     bool check(typename TValueType &value, std::string lable, std::string &message, ResultType type) {
       if ((state.hasBounds())&&(!state.check(value))) {
-        message = lable + ": " + formatState(state.toString(value), type);
+        message = lable + ": " + formatState(TStateHolder::toStringLong(value), type);
         return true;
       } else {
@@ -517 +625 @@
       return max.hasBounds() || min.hasBounds();
     }
-    void formatString(std::string &message, typename THolder::TValueType &value) {
-      message = max.toString(value);
+    static std::string toStringLong(typename THolder::TValueType &value) {
+      return THolder::toStringLong(value);
+    }
+    static std::string toStringShort(typename THolder::TValueType &value) {
+      return THolder::toStringShort(value);
     }
     std::string gatherPerfData(std::string alias, typename THolder::TValueType &value, TMyType &warn, TMyType &crit) {
@@ -530 +641 @@
     bool check(typename THolder::TValueType &value, std::string lable, std::string &message, ResultType type) {
       if ((max.hasBounds())&&(max.check(value) != below)) {
-        message = lable + ": " + formatAbove(max.toString(value), type);
+        message = lable + ": " + formatAbove(THolder::toStringLong(value), type);
         return true;
       } else if ((min.hasBounds())&&(min.check(value) != above)) {
-        message = lable + ": " + formatBelow(min.toString(value), type);
+        message = lable + ": " + formatBelow(THolder::toStringLong(value), type);
         return true;
       } else {
@@ -545 +656 @@
   typedef MaxMinBounds<NumericBounds<__int64, int64_handler> > MaxMinBoundsInt64;
   typedef MaxMinBounds<NumericBounds<int, int_handler> > MaxMinBoundsInteger;
+  typedef MaxMinBounds<NumericBounds<unsigned int, int_handler> > MaxMinBoundsUInteger;
   typedef MaxMinBounds<NumericBounds<disk_size_type, disk_size_handler<disk_size_type> > > MaxMinBoundsDiscSize;
   typedef MaxMinBounds<NumericBounds<time_type, time_handler<time_type> > > MaxMinBoundsTime;
 
 
-  typedef MaxMinBounds<NumericPercentageBounds<int, int_handler> > MaxMinPercentageBoundsInteger;
-  typedef MaxMinBounds<NumericPercentageBounds<__int64, int64_handler> > MaxMinPercentageBoundsInt64;
-  typedef MaxMinBounds<NumericPercentageBounds<double, double_handler> > MaxMinPercentageBoundsDouble;
-  typedef MaxMinBounds<NumericPercentageBounds<disk_size_type, disk_size_handler<> > > MaxMinPercentageBoundsDiskSize;
+  //typedef MaxMinBounds<NumericPercentageBounds<PercentageValueType<int ,int>, int_handler> > MaxMinPercentageBoundsInteger;
+  //typedef MaxMinBounds<NumericPercentageBounds<PercentageValueType<__int64, __int64>, int64_handler> > MaxMinPercentageBoundsInt64;
+  //typedef MaxMinBounds<NumericPercentageBounds<PercentageValueType<double, double>, double_handler> > MaxMinPercentageBoundsDouble;
+  typedef MaxMinBounds<NumericPercentageBounds<PercentageValueType<disk_size_type, disk_size_type>, disk_size_handler<> > > MaxMinPercentageBoundsDiskSize;
+  typedef MaxMinBounds<NumericPercentageBounds<PercentageValueType<__int64, __int64>, disk_size_handler<__int64> > > MaxMinPercentageBoundsDiskSizei64;
 
   typedef MaxMinStateBounds<MaxMinStateValueType<int, state_type>, NumericBounds<int, int_handler>, StateBounds<state_type, state_handler> > MaxMinStateBoundsStateBoundsInteger;

include/config.h

@@ -9 +9 @@
 // internal name of the service
 #define SZSERVICENAME        "NSClient++"
+
+// Description of service
+#define SZSERVICEDESCRIPTION "Nagios Windows Agent (Provides performance data for Nagios server)"
 
 // displayed name of the service
@@ -83 +86 @@
 #define MAIN_SECTION_TITLE "Settings"
 #define MAIN_MASTERKEY "master_key" 
-#define MAIN_MASTERKEY_DEFAULT "This is a secret key thet you should change"
+#define MAIN_MASTERKEY_DEFAULT "This is a secret key that you should change"
 #define MAIN_OBFUSCATED_PASWD "obfuscated_password"
 #define MAIN_OBFUSCATED_PASWD_DEFAULT ""

include/strEx.h

@@ -11 +11 @@
 
 namespace strEx {
+
+  inline void append_list(std::string &lst, std::string &append) {
+    if (!lst.empty())
+      lst += ", ";
+    lst += append;
+  }
+
 
   inline void replace(std::string &string, std::string replace, std::string with) {
@@ -81 +88 @@
     return value * smallest_unit;
   }
+
   inline unsigned long long stoi64_as_time(std::string time, unsigned int smallest_unit = 1000) {
     std::string::size_type p = time.find_first_of("sSmMhHdDwW");

include/thread.h

@@ -40 +40 @@
   HANDLE hThread_;    // Thread handle
   T* pObject_;      // Wrapped object
-  HANDLE hStopEvent_;   // Event to signal that the thread has stopped
   HANDLE hMutex_;     // Mutex to protect internal data
+  unsigned uThreadID;   // THe thread ID
+
+
+  bool bThreadHasTerminated;
+  bool bThreadHasBeenClosed;
+
 
 
   typedef struct thread_param {
-    HANDLE hStopEvent;  // The stop event to signal when thread dies
     T *instance;    // The thread instance object
     LPVOID lpParam;   // The optional argument to the thread
@@ -56 +60 @@
    * Sets up default values
    */
-  Thread() : hThread_(NULL), pObject_(NULL), hStopEvent_(NULL) {
+  Thread() : hThread_(NULL), pObject_(NULL), uThreadID(-1), bThreadHasTerminated(false), bThreadHasBeenClosed(false) {
     hMutex_ = CreateMutex(NULL, FALSE, NULL);
     assert(hMutex_ != NULL);
@@ -67 +71 @@
   virtual ~Thread() {
     {
+      if (bThreadHasBeenClosed && bThreadHasTerminated)
+        ;
+      else if (bThreadHasBeenClosed||bThreadHasTerminated)
+        std::cout << "Thread has not terminated correctly..." << std::endl;
+      /*
       MutexLock mutex(hMutex_, 5000L);
       if (!mutex.hasMutex()) {
@@ -76 +85 @@
       hStopEvent_ = NULL;
       delete pObject_;
-      pObject_ = NULL;
+      */
+//      pObject_ = NULL;
+//      CloseHandle(hThread_);
     }
     if (hMutex_)
@@ -91 +102 @@
    * @return exit status
    */
-  static void threadProc(LPVOID lpParameter) {
+  static unsigned __stdcall threadProc(void* lpParameter) {
     thread_param* param = static_cast<thread_param*>(lpParameter);
     T* instance = param->instance;
-    HANDLE hStopEvent = param->hStopEvent;
     LPVOID lpParam = param->lpParam;
     Thread *pCore = param->pCore;
     delete param;
 
-    instance->threadProc(lpParam);
+    unsigned returnCode = instance->threadProc(lpParam);
     pCore->terminate();
-    SetEvent(hStopEvent);
-    _endthread();
+    _endthreadex( 0 );
+    return returnCode;
+
+//    _endthread();
   }
 
@@ -125 +137 @@
         throw ThreadException("Thread already started, thread not started...");
       }
-      assert(hStopEvent_ == NULL);
+//      assert(hStopEvent_ == NULL);
       param = new thread_param;
       param->instance = pObject_ = new T;
-      param->hStopEvent = hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
+//      param->hStopEvent = hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
       param->lpParam = lpParam;
       param->pCore = this;
     }
-    hThread_ = reinterpret_cast<HANDLE>(::_beginthread(threadProc, 0, reinterpret_cast<VOID*>(param)));
+    //hThread_ = reinterpret_cast<HANDLE>(::_beginthreadex(threadProc, 0, reinterpret_cast<VOID*>(param)));
+    //hThread = (HANDLE)_beginthreadex( NULL, 0, &SecondThreadFunc, NULL, 0, &threadID );
+    hThread_ = reinterpret_cast<HANDLE>(::_beginthreadex(NULL, 0, threadProc, reinterpret_cast<VOID*>(param), 0, &uThreadID));
   }
   /**
@@ -139 +153 @@
    * @return true if the thread has terminated
    */
-  bool exitThread(const unsigned int delay = 5000L) {
+  bool exitThread(const unsigned int delay = 20000L) {
     DWORD dwWaitResult = -1;
     {
-      MutexLock mutex(hMutex_, 5000L);
+      MutexLock mutex(hMutex_, delay);
       if (!mutex.hasMutex()) {
         throw ThreadException("Could not retrieve mutex, thread not stopped...");
@@ -148 +162 @@
       if (!pObject_)
         return true;
-      assert(hStopEvent_ != NULL);
       pObject_->exitThread();
     }
-    dwWaitResult = WaitForSingleObject(hStopEvent_, delay);
-    switch (dwWaitResult) {
-      // The thread got mutex ownership.
-      case WAIT_OBJECT_0:
-        return true;
-        // Did not get a signal due to time-out.
-      case WAIT_TIMEOUT: 
-        return false; 
-        // Never got a signal.
-      case WAIT_ABANDONED: 
-        return false; 
-    }
+    dwWaitResult = WaitForSingleObject(hThread_, delay);
+    if (dwWaitResult == WAIT_OBJECT_0) {
+      bThreadHasBeenClosed = true;
+      CloseHandle(hThread_);
+      delete pObject_;
+      pObject_ = NULL;
+      return true;
+    }
+    std::cout << "Failed to terminate thread..." << std::endl;
+    assert(false);
     return false;
   }
@@ -188 +199 @@
 private:
   void terminate() {
-    MutexLock mutex(hMutex_, 5000L);
-    if (!mutex.hasMutex()) {
-      throw ThreadException("Could not retrieve mutex, thread not stopped...");
-    }
-    delete pObject_;
-    pObject_ = NULL;
-    hThread_ = NULL;
+    bThreadHasTerminated = true;
   }
 };

include/utils.h

@@ -30 +30 @@
 }
 
-
-
-
-
-
-
 #define MAP_OPTIONS_BEGIN(args) \
   for (std::list<std::string>::const_iterator cit__=args.begin();cit__!=args.end();++cit__) { \
   std::pair<std::string,std::string> p__ = strEx::split(*cit__,"="); if (false) {}
+
+#define MAP_OPTIONS_SHOWALL(obj) \
+      else if (p__.first == SHOW_ALL) { if (p__.second == "long") obj.show = checkHolders::showLong; else obj.show = checkHolders::showShort; } \
+      else if (p__.first == SHOW_FAIL) { obj.show = checkHolders::showProblems; }
+
+#define MAP_OPTIONS_DISK_ALL(obj, postfix, pfUpper, pfLower) \
+      else if (p__.first == "MaxWarn" pfUpper) { obj.warn.max.upper = p__.second; } \
+      else if (p__.first == "MaxCrit" pfUpper) { obj.crit.max.upper = p__.second; } \
+      else if (p__.first == "MinWarn" pfUpper) { obj.warn.min.upper = p__.second; } \
+      else if (p__.first == "MinCrit" pfUpper) { obj.crit.min.upper = p__.second; } \
+      else if (p__.first == "MaxWarn" pfLower) { obj.warn.max.lower = p__.second; } \
+      else if (p__.first == "MaxCrit" pfLower) { obj.crit.max.lower = p__.second; } \
+      else if (p__.first == "MinWarn" pfLower) { obj.warn.min.lower = p__.second; } \
+      else if (p__.first == "MinCrit" pfLower) { obj.crit.min.lower = p__.second; } \
+      else if (p__.first == "MaxWarn" postfix) { obj.warn.max.lower = p__.second; } \
+      else if (p__.first == "MaxCrit" postfix) { obj.crit.max.lower = p__.second; } \
+      else if (p__.first == "MinWarn" postfix) { obj.warn.min.upper = p__.second; } \
+      else if (p__.first == "MinCrit" postfix) { obj.crit.min.upper = p__.second; }
+
+#define MAP_OPTIONS_NUMERIC_ALL(obj, postfix) \
+      else if (p__.first == ("MaxWarn" postfix)) { obj.warn.max = p__.second; } \
+      else if (p__.first == ("MaxCrit" postfix)) { obj.crit.max = p__.second; } \
+      else if (p__.first == ("MinWarn" postfix)) { obj.warn.min = p__.second; } \
+      else if (p__.first == ("MinCrit" postfix)) { obj.crit.min = p__.second; }
+
+#define MAP_OPTIONS_PUSH(value, list) \
+      else if (p__.first == value) { list.push_back(p__.second); }
+#define MAP_OPTIONS_DO(action) \
+      else if (p__.first == value) { action; }
 #define MAP_OPTIONS_STR(value, obj) \
       else if (p__.first == value) { obj = p__.second; }
+#define MAP_OPTIONS_STR2INT(value, obj) \
+      else if (p__.first == value) { obj = atoi(p__.second.c_str()); }
 #define MAP_OPTIONS_STR_AND(value, obj, extra) \
       else if (p__.first == value) { obj = p__.second; extra;}
@@ -47 +72 @@
 #define MAP_OPTIONS_BOOL_FALSE(value, obj) \
       else if (p__.first == value) { obj = false; }
+#define MAP_OPTIONS_BOOL_VALUE(value, obj, tStr) \
+      else if ((p__.first == value)&&(p__.second == tStr)) { obj = true; } 
 #define MAP_OPTIONS_BOOL_EX(value, obj, tStr, fStr) \
       else if ((p__.first == value)&&(p__.second == tStr)) { obj = true; } \
       else if ((p__.first == value)&&(p__.second == fStr)) { obj = false; }
 #define MAP_OPTIONS_MISSING(arg, str) \
-    else { arg = str + p__.first; return NSCAPI::returnUNKNOWN; }
+      else { arg = str + p__.first; return NSCAPI::returnUNKNOWN; }
+#define MAP_OPTIONS_FALLBACK_AND(obj, extra) \
+      else { obj = p__.first; extra;}
 #define MAP_OPTIONS_END() }
 

modules/CheckDisk/CheckDisk.cpp

@@ -87 +87 @@
 
   DriveConatiner tmpObject;
-  bool bShowAll = false;
   bool bFilter = false;
   bool bFilterRemote = false;
@@ -99 +98 @@
   MAP_OPTIONS_BEGIN(args)
     MAP_OPTIONS_STR_AND("Drive", tmpObject.data, drives.push_back(tmpObject))
-    MAP_OPTIONS_STR("MaxWarn", tmpObject.warn.max)
-    MAP_OPTIONS_STR("MinWarn", tmpObject.warn.min)
-    MAP_OPTIONS_STR("MaxCrit", tmpObject.crit.max)
-    MAP_OPTIONS_STR("MinCrit", tmpObject.crit.min)
-    else if (p__.first == "FilterType") {
-      bFilter = true;
-      if (p__.second == "FIXED") {
-        bFilterFixed = true;
-      } else if (p__.second == "CDROM") {
-        bFilterCDROM = true;
-      } else if (p__.second == "REMOVABLE") {
-        bFilterRemovable = true;
-      } else if (p__.second == "REMOTE") {
-        bFilterRemote= true;
-      }
-    }
+    MAP_OPTIONS_DISK_ALL(tmpObject, "", "Free", "Used")
+    MAP_OPTIONS_SHOWALL(tmpObject)
+    MAP_OPTIONS_BOOL_VALUE("FilterType", bFilterFixed, "FIXED")
+    MAP_OPTIONS_BOOL_VALUE("FilterType", bFilterCDROM, "CDROM")
+    MAP_OPTIONS_BOOL_VALUE("FilterType", bFilterRemovable, "REMOVABLE")
+    MAP_OPTIONS_BOOL_VALUE("FilterType", bFilterRemote, "REMOTE")
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
-    MAP_OPTIONS_BOOL_TRUE(SHOW_ALL, bShowAll)
     MAP_OPTIONS_BOOL_TRUE(CHECK_ALL, bCheckAll)
     MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
@@ -126 +114 @@
       MAP_OPTIONS_MISSING_EX(p2, message, "Unknown argument: ")
     MAP_OPTIONS_SECONDARY_END()
-    MAP_OPTIONS_MISSING(message, "Unknown argument: ")
+  MAP_OPTIONS_FALLBACK_AND(tmpObject.data, drives.push_back(tmpObject))
   MAP_OPTIONS_END()
+  bFilter = bFilterFixed || bFilterCDROM  || bFilterRemote || bFilterRemovable;
 
   if (bCheckAll) {
@@ -182 +171 @@
       message += strEx::itos(totalNumberOfBytes.QuadPart);
     } else {
+      checkHolders::PercentageValueType<checkHolders::disk_size_type, checkHolders::disk_size_type> value;
       std::string tstr;
-      checkHolders::disk_size_type size = totalNumberOfBytes.QuadPart-totalNumberOfFreeBytes.QuadPart;
+      value.value = totalNumberOfBytes.QuadPart-totalNumberOfFreeBytes.QuadPart;
+      value.total = totalNumberOfBytes.QuadPart;
       drive.setDefault(tmpObject);
-      drive.warn.max.setMax(totalNumberOfBytes.QuadPart);
-      drive.warn.min.setMax(totalNumberOfBytes.QuadPart);
-      drive.crit.max.setMax(totalNumberOfBytes.QuadPart);
-      drive.crit.min.setMax(totalNumberOfBytes.QuadPart);
-      drive.runCheck(size, returnCode, message, perf, bShowAll);
+      drive.runCheck(value, returnCode, message, perf);
     }
   }
@@ -209 +196 @@
   }
   PathConatiner tmpObject;
-  bool bShowAll = false;
   std::list<PathConatiner> paths;
 
   MAP_OPTIONS_BEGIN(args)
     MAP_OPTIONS_STR_AND("File", tmpObject.data, paths.push_back(tmpObject))
+    MAP_OPTIONS_SHOWALL(tmpObject)
     MAP_OPTIONS_STR("MaxWarn", tmpObject.warn.max)
     MAP_OPTIONS_STR("MinWarn", tmpObject.warn.min)
     MAP_OPTIONS_STR("MaxCrit", tmpObject.crit.max)
     MAP_OPTIONS_STR("MinCrit", tmpObject.crit.min)
-    MAP_OPTIONS_BOOL_TRUE(SHOW_ALL, bShowAll)
     MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
     else if (p2.first == "File") {
@@ -239 +225 @@
 
     checkHolders::disk_size_type size = sizeFinder.getSize();
-    path.runCheck(size, returnCode, message, perf, bShowAll);
+    path.runCheck(size, returnCode, message, perf);
   }
   if (message.empty())

modules/CheckDisk/CheckDisk.vcproj

@@ -228 +228 @@
       </File>
       <File
+        RelativePath="..\..\include\checkHelpers.hpp">
+      </File>
+      <File
         RelativePath="..\..\include\NSCHelper.h">
       </File>

modules/CheckEventLog/CheckEventLog.cpp

@@ -6 +6 @@
 #include <strEx.h>
 #include <time.h>
+#include <utils.h>
 
 CheckEventLog gCheckEventLog;
@@ -39 +40 @@
 class EventLogRecord {
   EVENTLOGRECORD *pevlr_;
+  DWORD currentTime_;
 public:
-  EventLogRecord(EVENTLOGRECORD *pevlr) : pevlr_(pevlr) {
+  EventLogRecord(EVENTLOGRECORD *pevlr, DWORD currentTime) : pevlr_(pevlr), currentTime_(currentTime) {
   }
   inline DWORD timeGenerated() const {
-    return pevlr_->TimeGenerated;
+    return (currentTime_-pevlr_->TimeGenerated)*1000;
   }
   inline DWORD timeWritten() const {
-    return pevlr_->TimeWritten;
+    return (currentTime_-pevlr_->TimeWritten)*1000;
   }
   inline std::string eventSource() const {
@@ -121 +123 @@
 
 
-struct searchQuery {
-    struct searchQueryItem {
-
-      typedef enum {
-        eventType, 
-        eventSource, 
-        timeWritten,
-        timeGenerated,
-        message,
-        none
-      } queryType;
-
-      typedef enum { out, in, undefined } filterType;
-
-      filterType filter_;
-      queryType queryType_;
-      DWORD dwValue_;
-      boost::regex regexp_;
-      
-
-      searchQueryItem() 
-        : queryType_(none), dwValue_(0), filter_(out) 
-      {}
-      searchQueryItem(filterType filter, queryType type, std::string str) 
-        : queryType_(type), dwValue_(0), filter_(filter)
-      {
-        switch (queryType_ ) {
-        case eventType:
-          dwValue_ = EventLogRecord::translateType(str);
-          break;
-
-        case timeGenerated:
-          dwValue_ = strEx::stoui_as_time(str)/1000;
-          break;
-
-        case eventSource:
-        case message:
-          try {
-            regexp_ = str;
-          } catch (const boost::bad_expression e) {
-            throw (std::string)"Invalid syntax in regular expression:" + str;
-          }
-          break;
-        }
-      }
-
-      searchQueryItem& operator=(const searchQueryItem &other) {
-        queryType_ = other.queryType_;
-        dwValue_ = other.dwValue_;
-        filter_ = other.filter_;
-        try {
-          regexp_ = other.regexp_;
-        } catch (const boost::bad_expression e) {
-          throw (std::string)"Invalid syntax in regular expression:" + other.toString();
-        }
-        return *this;
-      }
-
-      bool match(DWORD now, const EventLogRecord &record) const {
-        switch (queryType_) {
-        case eventType:
-          return record.eventType() & dwValue_;
-
-        case eventSource:
-          if (regexp_.empty())
-            return false;
-          return boost::regex_match(record.eventSource(), regexp_);
-
-        case timeWritten:
-          return record.timeWritten() < (now-dwValue_);
-
-        case timeGenerated:
-          return record.timeGenerated() < (now-dwValue_);
-
-        case message:
-          if (regexp_.empty())
-            return false;
-          return boost::regex_match(record.enumStrings(), regexp_);
-
-        default:
-          return false;
-        }
-      }
-      std::string queryType2String(queryType query) const {
-        switch (queryType_) {
-        case eventType:
-          return "eventType";
-        case eventSource:
-          return "eventSource";
-        case timeWritten:
-          return "timeWritten";
-        case timeGenerated:
-          return "timeGenerated";
-        case message:
-          return "message";
-        default:
-          return "unknown";
-        }
-
-      }
-
-      std::string toString() const {
-        std::stringstream ss;
-        ss << " Type: " << queryType2String(queryType_) << " = " << dwValue_ << ", '" << regexp_ << "'";
-        return ss.str();
-      }
-    };
-
-
-
-  unsigned int truncate;
-  unsigned warning_count;
-  unsigned critical_count;
-  bool descriptions;
-  std::list<searchQueryItem> queries;
-
-  searchQuery() : truncate(0), descriptions(false), warning_count(0), critical_count(0) {}
-
-  std::string toString() {
-    std::string ret;
-    for (std::list<searchQuery::searchQueryItem>::const_iterator cit = queries.begin(); cit != queries.end(); ++cit ) {
-      ret += (*cit).toString();
-    }
-    return ret;
-  }
-
+struct eventlog_filter {
+  filters::filter_all_strings eventSource;
+  filters::filter_all_numeric<unsigned int, filters::handlers::eventtype_handler> eventType;
+  filters::filter_all_strings message;
+  filters::filter_all_times timeWritten;
+  filters::filter_all_times timeGenerated;
+
+  inline bool hasFilter() {
+    return eventSource.hasFilter() || eventType.hasFilter() || message.hasFilter() || 
+      timeWritten.hasFilter() || timeGenerated.hasFilter();
+  }
+  bool matchFilter(const EventLogRecord &value) const {
+    if ((eventSource.hasFilter())&&(eventSource.matchFilter(value.eventSource())))
+      return true;
+    else if ((eventType.hasFilter())&&(eventType.matchFilter(value.eventType())))
+      return true;
+    else if ((message.hasFilter())&&(message.matchFilter(value.enumStrings())))
+      return true;
+    else if ((timeWritten.hasFilter())&&(timeWritten.matchFilter(value.timeWritten())))
+      return true;
+    else if ((timeGenerated.hasFilter())&&(timeGenerated.matchFilter(value.timeGenerated())))
+      return true;
+    return false;
+  }
 };
 
-// checkEventLog file=application truncate=1024 descriptions filter=[out|in]
-//          warning-count=3 critical-count=10
-// filter type = warning AND generated > 1d
-//
-// match (type, "warning") && match(generated, "1d")
-//          filer-eventType=warning 
-//          filer-eventSource=
-//          filer-date=4d
-//
-// CheckEventLog
-// request: CheckEventLog&<logfile>&<Query strings>
-// Return: <return state>&<log entry 1> - <log entry 2>...
-// <return state> 0 - No errors
-//          1 - Unknown
-//          2 - Errors
-
-// ./nrpe-2.0/src/check_nrpe -H 192.168.167 -p 5666 -c checkEventLog -a file=system file=application filter-eventType=warning filter-generated=1d descriptions filter-eventSource=Cdrom filter-eventSource=NSClient warning-count=3 critical-count=7 filter=in truncate=512
-//
-// Examples:
-// CheckEventLog&Application&1&<type>&<query>&huffa...
-// CheckEventLog&Application&warn.require.eventType=warning&critical.require.eventType=error&truncate=1024&descriptions&all.exclude.eventSourceRegexp=^(Win|Msi|NSClient\+\+|Userenv|ASP\.NET|LoadPerf|Outlook|Application E|NSClient).*
+
+#define MAP_FILTER(value, obj) \
+      else if (p__.first == value) { eventlog_filter filter; filter.obj = p__.second; filter_chain.push_back(filter); }
+
+
 #define BUFFER_SIZE 1024*64
 NSCAPI::nagiosReturn CheckEventLog::handleCommand(const strEx::blindstr command, const unsigned int argLen, char **char_args, std::string &message, std::string &perf) {
   if (command != "CheckEventLog")
     return NSCAPI::returnIgnored;
-  NSCAPI::nagiosReturn rCode = NSCAPI::returnOK;
-  std::list<std::string> args = arrayBuffer::arrayBuffer2list(argLen, char_args);
-
-  std::string ret;
-  searchQuery query;
+  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBoundsUInteger> EventLogQueryConatiner;
+  NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
+  std::list<std::string> stl_args = arrayBuffer::arrayBuffer2list(argLen, char_args);
+
   std::list<std::string> files;
-  searchQuery::searchQueryItem::filterType filter = searchQuery::searchQueryItem::out;
-
-  for (std::list<std::string>::const_iterator it = args.begin(); it!=args.end(); ++it) {
-    try {
-      if ((*it) == "descriptions") {
-        query.descriptions = true;
-      } else {
-        std::pair<std::string,std::string> p = strEx::split((*it), "=");
-        if (p.first == "truncate") {
-          query.truncate = strEx::stoi(p.second);
-        } else if (p.first == "file") {
-          files.push_back(p.second);
-        } else if (p.first == "filter") {
-          if (p.second == "in")
-            filter = searchQuery::searchQueryItem::in;
-          else
-            filter = searchQuery::searchQueryItem::out;
-        } else if (p.first == "warning-count") {
-          query.warning_count = strEx::stoi(p.second);
-        } else if (p.first == "critical-count") {
-          query.critical_count = strEx::stoi(p.second);
-
-        } else if (p.first == "filter-eventType") {
-          query.queries.push_back(searchQuery::searchQueryItem(filter, searchQuery::searchQueryItem::eventType, p.second));
-        } else if (p.first == "filter-eventSource") {
-          query.queries.push_back(searchQuery::searchQueryItem(filter, searchQuery::searchQueryItem::eventSource, p.second));
-        } else if (p.first == "filter-generated") {
-          query.queries.push_back(searchQuery::searchQueryItem(filter, searchQuery::searchQueryItem::timeGenerated, p.second));
-        } else if (p.first == "filter-written") {
-          query.queries.push_back(searchQuery::searchQueryItem(filter, searchQuery::searchQueryItem::timeWritten, p.second));
-        } else if (p.first == "filter-message") {
-          query.queries.push_back(searchQuery::searchQueryItem(filter, searchQuery::searchQueryItem::message, p.second));
-        }
-      }
-    } catch (std::string s) {
-      if (message.empty())
-        message += "UNKNOWN: ";
-      else
-        message += ", ";
-      message += s;
-    }
-  }
-  if (!message.empty()) {
+  std::list<eventlog_filter> filter_chain;
+  EventLogQueryConatiner query;
+
+  bool bFilterIn = true;
+  bool bFilterAll = false;
+  bool bShowDescriptions = false;
+  unsigned int truncate = 0;
+
+  try {
+    MAP_OPTIONS_BEGIN(stl_args)
+      MAP_OPTIONS_NUMERIC_ALL(query, "")
+      MAP_OPTIONS_STR2INT("truncate", truncate)
+      MAP_OPTIONS_BOOL_TRUE("descriptions", bShowDescriptions)
+      MAP_OPTIONS_PUSH("file", files)
+      MAP_OPTIONS_BOOL_EX("filter", bFilterIn, "in", "out")
+      MAP_OPTIONS_BOOL_EX("filter", bFilterAll, "all", "any")
+      MAP_FILTER("filter-eventType", eventType)
+      MAP_FILTER("filter-eventSource", eventSource)
+      MAP_FILTER("filter-generated", timeGenerated)
+      MAP_FILTER("filter-written", timeWritten)
+      MAP_FILTER("filter-message", message)
+      MAP_OPTIONS_MISSING(message, "Unknown argument: ")
+    MAP_OPTIONS_END()
+  } catch (filters::parse_exception e) {
+    message = e.getMessage();
+    return NSCAPI::returnUNKNOWN;
+  } catch (filters::filter_exception e) {
+    message = e.getMessage();
     return NSCAPI::returnUNKNOWN;
   }
@@ -352 +220 @@
       while (dwRead > 0) 
       { 
-        bool match = false;
-        bool undefined = true;
-        searchQuery::searchQueryItem::filterType tFilter = searchQuery::searchQueryItem::out;
-        EventLogRecord record(pevlr);
-
-        for (std::list<searchQuery::searchQueryItem>::const_iterator cit3 = query.queries.begin(); cit3 != query.queries.end(); ++cit3 ) {
-          if ((*cit3).match(currentTime, record)) {
-            if ((*cit3).filter_ == searchQuery::searchQueryItem::in)
-              match = true;
-            else {
-              match = false;
+        bool bMatch = bFilterAll;
+        EventLogRecord record(pevlr, currentTime);
+
+        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) {
+              bMatch = false;
+              break;
+            }
+          } else {
+            if (bTmpMatched) {
+              bMatch = true;
+              break;
             }
           }
         }
 
-        if (match) {
-          if (!ret.empty())
-            ret += ", ";
-          ret += record.eventSource();
-          if (query.descriptions) {
-            ret += "(" + EventLogRecord::translateType(record.eventType()) + ")";
-            ret += "[" + record.enumStrings() + "]";
+        if ((bFilterIn&&bMatch)||(!bFilterIn&&!bMatch)) {
+          strEx::append_list(message, record.eventSource());
+          if (bShowDescriptions) {
+            message += "(" + EventLogRecord::translateType(record.eventType()) + ")";
+            message += "[" + record.enumStrings() + "]";
           }
           hit_count++;
         }
-
         dwRead -= pevlr->Length; 
         pevlr = (EVENTLOGRECORD *) ((LPBYTE) pevlr + pevlr->Length); 
       } 
-
       pevlr = (EVENTLOGRECORD *) &bBuffer; 
     } 
-
     CloseEventLog(hLog);
   }
-
-  if ((query.critical_count > 0) && (hit_count > query.critical_count)) {
-    ret = "CRITICAL: " + strEx::itos(hit_count) + " > critical: " + ret;
-    rCode = NSCAPI::returnCRIT;
-  } else if ((query.warning_count > 0) && (hit_count > query.warning_count)) {
-    ret = "WARNING: " + strEx::itos(hit_count) + " > warning: " + ret;
-    rCode = NSCAPI::returnWARN;
-  } else {
-    ret = "OK: " + strEx::itos(hit_count) + ": " + ret;
-  }
-  if (query.truncate != 0)
-    ret = ret.substr(0, query.truncate);
-  if ((query.truncate > 0) && (ret.length() > query.truncate))
-    ret = ret.substr(0, query.truncate);
-  message = ret;
-  return rCode;
+  query.runCheck(hit_count, returnCode, message, perf);
+  if ((truncate > 0) && (message.length() > (truncate-4)))
+    message = message.substr(0, truncate-4) + "...";
+  if (message.empty())
+    message = "Eventlog check ok";
+  return returnCode;
 }
 

modules/CheckEventLog/CheckEventLog.h

@@ -2 +2 @@
 
 #include <strEx.h>
+#include <checkHelpers.hpp>
+#include <filter_framework.hpp>
 
 class CheckEventLog {

modules/CheckSystem/CheckSystem.cpp

@@ -148 +148 @@
   std::list<CPULoadConatiner> list;
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
-  bool bShowAll = false;
   bool bNSClient = false;
   CPULoadConatiner tmpObject;
@@ -155 +154 @@
 
   MAP_OPTIONS_BEGIN(stl_args)
-    MAP_OPTIONS_STR("MaxWarn", tmpObject.warn.max)
+    MAP_OPTIONS_NUMERIC_ALL(tmpObject, "")
     MAP_OPTIONS_STR("warn", tmpObject.warn.max)
-    MAP_OPTIONS_STR("MinWarn", tmpObject.warn.min)
-    MAP_OPTIONS_STR("MaxCrit", tmpObject.crit.max)
     MAP_OPTIONS_STR("crit", tmpObject.crit.max)
-    MAP_OPTIONS_STR("MinCrit", tmpObject.crit.min)
     MAP_OPTIONS_STR_AND("time", tmpObject.data, list.push_back(tmpObject))
     MAP_OPTIONS_STR_AND("Time", tmpObject.data, list.push_back(tmpObject))
-    MAP_OPTIONS_BOOL_TRUE(SHOW_ALL, bShowAll)
+    MAP_OPTIONS_SHOWALL(tmpObject)
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
       MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
@@ -173 +169 @@
       MAP_OPTIONS_MISSING_EX(p2, msg, "Unknown argument: ")
       MAP_OPTIONS_SECONDARY_END()
-    else { tmpObject.data = p__.first, list.push_back(tmpObject); }
+    MAP_OPTIONS_FALLBACK_AND(tmpObject.data, list.push_back(tmpObject))
   MAP_OPTIONS_END()
 
@@ -198 +194 @@
       } else {
         load.setDefault(tmpObject);
-        load.runCheck(value, returnCode, msg, perf, bShowAll);
+        load.runCheck(value, returnCode, msg, perf);
       }
     }
@@ -220 +216 @@
   }
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
-  bool bShowAll = false;
   bool bNSClient = false;
   UpTimeConatiner bounds;
@@ -227 +222 @@
 
   MAP_OPTIONS_BEGIN(stl_args)
-    MAP_OPTIONS_STR("MaxWarn", bounds.warn.max)
+    MAP_OPTIONS_NUMERIC_ALL(bounds, "")
     MAP_OPTIONS_STR("warn", bounds.warn.min)
-    MAP_OPTIONS_STR("MinWarn", bounds.warn.min)
-    MAP_OPTIONS_STR("MaxCrit", bounds.crit.max)
     MAP_OPTIONS_STR("crit", bounds.crit.min)
-    MAP_OPTIONS_STR("MinCrit", bounds.crit.min)
     MAP_OPTIONS_STR("Alias", bounds.data)
-    MAP_OPTIONS_BOOL_TRUE(SHOW_ALL, bShowAll)
+    MAP_OPTIONS_SHOWALL(bounds)
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
     MAP_OPTIONS_MISSING(msg, "Unknown argument: ")
@@ -250 +242 @@
   } else {
     value *= 1000;
-    bounds.runCheck(value, returnCode, msg, perf, bShowAll);
+    bounds.runCheck(value, returnCode, msg, perf);
   }
 
@@ -296 +288 @@
   std::list<StateConatiner> list;
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
-  bool bShowAll = false;
   bool bNSClient = false;
   StateConatiner tmpObject;
@@ -304 +295 @@
 
   MAP_OPTIONS_BEGIN(stl_args)
-    /*
-    MAP_OPTIONS_STR("MaxWarn", tmpObject.warn.max)
-    MAP_OPTIONS_STR("warn", tmpObject.warn.min)
-    MAP_OPTIONS_STR("MinWarn", tmpObject.warn.min)
-    MAP_OPTIONS_STR("MaxCrit", tmpObject.crit.max)
-    MAP_OPTIONS_STR("crit", tmpObject.crit.min)
-    MAP_OPTIONS_STR("MinCrit", tmpObject.crit.min)
-    */
+    MAP_OPTIONS_SHOWALL(tmpObject)
     MAP_OPTIONS_STR("Alias", tmpObject.data)
-    MAP_OPTIONS_BOOL_TRUE(SHOW_ALL, bShowAll)
-    MAP_OPTIONS_BOOL_FALSE(SHOW_FAIL, bShowAll)
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
     MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
@@ -345 +327 @@
         continue;
       }
-      if ((info.m_dwCurrentState == SERVICE_RUNNING) && (bShowAll)) {
+      if ((info.m_dwCurrentState == SERVICE_RUNNING) && (*it).showAll()) {
         if (!msg.empty()) msg += " - ";
         msg += (*it).data + ": Started";
@@ -373 +355 @@
       else
         value = checkHolders::state_none;
-      (*it).runCheck(value, returnCode, msg, perf, bShowAll);
+      (*it).runCheck(value, returnCode, msg, perf);
     }
 
@@ -398 +380 @@
 NSCAPI::nagiosReturn CheckSystem::checkMem(const unsigned int argLen, char **char_args, std::string &msg, std::string &perf)
 {
-  typedef checkHolders::CheckConatiner<checkHolders::MaxMinPercentageBoundsInt64 > MemoryConatiner;
+  typedef checkHolders::CheckConatiner<checkHolders::MaxMinPercentageBoundsDiskSizei64 > MemoryConatiner;
   std::list<std::string> stl_args = arrayBuffer::arrayBuffer2list(argLen, char_args);
   if (stl_args.empty()) {
@@ -412 +394 @@
 
   MAP_OPTIONS_BEGIN(stl_args)
-    MAP_OPTIONS_STR("MaxWarn", bounds.warn.max)
-    MAP_OPTIONS_STR("MinWarn", bounds.warn.min)
-    MAP_OPTIONS_STR("MaxCrit", bounds.crit.max)
-    MAP_OPTIONS_STR("MinCrit", bounds.crit.min)
+    MAP_OPTIONS_DISK_ALL(bounds, "", "Free", "Used")
     MAP_OPTIONS_STR("Alias", bounds.data)
-    MAP_OPTIONS_BOOL_TRUE(SHOW_ALL, bShowAll)
+    MAP_OPTIONS_SHOWALL(bounds)
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
     MAP_OPTIONS_MISSING(msg, "Unknown argument: ")
@@ -427 +406 @@
     return NSCAPI::returnUNKNOWN;
   }
-  long long pageCommit = pObject->getMemCommit(); 
-  long long pageCommitLimit = pObject->getMemCommitLimit(); 
+  checkHolders::PercentageValueType<long long, long long> value;
+  value.value = pObject->getMemCommit();
+  value.total = pObject->getMemCommitLimit();
   if (bNSClient) {
-    msg = strEx::itos(pageCommitLimit) + "&" + strEx::itos(pageCommit);
+    msg = strEx::itos(value.total) + "&" + strEx::itos(value.value);
     return NSCAPI::returnOK;
   } else {
-    bounds.warn.max.setMax(pageCommitLimit);
-    bounds.warn.min.setMax(pageCommitLimit);
-    bounds.crit.max.setMax(pageCommitLimit);
-    bounds.crit.min.setMax(pageCommitLimit);
-    bounds.runCheck(pageCommit, returnCode, msg, perf, bShowAll);
+    bounds.runCheck(value, returnCode, msg, perf);
   }
   if (msg.empty())
@@ -500 +476 @@
   std::list<StateConatiner> list;
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
-  bool bShowAll = false;
   bool bNSClient = false;
   StateConatiner tmpObject;
@@ -508 +483 @@
 
   MAP_OPTIONS_BEGIN(stl_args)
-    MAP_OPTIONS_STR("MaxWarnCount", tmpObject.warn.max)
-    MAP_OPTIONS_STR("MinWarnCount", tmpObject.warn.min)
-    MAP_OPTIONS_STR("MaxCritCount", tmpObject.crit.max)
-    MAP_OPTIONS_STR("MinCritCount", tmpObject.crit.min)
+    MAP_OPTIONS_NUMERIC_ALL(tmpObject, "Count")
     MAP_OPTIONS_STR("Alias", tmpObject.alias)
-    MAP_OPTIONS_BOOL_TRUE(SHOW_ALL, bShowAll)
-    MAP_OPTIONS_BOOL_FALSE(SHOW_FAIL, bShowAll)
+    MAP_OPTIONS_SHOWALL(tmpObject)
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
     MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
@@ -550 +521 @@
     TNtServiceInfo info;
     if (bNSClient) {
-      if (bFound && bShowAll) {
+      if (bFound && (*it).showAll()) {
         if (!msg.empty()) msg += " - ";
         msg += (*it).data + ": Started";
@@ -568 +539 @@
         value.state = checkHolders::state_stopped;
       }
-      (*it).runCheck(value, returnCode, msg, perf, bShowAll);
+      (*it).runCheck(value, returnCode, msg, perf);
     }
 
@@ -603 +574 @@
   std::list<CounterConatiner> counters;
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
-  bool bShowAll = false;
   bool bNSClient = false;
   /* average maax */
@@ -617 +587 @@
     MAP_OPTIONS_STR("MinCrit", tmpObject.crit.min)
     MAP_OPTIONS_STR("Alias", tmpObject.data)
-    MAP_OPTIONS_BOOL_TRUE(SHOW_ALL, bShowAll)
-    MAP_OPTIONS_BOOL_FALSE(SHOW_FAIL, bShowAll)
+    MAP_OPTIONS_SHOWALL(tmpObject)
     MAP_OPTIONS_BOOL_EX("Averages", bCheckAverages, "true", "false")
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
@@ -629 +598 @@
       MAP_OPTIONS_MISSING_EX(p2, msg, "Unknown argument: ")
     MAP_OPTIONS_SECONDARY_END()
-    else {
-      tmpObject.data = p__.first;
-      counters.push_back(tmpObject);
-    }
+    MAP_OPTIONS_FALLBACK_AND(tmpObject.data, counters.push_back(tmpObject))
   MAP_OPTIONS_END()
 
@@ -657 +623 @@
       } else {
         counter.setDefault(tmpObject);
-        counter.runCheck(value, returnCode, msg, perf, bShowAll);
+        counter.runCheck(value, returnCode, msg, perf);
       }
     } catch (const PDH::PDHException e) {

modules/CheckSystem/PDHCollector.cpp

@@ -133 +133 @@
   }while (((waitStatus = WaitForSingleObject(hStopEvent_, checkIntervall_*100)) == WAIT_TIMEOUT));
   if (waitStatus != WAIT_OBJECT_0) {
-    NSC_LOG_ERROR("Something odd happend, terminating PDH collection thread!");
+    NSC_LOG_ERROR("Something odd happened, terminating PDH collection thread!");
   }
 
@@ -142 +142 @@
     }
 
-    if (!CloseHandle(hStopEvent_))
+    if (!CloseHandle(hStopEvent_)) {
       NSC_LOG_ERROR_STD("Failed to close stopEvent handle: " + strEx::itos(GetLastError()));
-    else
+    } else
       hStopEvent_ = NULL;
     try {
@@ -160 +160 @@
 */
 void PDHCollector::exitThread(void) {
-  MutexLock mutex(mutexHandler);
-  if (!mutex.hasMutex()) {
-    NSC_LOG_ERROR("Failed to get Mute when trying to close thread!");
-    return;
-  }
   if (hStopEvent_ == NULL)
-    NSC_LOG_ERROR("Failed to get stop event!");
+    NSC_LOG_ERROR("Stop event is not created!");
   else
     if (!SetEvent(hStopEvent_)) {

modules/SysTray/TrayIcon.cpp

@@ -5 +5 @@
 #include <ShellAPI.h>
 
-void IconWidget_::threadProc(LPVOID lpParameter)
+unsigned IconWidget_::threadProc(LPVOID lpParameter)
 {
   createDialog();
+  return 0;
 }
 

modules/SysTray/TrayIcon.h

@@ -8 +8 @@
 class IconWidget_ {
 public:
-  void threadProc(LPVOID lpParameter);
+  unsigned threadProc(LPVOID lpParameter);
   void exitThread(void);