-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #48 from stegenfeldt:stegenfeldt/issue44
FIXED #44 - New overridable property for how many "bad" files are required for a critical alert. Less than that generates a warning.
- Loading branch information
Showing
17 changed files
with
267 additions
and
162 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
Atea.Windows.File.Monitoring/Atea.Windows.File.Monitoring.mpproj.user
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <DeploymentNextVersion>1.0.3.328</DeploymentNextVersion> | ||
| <DeploymentNextVersion>1.0.3.337</DeploymentNextVersion> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+864 Bytes
(110%)
Atea.Windows.File.Monitoring/HealthModel/Monitors/FileAge.mptg.mpx
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
Atea.Windows.File.Monitoring/HealthModel/Monitors/FileShareSpaceMonitors.mptg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
Atea.Windows.File.Monitoring/HealthModel/SecureReferences/FileMonitoringRunasAccount.mpx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
Atea.Windows.File.Monitoring/HealthModel/SecureReferences/FileShareMonitoringProfile.mpx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...dows.File.Monitoring/TypeLibrary/ModuleTypes/ProbeActions/FileAgeFolderDiscoveryProbe.mpx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
262 changes: 153 additions & 109 deletions
262
Atea.Windows.File.Monitoring/TypeLibrary/MonitorTypes/FileAgeMonitoryType.mpx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,110 +1,154 @@ | ||
| <ManagementPackFragment SchemaVersion="2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> | ||
| <TypeDefinitions> | ||
| <MonitorTypes> | ||
| <!--<UnitMonitorType ID="Windows.File.FileAge.MonitorType" Accessibility="Internal" RunAs="Atea.Windows.File.FileCreationTimeFolder.RunasProfile">--> | ||
| <UnitMonitorType ID="Windows.File.FileAge.MonitorType" Accessibility="Internal"> | ||
| <MonitorTypeStates> | ||
| <MonitorTypeState ID="Healthy"/> | ||
| <MonitorTypeState ID="Error"/> | ||
| </MonitorTypeStates> | ||
| <Configuration> | ||
| <xsd:element minOccurs="1" name="TimeoutSeconds" type="xsd:integer" /> | ||
| <xsd:element minOccurs="1" name="IntervalSeconds" type="xsd:integer" /> | ||
| <xsd:element minOccurs="1" name="FolderFriendlyName" type="xsd:string" /> | ||
| <xsd:element minOccurs="1" name="FileAgeAttribute" type="xsd:string" /> | ||
| <xsd:element minOccurs="0" name="EnableVerboseLogging" type="xsd:string" /> | ||
| </Configuration> | ||
| <OverrideableParameters> | ||
| <OverrideableParameter ID="TimeOutSeconds" Selector="$Config/TimeoutSeconds$" ParameterType="int" /> | ||
| <OverrideableParameter ID="IntervalSeconds" Selector="$Config/IntervalSeconds$" ParameterType="int" /> | ||
| <OverrideableParameter ID="FileAgeAttribute" Selector="$Config/FileAgeAttribute$" ParameterType="string"/> | ||
| <OverrideableParameter ID="EnableVerboseLogging" Selector="$Config/EnableVerboseLogging$" ParameterType="string"/> | ||
| </OverrideableParameters> | ||
| <MonitorImplementation> | ||
| <MemberModules> | ||
| <DataSource ID="TimedFileAgePropertyBag" TypeID="Atea.Windows.File.FileAge.TimedPropertyBag"> | ||
| <TimeoutSeconds>$Config/TimeoutSeconds$</TimeoutSeconds> | ||
| <IntervalSeconds>$Config/IntervalSeconds$</IntervalSeconds> | ||
| <FolderFriendlyName>$Config/FolderFriendlyName$</FolderFriendlyName> | ||
| <FileAgeAttribute>$Config/FileAgeAttribute$</FileAgeAttribute> | ||
| <EnableVerboseLogging>$Config/EnableVerboseLogging$</EnableVerboseLogging> | ||
| </DataSource> | ||
| <ProbeAction ID="Probe" TypeID="Atea.Windows.File.Monitoring.FileAgeProbeModule"> | ||
| <FileAgeAttribute>$Config/FileAgeAttribute$</FileAgeAttribute> | ||
| <TimeoutSeconds>$Config/TimeoutSeconds$</TimeoutSeconds> | ||
| <FolderFriendlyName>$Config/FolderFriendlyName$</FolderFriendlyName> | ||
| <EnableVerboseLogging>$Config/EnableVerboseLogging$</EnableVerboseLogging> | ||
| </ProbeAction> | ||
| <ConditionDetection ID="FilterFolder" TypeID="System!System.ExpressionFilter"> | ||
| <Expression> | ||
| <SimpleExpression> | ||
| <ValueExpression> | ||
| <XPathQuery>Property[@Name='FolderFriendlyName']</XPathQuery> | ||
| </ValueExpression> | ||
| <Operator>Equal</Operator> | ||
| <ValueExpression> | ||
| <Value>$Config/FolderFriendlyName$</Value> | ||
| </ValueExpression> | ||
| </SimpleExpression> | ||
| </Expression> | ||
| </ConditionDetection> | ||
| <ConditionDetection ID="ErrorFilter" TypeID="System!System.ExpressionFilter"> | ||
| <Expression> | ||
| <SimpleExpression> | ||
| <ValueExpression> | ||
| <XPathQuery Type="String">Property[@Name='FileCount']</XPathQuery> | ||
| </ValueExpression> | ||
| <Operator>NotEqual</Operator> | ||
| <ValueExpression> | ||
| <Value Type="String">0</Value> | ||
| </ValueExpression> | ||
| </SimpleExpression> | ||
| </Expression> | ||
| </ConditionDetection> | ||
| <ConditionDetection ID="HealthyFilter" TypeID="System!System.ExpressionFilter"> | ||
| <Expression> | ||
| <SimpleExpression> | ||
| <ValueExpression> | ||
| <XPathQuery Type="String">Property[@Name='FileCount']</XPathQuery> | ||
| </ValueExpression> | ||
| <Operator>Equal</Operator> | ||
| <ValueExpression> | ||
| <Value Type="String">0</Value> | ||
| </ValueExpression> | ||
| </SimpleExpression> | ||
| </Expression> | ||
| </ConditionDetection> | ||
| </MemberModules> | ||
| <RegularDetections> | ||
| <RegularDetection MonitorTypeStateID="Healthy"> | ||
| <Node ID="HealthyFilter"> | ||
| <Node ID="TimedFileAgePropertyBag" /> | ||
| </Node> | ||
| </RegularDetection> | ||
| <RegularDetection MonitorTypeStateID="Error"> | ||
| <Node ID="ErrorFilter"> | ||
| <Node ID="TimedFileAgePropertyBag" /> | ||
| </Node> | ||
| </RegularDetection> | ||
| </RegularDetections> | ||
| <OnDemandDetections> | ||
| <OnDemandDetection MonitorTypeStateID="Healthy"> | ||
| <Node ID="HealthyFilter"> | ||
| <Node ID="FilterFolder"> | ||
| <Node ID="Probe" /> | ||
| </Node> | ||
| </Node> | ||
| </OnDemandDetection> | ||
| <OnDemandDetection MonitorTypeStateID="Error"> | ||
| <Node ID="ErrorFilter"> | ||
| <Node ID="FilterFolder"> | ||
| <Node ID="Probe" /> | ||
| </Node> | ||
| </Node> | ||
| </OnDemandDetection> | ||
| </OnDemandDetections> | ||
| </MonitorImplementation> | ||
| </UnitMonitorType> | ||
| </MonitorTypes> | ||
| </TypeDefinitions> | ||
| <ManagementPackFragment SchemaVersion="2.0" | ||
| xmlns:xsd="http://www.w3.org/2001/XMLSchema"> | ||
| <TypeDefinitions> | ||
| <MonitorTypes> | ||
| <!--<UnitMonitorType ID="Windows.File.FileAge.MonitorType" Accessibility="Internal" RunAs="Atea.Windows.File.FileCreationTimeFolder.RunasProfile">--> | ||
| <UnitMonitorType ID="Windows.File.FileAge.MonitorType" Accessibility="Internal"> | ||
| <MonitorTypeStates> | ||
| <MonitorTypeState ID="Healthy" /> | ||
| <MonitorTypeState ID="Warning" /> | ||
| <MonitorTypeState ID="Error" /> | ||
| </MonitorTypeStates> | ||
| <Configuration> | ||
| <xsd:element minOccurs="1" name="TimeoutSeconds" type="xsd:integer" /> | ||
| <xsd:element minOccurs="1" name="IntervalSeconds" type="xsd:integer" /> | ||
| <xsd:element minOccurs="1" name="FolderFriendlyName" type="xsd:string" /> | ||
| <xsd:element minOccurs="1" name="FileAgeAttribute" type="xsd:string" /> | ||
| <xsd:element minOccurs="0" name="EnableVerboseLogging" type="xsd:string" /> | ||
| <xsd:element minOccurs="1" name="FileCountErrorThreshold" type="xsd:integer" /> | ||
| </Configuration> | ||
| <OverrideableParameters> | ||
| <OverrideableParameter ID="TimeOutSeconds" Selector="$Config/TimeoutSeconds$" ParameterType="int" /> | ||
| <OverrideableParameter ID="IntervalSeconds" Selector="$Config/IntervalSeconds$" ParameterType="int" /> | ||
| <OverrideableParameter ID="FileAgeAttribute" Selector="$Config/FileAgeAttribute$" ParameterType="string" /> | ||
| <OverrideableParameter ID="EnableVerboseLogging" Selector="$Config/EnableVerboseLogging$" ParameterType="string" /> | ||
| <OverrideableParameter ID="FileCountErrorThreshold" Selector="$Config/FileCountErrorThreshold$" ParameterType="int" /> | ||
| </OverrideableParameters> | ||
| <MonitorImplementation> | ||
| <MemberModules> | ||
| <DataSource ID="TimedFileAgePropertyBag" TypeID="Atea.Windows.File.FileAge.TimedPropertyBag"> | ||
| <TimeoutSeconds>$Config/TimeoutSeconds$</TimeoutSeconds> | ||
| <IntervalSeconds>$Config/IntervalSeconds$</IntervalSeconds> | ||
| <FolderFriendlyName>$Config/FolderFriendlyName$</FolderFriendlyName> | ||
| <FileAgeAttribute>$Config/FileAgeAttribute$</FileAgeAttribute> | ||
| <EnableVerboseLogging>$Config/EnableVerboseLogging$</EnableVerboseLogging> | ||
| </DataSource> | ||
| <ProbeAction ID="Probe" TypeID="Atea.Windows.File.Monitoring.FileAgeProbeModule"> | ||
| <FileAgeAttribute>$Config/FileAgeAttribute$</FileAgeAttribute> | ||
| <TimeoutSeconds>$Config/TimeoutSeconds$</TimeoutSeconds> | ||
| <FolderFriendlyName>$Config/FolderFriendlyName$</FolderFriendlyName> | ||
| <EnableVerboseLogging>$Config/EnableVerboseLogging$</EnableVerboseLogging> | ||
| </ProbeAction> | ||
| <ConditionDetection ID="FilterFolder" TypeID="System!System.ExpressionFilter"> | ||
| <Expression> | ||
| <SimpleExpression> | ||
| <ValueExpression> | ||
| <XPathQuery>Property[@Name='FolderFriendlyName']</XPathQuery> | ||
| </ValueExpression> | ||
| <Operator>Equal</Operator> | ||
| <ValueExpression> | ||
| <Value>$Config/FolderFriendlyName$</Value> | ||
| </ValueExpression> | ||
| </SimpleExpression> | ||
| </Expression> | ||
| </ConditionDetection> | ||
| <ConditionDetection ID="ErrorFilter" TypeID="System!System.ExpressionFilter"> | ||
| <Expression> | ||
| <SimpleExpression> | ||
| <ValueExpression> | ||
| <XPathQuery Type="Integer">Property[@Name='FileCount']</XPathQuery> | ||
| </ValueExpression> | ||
| <Operator>GreaterEqual</Operator> | ||
| <ValueExpression> | ||
| <Value Type="Integer">$Config/FileCountErrorThreshold$</Value> | ||
| </ValueExpression> | ||
| </SimpleExpression> | ||
| </Expression> | ||
| </ConditionDetection> | ||
| <ConditionDetection ID="WarningFilter" TypeID="System!System.ExpressionFilter"> | ||
| <Expression> | ||
| <And> | ||
| <Expression> | ||
| <SimpleExpression> | ||
| <ValueExpression> | ||
| <XPathQuery Type="Integer">Property[@Name='FileCount']</XPathQuery> | ||
| </ValueExpression> | ||
| <Operator>Less</Operator> | ||
| <ValueExpression> | ||
| <Value Type="Integer">$Config/FileCountErrorThreshold$</Value> | ||
| </ValueExpression> | ||
| </SimpleExpression> | ||
| </Expression> | ||
| <Expression> | ||
| <SimpleExpression> | ||
| <ValueExpression> | ||
| <XPathQuery Type="String">Property[@Name='FileCount']</XPathQuery> | ||
| </ValueExpression> | ||
| <Operator>NotEqual</Operator> | ||
| <ValueExpression> | ||
| <Value Type="Integer">0</Value> | ||
| </ValueExpression> | ||
| </SimpleExpression> | ||
| </Expression> | ||
| </And> | ||
| </Expression> | ||
| </ConditionDetection> | ||
| <ConditionDetection ID="HealthyFilter" TypeID="System!System.ExpressionFilter"> | ||
| <Expression> | ||
| <SimpleExpression> | ||
| <ValueExpression> | ||
| <XPathQuery Type="Integer">Property[@Name='FileCount']</XPathQuery> | ||
| </ValueExpression> | ||
| <Operator>Equal</Operator> | ||
| <ValueExpression> | ||
| <Value Type="Integer">0</Value> | ||
| </ValueExpression> | ||
| </SimpleExpression> | ||
| </Expression> | ||
| </ConditionDetection> | ||
| </MemberModules> | ||
| <RegularDetections> | ||
| <RegularDetection MonitorTypeStateID="Healthy"> | ||
| <Node ID="HealthyFilter"> | ||
| <Node ID="TimedFileAgePropertyBag" /> | ||
| </Node> | ||
| </RegularDetection> | ||
| <RegularDetection MonitorTypeStateID="Warning"> | ||
| <Node ID="WarningFilter"> | ||
| <Node ID="TimedFileAgePropertyBag" /> | ||
| </Node> | ||
| </RegularDetection> | ||
| <RegularDetection MonitorTypeStateID="Error"> | ||
| <Node ID="ErrorFilter"> | ||
| <Node ID="TimedFileAgePropertyBag" /> | ||
| </Node> | ||
| </RegularDetection> | ||
| </RegularDetections> | ||
| <OnDemandDetections> | ||
| <OnDemandDetection MonitorTypeStateID="Healthy"> | ||
| <Node ID="HealthyFilter"> | ||
| <Node ID="FilterFolder"> | ||
| <Node ID="Probe" /> | ||
| </Node> | ||
| </Node> | ||
| </OnDemandDetection> | ||
| <OnDemandDetection MonitorTypeStateID="Warning"> | ||
| <Node ID="WarningFilter"> | ||
| <Node ID="FilterFolder"> | ||
| <Node ID="Probe" /> | ||
| </Node> | ||
| </Node> | ||
| </OnDemandDetection> | ||
| <OnDemandDetection MonitorTypeStateID="Error"> | ||
| <Node ID="ErrorFilter"> | ||
| <Node ID="FilterFolder"> | ||
| <Node ID="Probe" /> | ||
| </Node> | ||
| </Node> | ||
| </OnDemandDetection> | ||
| </OnDemandDetections> | ||
| </MonitorImplementation> | ||
| </UnitMonitorType> | ||
| </MonitorTypes> | ||
| </TypeDefinitions> | ||
| </ManagementPackFragment> |
Oops, something went wrong.