Merge branch 'hotfix/bug-6'

stegenfeldt · Oct 26, 2016 · 1088ace · 1088ace
2 parents d8e0ce4 + 0208e1d
commit 1088ace
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 1 deletion.
diff --git a/Atea.Windows.Library/MPResources.resources b/Atea.Windows.Library/MPResources.resources
diff --git a/Atea.Windows.Service.Monitoring/HealthModel/Rules/AlertRules.mptg b/Atea.Windows.Service.Monitoring/HealthModel/Rules/AlertRules.mptg
@@ -15,7 +15,7 @@
         <DataSources>
           <RuleDataSourceItem>
             <DataSourceId>DS</DataSourceId>
-            <DataSourceConfig>&lt;ComputerName&gt;$Target/Host/Property[Type="Windows!Microsoft.Windows.Computer"]/NetworkName$&lt;/ComputerName&gt;&lt;LogName&gt;OperationsManager&lt;/LogName&gt;&lt;Expression&gt;&lt;And&gt;&lt;Expression&gt;&lt;SimpleExpression&gt;&lt;ValueExpression&gt;&lt;XPathQuery Type="String"&gt;EventDisplayNumber&lt;/XPathQuery&gt;&lt;/ValueExpression&gt;&lt;Operator&gt;Equal&lt;/Operator&gt;&lt;ValueExpression&gt;&lt;Value Type="UnsignedInteger"&gt;10100&lt;/Value&gt;&lt;/ValueExpression&gt;&lt;/SimpleExpression&gt;&lt;/Expression&gt;&lt;Expression&gt;&lt;SimpleExpression&gt;&lt;ValueExpression&gt;&lt;XPathQuery Type="String"&gt;PublisherName&lt;/XPathQuery&gt;&lt;/ValueExpression&gt;&lt;Operator&gt;Equal&lt;/Operator&gt;&lt;ValueExpression&gt;&lt;Value Type="String"&gt;Health Service Script&lt;/Value&gt;&lt;/ValueExpression&gt;&lt;/SimpleExpression&gt;&lt;/Expression&gt;&lt;Expression&gt;&lt;RegExExpression&gt;&lt;ValueExpression&gt;&lt;XPathQuery Type="String"&gt;EventDescription&lt;/XPathQuery&gt;&lt;/ValueExpression&gt;&lt;Operator&gt;ContainsSubstring&lt;/Operator&gt;&lt;Pattern&gt;$Target/Property[Type='MSNL!Microsoft.SystemCenter.NTService']/ServiceName$&lt;/Pattern&gt;&lt;/RegExExpression&gt;&lt;/Expression&gt;&lt;/And&gt;&lt;/Expression&gt;</DataSourceConfig>
+            <DataSourceConfig>&lt;ComputerName&gt;$Target/Host/Property[Type="Windows!Microsoft.Windows.Computer"]/NetworkName$&lt;/ComputerName&gt;&lt;LogName&gt;Operations Manager&lt;/LogName&gt;&lt;Expression&gt;&lt;And&gt;&lt;Expression&gt;&lt;SimpleExpression&gt;&lt;ValueExpression&gt;&lt;XPathQuery Type="String"&gt;EventDisplayNumber&lt;/XPathQuery&gt;&lt;/ValueExpression&gt;&lt;Operator&gt;Equal&lt;/Operator&gt;&lt;ValueExpression&gt;&lt;Value Type="UnsignedInteger"&gt;10100&lt;/Value&gt;&lt;/ValueExpression&gt;&lt;/SimpleExpression&gt;&lt;/Expression&gt;&lt;Expression&gt;&lt;SimpleExpression&gt;&lt;ValueExpression&gt;&lt;XPathQuery Type="String"&gt;PublisherName&lt;/XPathQuery&gt;&lt;/ValueExpression&gt;&lt;Operator&gt;Equal&lt;/Operator&gt;&lt;ValueExpression&gt;&lt;Value Type="String"&gt;Health Service Script&lt;/Value&gt;&lt;/ValueExpression&gt;&lt;/SimpleExpression&gt;&lt;/Expression&gt;&lt;Expression&gt;&lt;RegExExpression&gt;&lt;ValueExpression&gt;&lt;XPathQuery Type="String"&gt;EventDescription&lt;/XPathQuery&gt;&lt;/ValueExpression&gt;&lt;Operator&gt;ContainsSubstring&lt;/Operator&gt;&lt;Pattern&gt;$Target/Property[Type='MSNL!Microsoft.SystemCenter.NTService']/ServiceName$&lt;/Pattern&gt;&lt;/RegExExpression&gt;&lt;/Expression&gt;&lt;/And&gt;&lt;/Expression&gt;</DataSourceConfig>
             <DataSourceType>Windows!Microsoft.Windows.EventProvider</DataSourceType>
           </RuleDataSourceItem>
         </DataSources>

diff --git a/Atea.Windows.Service.Monitoring/HealthModel/Rules/AlertRules.mptg.mpx b/Atea.Windows.Service.Monitoring/HealthModel/Rules/AlertRules.mptg.mpx
diff --git a/Released/Atea.Windows.File.Monitoring.mp b/Released/Atea.Windows.File.Monitoring.mp
diff --git a/Released/Atea.Windows.Library.mp b/Released/Atea.Windows.Library.mp
diff --git a/Released/Atea.Windows.Server.Monitoring.mp b/Released/Atea.Windows.Server.Monitoring.mp
diff --git a/Released/Atea.Windows.Service.Monitoring.mp b/Released/Atea.Windows.Service.Monitoring.mp