Bigger (cleaner) VM

i3arnon · Jul 13, 2019 · 288a67b · 288a67b
1 parent e53582f
commit 288a67b
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 121 deletions.
diff --git a/src/CloudService/CloudService.ccproj b/src/CloudService/CloudService.ccproj
@@ -52,18 +52,10 @@
     <Folder Include="ServiceWorkerRoleContent\" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ServiceWorkerRoleContent\diagnostics.wadcfg">
-      <SubType>Content</SubType>
-    </Content>
-    <Content Include="ServiceWorkerRoleContent\install.cmd">
-      <SubType>Content</SubType>
-    </Content>
-    <Content Include="ServiceWorkerRoleContent\NDP461-KB3102438-Web.exe">
-      <SubType>Content</SubType>
-    </Content>
+    <PublishProfile Include="Profiles\YouCastProduction.azurePubxml" />
   </ItemGroup>
   <ItemGroup>
-    <PublishProfile Include="Profiles\YouCastProduction.azurePubxml" />
+    <DiagnosticsConfiguration Include="ServiceWorkerRoleContent\diagnostics.wadcfgx" />
   </ItemGroup>
   <!-- Import the target files for this project template -->
   <PropertyGroup>

diff --git a/src/CloudService/Profiles/YouCastProduction.azurePubxml b/src/CloudService/Profiles/YouCastProduction.azurePubxml
@@ -19,6 +19,6 @@
     <AzureStorageAccountName>youcast</AzureStorageAccountName>
     <AzureAppendTimestampToDeploymentLabel>True</AzureAppendTimestampToDeploymentLabel>
     <AzureHostedServiceResourceGroup />
-    <EnableApplicationInsights>False</EnableApplicationInsights>
+    <EnableApplicationInsights>True</EnableApplicationInsights>
   </PropertyGroup>
 </Project>
diff --git a/src/CloudService/ServiceConfiguration.Cloud.cscfg b/src/CloudService/ServiceConfiguration.Cloud.cscfg
@@ -2,6 +2,8 @@
 <ServiceConfiguration serviceName="CloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="6" osVersion="*" schemaVersion="2015-04.2.6">
   <Role name="ServiceWorkerRole">
     <Instances count="1" />
-    <ConfigurationSettings></ConfigurationSettings>
+    <ConfigurationSettings>
+      <Setting name="APPINSIGHTS_INSTRUMENTATIONKEY" value="0578f9e6-9a71-4493-8b6b-cef5243312ec" />
+    </ConfigurationSettings>
   </Role>
 </ServiceConfiguration>
diff --git a/src/CloudService/ServiceConfiguration.Local.cscfg b/src/CloudService/ServiceConfiguration.Local.cscfg
@@ -2,6 +2,8 @@
 <ServiceConfiguration serviceName="CloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="6" osVersion="*" schemaVersion="2015-04.2.6">
   <Role name="ServiceWorkerRole">
     <Instances count="1" />
-    <ConfigurationSettings></ConfigurationSettings>
+    <ConfigurationSettings>
+      <Setting name="APPINSIGHTS_INSTRUMENTATIONKEY" value="0578f9e6-9a71-4493-8b6b-cef5243312ec" />
+    </ConfigurationSettings>
   </Role>
 </ServiceConfiguration>
diff --git a/src/CloudService/ServiceDefinition.csdef b/src/CloudService/ServiceDefinition.csdef
@@ -1,25 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceDefinition name="CloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2015-04.2.6">
-  <WorkerRole name="ServiceWorkerRole" vmsize="ExtraSmall">
+  <WorkerRole name="ServiceWorkerRole" vmsize="Standard_D1_v2">
     <Runtime executionContext="elevated" />
-    <Imports></Imports>
     <Endpoints>
       <InputEndpoint name="SyndicationEndpoint" protocol="http" port="80" />
     </Endpoints>
