Replaced AutoDeploy functionality with MSBuild Targets instead.

stegenfeldt · Apr 30, 2019 · b8ee3c6 · b8ee3c6
1 parent e38de5e
commit b8ee3c6
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 10 deletions.
diff --git a/Atea.Windows.File.Monitoring/Atea.Windows.File.Monitoring.mpproj b/Atea.Windows.File.Monitoring/Atea.Windows.File.Monitoring.mpproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build;CopyDeploy" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ProjectGuid>{c55b880e-f609-462c-aed3-67f44531d4d7}</ProjectGuid>
@@ -142,5 +142,8 @@
       <Generator>FragmentGenerator</Generator>
     </Content>
   </ItemGroup>
+  <Target Name="CopyDeploy" AfterTargets="Build">
+    <Copy SourceFiles="$(OutputPath)\Atea.Windows.File.Monitoring.mp" DestinationFolder="$(ProjectDir)..\Released" />
+  </Target>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VSAC\Microsoft.SystemCenter.OperationsManager.targets" />
 </Project>
diff --git a/Atea.Windows.Library/Atea.Windows.Library.mpproj b/Atea.Windows.Library/Atea.Windows.Library.mpproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build;CopyDeploy" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ProjectGuid>{361e64de-7730-493d-8464-c22911eb5791}</ProjectGuid>
@@ -132,5 +132,9 @@
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
+  <Target Name="CopyDeploy" AfterTargets="Build">
+    <Copy SourceFiles="$(OutputPath)\Atea.Windows.Library.mp" DestinationFolder="$(ProjectDir)..\Released" />
+    <Copy SourceFiles="$(OutputPath)\Atea.Windows.Library.mpb" DestinationFolder="$(ProjectDir)..\Released" />
+  </Target>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VSAC\Microsoft.SystemCenter.OperationsManager.targets" />
 </Project>
diff --git a/Atea.Windows.Server.Monitoring/Atea.Windows.Server.Monitoring.mpproj b/Atea.Windows.Server.Monitoring/Atea.Windows.Server.Monitoring.mpproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build;CopyDeploy" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ProjectGuid>{e346d1c7-2ca1-4e15-a871-663f747fbfde}</ProjectGuid>
@@ -66,6 +66,10 @@
       <SubType>Content</SubType>
       <Generator>FragmentGenerator</Generator>
     </Content>
+    <Content Include="HealthModel\Monitors\AggregateMonitors.mptg">
+      <SubType>Content</SubType>
+      <Generator>FragmentGenerator</Generator>
+    </Content>
     <Content Include="HealthModel\Monitors\EventMonitoring.mptg">
       <SubType>Content</SubType>
       <Generator>FragmentGenerator</Generator>
@@ -80,6 +84,10 @@
       <SubType>Code</SubType>
       <DependentUpon>HealthModel\Discoveries\Discoveries.mptg</DependentUpon>
     </Compile>
+    <Compile Include="HealthModel\Monitors\AggregateMonitors.mptg.mpx">
+      <SubType>Code</SubType>
+      <DependentUpon>HealthModel\Monitors\AggregateMonitors.mptg</DependentUpon>
+    </Compile>
     <Compile Include="HealthModel\Monitors\EventMonitoring.mptg.mpx">
       <SubType>Code</SubType>
       <DependentUpon>HealthModel\Monitors\EventMonitoring.mptg</DependentUpon>
@@ -134,5 +142,8 @@
     <EmbeddedResource Include="Scripts\DiskUsageProbe.vbs" />
     <EmbeddedResource Include="Scripts\Get-MonitoredEventDiscoveryDS.ps1" />
   </ItemGroup>
+  <Target Name="CopyDeploy" AfterTargets="Build">
+    <Copy SourceFiles="$(OutputPath)\Atea.Windows.Server.Monitoring.mp" DestinationFolder="$(ProjectDir)..\Released" />
+  </Target>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VSAC\Microsoft.SystemCenter.OperationsManager.targets" />
 </Project>
