Merge pull request #28 from svantegraden/develop

This looks all good to me. Thanks Svante!
stegenfeldt · Jun 6, 2018 · 3a4b317 · 3a4b317
2 parents e980f4a + d3a030f
commit 3a4b317
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/Atea.Windows.File.Monitoring/Scripts/FileAgePB.ps1 b/Atea.Windows.File.Monitoring/Scripts/FileAgePB.ps1
@@ -49,6 +49,7 @@ if (Test-Path -Path $RegistryPath) {
 			    if ($Recursive.Trim() -eq "false")
 			    {
 				    $Recursive = ""
+					$summaryMessage += "`n`n"
 			    } else {
 				    $Recursive = "-Recurse "
                     $summaryMessage += ", Recursive`n`n"

diff --git a/Atea.Windows.File.Monitoring/TypeLibrary/ModuleTypes/ProbeActions/FileAgePoSHProbe.mpx b/Atea.Windows.File.Monitoring/TypeLibrary/ModuleTypes/ProbeActions/FileAgePoSHProbe.mpx
@@ -13,7 +13,7 @@
         <ModuleImplementation>
           <Composite>
             <MemberModules>
-              <ProbeAction ID="FileAgeProbeAction" TypeID="Windows!Microsoft.Windows.PowerShellPropertyBagProbe">
+              <ProbeAction ID="FileAgeProbeAction" TypeID="Windows!Microsoft.Windows.PowerShellPropertyBagTriggerOnlyProbe">
                 <ScriptName>FileAgePB.ps1</ScriptName>
                 <ScriptBody>$IncludeFileContent/Scripts/FileAgePB.ps1$</ScriptBody>
                 <SnapIns />
@@ -32,7 +32,7 @@
           </Composite>
         </ModuleImplementation>
         <OutputType>System!System.PropertyBagData</OutputType>
-        <InputType>System!System.BaseData</InputType>
+        <TriggerOnly>true</TriggerOnly>
       </ProbeActionModuleType>
     </ModuleTypes>
   </TypeDefinitions>

diff --git a/Atea.Windows.File.Monitoring/TypeLibrary/MonitorTypes/FileAgeMonitoryType.mpx b/Atea.Windows.File.Monitoring/TypeLibrary/MonitorTypes/FileAgeMonitoryType.mpx
@@ -25,6 +25,10 @@
               <FolderFriendlyName>$Config/FolderFriendlyName$</FolderFriendlyName>
               <FileAgeAttribute>$Config/FileAgeAttribute$</FileAgeAttribute>
             </DataSource>
+            <ProbeAction ID="Probe" TypeID="Atea.Windows.File.Monitoring.FileAgeProbeModule">
+              <FileAgeAttribute>$Config/FileAgeAttribute$</FileAgeAttribute>
+              <TimeoutSeconds>$Config/TimeoutSeconds$</TimeoutSeconds>
+            </ProbeAction>
             <ConditionDetection ID="ErrorFilter" TypeID="System!System.ExpressionFilter">
               <Expression>
                 <SimpleExpression>
@@ -64,6 +68,18 @@
               </Node>
             </RegularDetection>
           </RegularDetections>
+          <OnDemandDetections>
+            <OnDemandDetection MonitorTypeStateID="Healthy">
+              <Node ID="HealthyFilter">
+                <Node ID="Probe" />
+              </Node>
+            </OnDemandDetection>
+            <OnDemandDetection MonitorTypeStateID="Error">
+              <Node ID="ErrorFilter">
+                <Node ID="Probe" />
+              </Node>
+            </OnDemandDetection>
+          </OnDemandDetections>
         </MonitorImplementation>
       </UnitMonitorType>
     </MonitorTypes>

diff --git a/Atea.Windows.Service.Monitoring/HealthModel/Rules/AlertRules.mptg b/Atea.Windows.Service.Monitoring/HealthModel/Rules/AlertRules.mptg
@@ -23,7 +23,7 @@
         <AlertPriority>Normal</AlertPriority>
         <AlertSeverity>Error</AlertSeverity>
         <AlertName>Failed to Recovery Service</AlertName>
-        <AlertDescription>$Data/Property[@Name='EventDescription']$</AlertDescription>
+        <AlertDescription>$Data/EventDescription$</AlertDescription>
       </AlertRuleConfig>
     </Instance>
   </Instances>

diff --git a/Atea.Windows.Service.Monitoring/HealthModel/Rules/AlertRules.mptg.mpx b/Atea.Windows.Service.Monitoring/HealthModel/Rules/AlertRules.mptg.mpx