diff --git a/OurUmbraco.Site/ApplicationInsights.config b/OurUmbraco.Site/ApplicationInsights.config new file mode 100644 index 00000000..d198df54 --- /dev/null +++ b/OurUmbraco.Site/ApplicationInsights.config @@ -0,0 +1,81 @@ + + + + + + + + + + + search|spider|crawl|Bot|Monitor|AlwaysOn + + + + + + + + + + + + + + + + + + + + + + System.Web.Handlers.TransferRequestHandler + Microsoft.VisualStudio.Web.PageInspector.Runtime.Tracing.RequestDataHttpHandler + System.Web.StaticFileHandler + System.Web.Handlers.AssemblyResourceLoader + System.Web.Optimization.BundleHandler + System.Web.Script.Services.ScriptHandlerFactory + System.Web.Handlers.TraceHandler + System.Web.Services.Discovery.DiscoveryRequestHandler + System.Web.HttpDebugHandler + + + + + + + + 5 + + + + + lalalala-not-telling-you + \ No newline at end of file diff --git a/OurUmbraco.Site/ErrorHandler/AiHandleErrorAttribute.cs b/OurUmbraco.Site/ErrorHandler/AiHandleErrorAttribute.cs new file mode 100644 index 00000000..c91bf25b --- /dev/null +++ b/OurUmbraco.Site/ErrorHandler/AiHandleErrorAttribute.cs @@ -0,0 +1 @@ +using System; using System.Web.Mvc; using Microsoft.ApplicationInsights; namespace OurUmbraco.Site.ErrorHandler { [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)] public class AiHandleErrorAttribute : HandleErrorAttribute { public override void OnException(ExceptionContext filterContext) { if (filterContext != null && filterContext.HttpContext != null && filterContext.Exception != null) { //If customError is Off, then AI HTTPModule will report the exception if (filterContext.HttpContext.IsCustomErrorEnabled) { var ai = new TelemetryClient(); ai.TrackException(filterContext.Exception); } } base.OnException(filterContext); } } } \ No newline at end of file diff --git a/OurUmbraco.Site/FilterConfig.cs b/OurUmbraco.Site/FilterConfig.cs new file mode 100644 index 00000000..8c6eefbe --- /dev/null +++ b/OurUmbraco.Site/FilterConfig.cs @@ -0,0 +1,11 @@ +using System.Web.Mvc; + +namespace OurUmbraco.Site{ + public class FilterConfig + { + public static void RegisterGlobalFilters(GlobalFilterCollection filters) + { + filters.Add(new ErrorHandler.AiHandleErrorAttribute()); + } + } +} \ No newline at end of file diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index 8cb22c4b..aafeecde 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -26,6 +26,8 @@ + /subscriptions/76a04863-9a92-45d6-9801-b26d74a625c4/resourcegroups/Default-ApplicationInsights-EastUS/providers/microsoft.insights/components/OurUmbraco.Site + /subscriptions/76a04863-9a92-45d6-9801-b26d74a625c4/resourcegroups/Default-ApplicationInsights-EastUS/providers/microsoft.insights/components/OurUmbraco.Site true @@ -127,10 +129,42 @@ ..\packages\Markdown.1.14.4\lib\net45\MarkdownSharp.dll True + + ..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.0.6\lib\net45\Microsoft.AI.Agent.Intercept.dll + True + + + ..\packages\Microsoft.ApplicationInsights.DependencyCollector.2.2.0\lib\net45\Microsoft.AI.DependencyCollector.dll + True + + + ..\packages\Microsoft.ApplicationInsights.PerfCounterCollector.2.2.0\lib\net45\Microsoft.AI.PerfCounterCollector.dll + True + + + ..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll + True + + + ..\packages\Microsoft.ApplicationInsights.Web.2.2.0\lib\net45\Microsoft.AI.Web.dll + True + + + ..\packages\Microsoft.ApplicationInsights.WindowsServer.2.2.0\lib\net45\Microsoft.AI.WindowsServer.dll + True + ..\packages\UmbracoCms.Core.7.5.7\lib\Microsoft.ApplicationBlocks.Data.dll True + + ..\packages\Microsoft.ApplicationInsights.2.2.0\lib\net45\Microsoft.ApplicationInsights.dll + True + + + ..\packages\Microsoft.ApplicationInsights.TraceListener.2.2.0\lib\net45\Microsoft.ApplicationInsights.TraceListener.dll + True + ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll True @@ -376,6 +410,8 @@ + + Search.aspx @@ -707,6 +743,9 @@ + + PreserveNewest + @@ -1796,6 +1835,7 @@ + @@ -4476,6 +4516,9 @@ + + + 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0 diff --git a/OurUmbraco.Site/Service References/Application Insights/ConnectedService.json b/OurUmbraco.Site/Service References/Application Insights/ConnectedService.json new file mode 100644 index 00000000..1127744c --- /dev/null +++ b/OurUmbraco.Site/Service References/Application Insights/ConnectedService.json @@ -0,0 +1,7 @@ +{ + "ProviderId": "Microsoft.ApplicationInsights.ConnectedService.ConnectedServiceProvider", + "Version": "7.16.109.2", + "GettingStartedDocument": { + "Uri": "https://go.microsoft.com/fwlink/?LinkID=613413" + } +} \ No newline at end of file diff --git a/OurUmbraco.Site/packages.config b/OurUmbraco.Site/packages.config index 9cadcda7..37ff4a3b 100644 --- a/OurUmbraco.Site/packages.config +++ b/OurUmbraco.Site/packages.config @@ -19,6 +19,14 @@ + + + + + + + + diff --git a/OurUmbraco/OurUmbraco.csproj b/OurUmbraco/OurUmbraco.csproj index 70cc211c..5870c3c3 100644 --- a/OurUmbraco/OurUmbraco.csproj +++ b/OurUmbraco/OurUmbraco.csproj @@ -129,6 +129,10 @@ ..\packages\UmbracoCms.Core.7.5.7\lib\Microsoft.ApplicationBlocks.Data.dll True + + ..\packages\Microsoft.ApplicationInsights.2.2.0\lib\net45\Microsoft.ApplicationInsights.dll + True + ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll True @@ -137,6 +141,38 @@ ..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll True + + ..\packages\Microsoft.Extensions.Configuration.1.1.0\lib\netstandard1.1\Microsoft.Extensions.Configuration.dll + True + + + ..\packages\Microsoft.Extensions.Configuration.Abstractions.1.1.0\lib\netstandard1.0\Microsoft.Extensions.Configuration.Abstractions.dll + True + + + ..\packages\Microsoft.Extensions.Configuration.FileExtensions.1.1.0\lib\net451\Microsoft.Extensions.Configuration.FileExtensions.dll + True + + + ..\packages\Microsoft.Extensions.Configuration.Json.1.1.0\lib\net451\Microsoft.Extensions.Configuration.Json.dll + True + + + ..\packages\Microsoft.Extensions.FileProviders.Abstractions.1.1.0\lib\netstandard1.0\Microsoft.Extensions.FileProviders.Abstractions.dll + True + + + ..\packages\Microsoft.Extensions.FileProviders.Physical.1.1.0\lib\net451\Microsoft.Extensions.FileProviders.Physical.dll + True + + + ..\packages\Microsoft.Extensions.FileSystemGlobbing.1.1.0\lib\net45\Microsoft.Extensions.FileSystemGlobbing.dll + True + + + ..\packages\Microsoft.Extensions.Primitives.1.1.0\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll + True + ..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll True @@ -214,6 +250,7 @@ True + @@ -227,6 +264,7 @@ True + @@ -242,6 +280,15 @@ True + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.3.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + True + + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + @@ -812,7 +859,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0 - XCOPY "$(ProjectDir)Project\usercontrols\Deli\*.ascx" "$(ProjectDir)..\OurUmbraco.Site\usercontrols\Deli" /y /s + XCOPY "$(ProjectDir)Project\usercontrols\Deli\*.ascx" "$(ProjectDir)..\OurUmbraco.Site\usercontrols\Deli" /y /s XCOPY "$(ProjectDir)Our\usercontrols\*.ascx" "$(ProjectDir)..\OurUmbraco.Site\usercontrols\our.umbraco.org" /y @@ -823,11 +870,11 @@ XCOPY "$(ProjectDir)Our\usercontrols\*.ascx" "$(ProjectDir)..\OurUmbraco.Site\us - \ No newline at end of file diff --git a/OurUmbraco/packages.config b/OurUmbraco/packages.config index 417cfb50..fc8db489 100644 --- a/OurUmbraco/packages.config +++ b/OurUmbraco/packages.config @@ -18,6 +18,7 @@ + @@ -32,8 +33,17 @@ + + + + + + + + + @@ -43,12 +53,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/live.proj b/live.proj index fbceb072..2e5d0098 100644 --- a/live.proj +++ b/live.proj @@ -1,4 +1,4 @@ - + .\ .\OurUmbraco.Site\ @@ -10,20 +10,28 @@ - + $(SourceDirectory)web.config $(DeployHelperDirectory)\$(ProjectName)\ConfigTransforms\Web.$(Environment).config - $(DeployHelperDirectory)\$(ProjectName)\$(Environment)\ + $(SourceDirectory)ApplicationInsights.config + $(DeployHelperDirectory)\$(ProjectName)\ConfigTransforms\ApplicationInsights.$(Environment).config + $(DeployHelperDirectory)\$(ProjectName)\$(Environment)\ + False - + + + \ No newline at end of file