diff --git a/Atea.Windows.Server.Monitoring/HealthModel/Monitors/AggregateMonitors.mptg b/Atea.Windows.Server.Monitoring/HealthModel/Monitors/AggregateMonitors.mptg
@@ -0,0 +1,34 @@
+<TemplateGroup>
+  <Instances>
+    <Instance ID="Instanced4c31df0abfd435982dd70d9fdf8fa56" Type="Microsoft.SystemCenter.Authoring.CodeGeneration.Monitoring.DependencyMonitor" Version="1.0.0.0">
+      <DependencyMonitorConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+        <Algorithm>
+          <Algorithm>WorstOf</Algorithm>
+          <AlgorithmParameter>0</AlgorithmParameter>
+        </Algorithm>
+        <MemberMonitor>Atea.Windows.Server.Monitoring.EventMonitor</MemberMonitor>
+        <MemberInMaintenance>Ignore</MemberInMaintenance>
+        <MemberUnavailable>Ignore</MemberUnavailable>
+        <RelationshipType>Atea.Windows.Server.Monitoring.ComputerHostsMonitoredEvent</RelationshipType>
+        <ParentMonitor>Health!System.Health.AvailabilityState</ParentMonitor>
+        <Accessibility>Public</Accessibility>
+        <Id>MonitoredEventRollup</Id>
+        <DisplayName>Monitored Event Rollup</DisplayName>
+        <Description>Health rollup from monitored event to computer. </Description>
+        <Target>Windows!Microsoft.Windows.Computer</Target>
+        <Enabled>false</Enabled>
+        <Category>AvailabilityHealth</Category>
+        <Remotable>true</Remotable>
+        <Priority>Normal</Priority>
+        <AlertAutoResolve>true</AlertAutoResolve>
+        <AlertOnState>None</AlertOnState>
+        <AlertPriority>Normal</AlertPriority>
+        <AlertSeverity>MatchMonitorHealth</AlertSeverity>
+        <AlertName>One or More Monitored Eventlog Error Events logged</AlertName>
+        <AlertDescription>This rollup monitor will alert if one or more Monitored Eventlog events have been triggered. 
+
+Please refer to Health Explorer to see what specific events is the cause of this error. </AlertDescription>
+      </DependencyMonitorConfig>
+    </Instance>
+  </Instances>
+</TemplateGroup>
diff --git a/Atea.Windows.Server.Monitoring/HealthModel/Monitors/AggregateMonitors.mptg.mpx b/Atea.Windows.Server.Monitoring/HealthModel/Monitors/AggregateMonitors.mptg.mpx
diff --git a/Atea.Windows.Service.Monitoring/Atea.Windows.Service.Monitoring.mpproj b/Atea.Windows.Service.Monitoring/Atea.Windows.Service.Monitoring.mpproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build;CopyDeploy" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ProjectGuid>{53470240-d3b9-4ef1-b4e1-6a075fb07593}</ProjectGuid>
@@ -181,5 +181,8 @@
     <EmbeddedResource Include="Scripts\Remove-MonitoredServiceKey.ps1" />
     <EmbeddedResource Include="Scripts\Restart-MonitoredService.ps1" />
   </ItemGroup>
+  <Target Name="CopyDeploy" AfterTargets="Build">
+    <Copy SourceFiles="$(OutputPath)\Atea.Windows.Service.Monitoring.mp" DestinationFolder="$(ProjectDir)..\Released" />
+  </Target>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VSAC\Microsoft.SystemCenter.OperationsManager.targets" />
 </Project>
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.Library.mpb b/Released/Atea.Windows.Library.mpb
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
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -31,9 +31,4 @@ steps:
   inputs:
     solution: '$(solution)'
     platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
-
-- task: VSTest@2
-  inputs:
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    configuration: '$(buildConfiguration)'