-    <LocalResources>
-      <LocalStorage name="NETFXInstall" sizeInMB="1024" cleanOnRoleRecycle="false" />
-    </LocalResources>
-    <Startup>
-      <Task commandLine="install.cmd" executionContext="elevated" taskType="simple">
-        <Environment>
-          <Variable name="PathToNETFXInstall">
-            <RoleInstanceValue xpath="/RoleEnvironment/CurrentInstance/LocalResources/LocalResource[@name='NETFXInstall']/@path" />
-          </Variable>
-          <Variable name="ComputeEmulatorRunning">
-            <RoleInstanceValue xpath="/RoleEnvironment/Deployment/@emulated" />
-          </Variable>
-        </Environment>
-      </Task>
-    </Startup>
+    <ConfigurationSettings>
+      <Setting name="APPINSIGHTS_INSTRUMENTATIONKEY" />
+    </ConfigurationSettings>
   </WorkerRole>
 </ServiceDefinition>
diff --git a/src/CloudService/ServiceWorkerRoleContent/NDP461-KB3102438-Web.exe b/src/CloudService/ServiceWorkerRoleContent/NDP461-KB3102438-Web.exe
diff --git a/src/CloudService/ServiceWorkerRoleContent/diagnostics.wadcfg b/src/CloudService/ServiceWorkerRoleContent/diagnostics.wadcfg
diff --git a/src/CloudService/ServiceWorkerRoleContent/diagnostics.wadcfgx b/src/CloudService/ServiceWorkerRoleContent/diagnostics.wadcfgx
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DiagnosticsConfiguration xmlns="http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration">
+  <PublicConfig xmlns="http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration">
+    <WadCfg>
+      <DiagnosticMonitorConfiguration overallQuotaInMB="4096" sinks="applicationInsights.errors">
+        <DiagnosticInfrastructureLogs scheduledTransferLogLevelFilter="Verbose" />
+        <Directories scheduledTransferPeriod="PT1M">
+          <IISLogs containerName="wad-iis-logfiles" />
+          <FailedRequestLogs containerName="wad-failedrequestlogs" />
+        </Directories>
+        <PerformanceCounters scheduledTransferPeriod="PT1M">
+          <PerformanceCounterConfiguration counterSpecifier="\Memory\Available MBytes" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\Web Service(_Total)\ISAPI Extension Requests/sec" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\Web Service(_Total)\Bytes Total/Sec" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\ASP.NET Applications(__Total__)\Requests/Sec" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\ASP.NET Applications(__Total__)\Errors Total/Sec" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\ASP.NET\Requests Queued" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\ASP.NET\Requests Rejected" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\Processor(_Total)\% Processor Time" sampleRate="PT3M" />
+        </PerformanceCounters>
+        <WindowsEventLog scheduledTransferPeriod="PT1M">
+          <DataSource name="Application!*[System[(Level=1 or Level=2 or Level=3)]]" />
+          <DataSource name="Windows Azure!*[System[(Level=1 or Level=2 or Level=3 or Level=4)]]" />
+        </WindowsEventLog>
+        <CrashDumps dumpType="Full">
+          <CrashDumpConfiguration processName="WaAppAgent.exe" />
+          <CrashDumpConfiguration processName="WaIISHost.exe" />
+          <CrashDumpConfiguration processName="WindowsAzureGuestAgent.exe" />
+          <CrashDumpConfiguration processName="WaWorkerHost.exe" />
+          <CrashDumpConfiguration processName="DiagnosticsAgent.exe" />
+          <CrashDumpConfiguration processName="w3wp.exe" />
+        </CrashDumps>
+        <Logs scheduledTransferPeriod="PT1M" scheduledTransferLogLevelFilter="Verbose" />
+      </DiagnosticMonitorConfiguration>
+      <SinksConfig>
+        <Sink name="applicationInsights">
+          <ApplicationInsights />
+          <Channels>
+            <Channel logLevel="Error" name="errors" />
+          </Channels>
+        </Sink>
+      </SinksConfig>
+    </WadCfg>
+    <StorageAccount>youcast</StorageAccount>
+  </PublicConfig>
+  <PrivateConfig xmlns="http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration">
+    <StorageAccount name="youcast" endpoint="https://core.windows.net/" />
+  </PrivateConfig>
+  <IsEnabled>true</IsEnabled>
+</DiagnosticsConfiguration>
diff --git a/src/CloudService/ServiceWorkerRoleContent/install.cmd b/src/CloudService/ServiceWorkerRoleContent/install.cmd