From ef343cbe5f206296bdb7717c99afa87de98382fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=8C=AF?= <361790599@qq.com> Date: Sun, 10 Sep 2017 17:06:45 +0800 Subject: [PATCH 1/6] update nuget setting --- .../Microsoft.AspNetCore.HealthChecks.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj b/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj index 62a414c..90e2d51 100644 --- a/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj +++ b/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj @@ -2,6 +2,11 @@ netcoreapp1.0 + https://github.com/seven1986/HealthChecks + https://github.com/seven1986/HealthChecks + HealthChecks For AspNetCore WebApplication + true + false From ec75b9b523e41720b1df9c4536fe447ff491e9f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=8C=AF?= <361790599@qq.com> Date: Sun, 10 Sep 2017 17:17:17 +0800 Subject: [PATCH 2/6] update nuget setting --- .../Microsoft.Extensions.HealthChecks.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj b/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj index 75eef99..35f0be7 100644 --- a/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj +++ b/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj @@ -2,6 +2,9 @@ netstandard1.3 + true + https://github.com/seven1986/HealthChecks + https://github.com/seven1986/HealthChecks From db14a75bc5b4f88e701ccf4db4355e93cdaf8d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=8C=AF?= <361790599@qq.com> Date: Sun, 10 Sep 2017 18:00:15 +0800 Subject: [PATCH 3/6] update --- HealthChecks.sln | 10 +- README.md | 124 +++++++++++++++++- .../Microsoft.AspNet.HealthChecks.csproj | 1 + ...xtensions.HealthChecks.AzureStorage.csproj | 1 + ...t.Extensions.HealthChecks.SqlServer.csproj | 1 + 5 files changed, 134 insertions(+), 3 deletions(-) diff --git a/HealthChecks.sln b/HealthChecks.sln index facc21a..100448e 100644 --- a/HealthChecks.sln +++ b/HealthChecks.sln @@ -1,7 +1,7 @@ ļ»æ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.9 +VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 15.0.26228.4 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E05DCF88-F916-4B61-A5DC-A8344C9E2429}" EndProject @@ -25,6 +25,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.HealthChec EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleHealthChecker.AspNet", "samples\SampleHealthChecker.AspNet\SampleHealthChecker.AspNet.csproj", "{33FB5967-62C7-4230-B515-780EF63F748E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2F673725-6CD2-4658-9C33-818A61AF3D3A}" + ProjectSection(SolutionItems) = preProject + README.md = README.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -77,4 +82,7 @@ Global {2AE82E1C-6CE1-4755-A332-FA359B7CCE72} = {F9BA869A-7D5F-420F-9505-2D881F7934A7} {33FB5967-62C7-4230-B515-780EF63F748E} = {E05DCF88-F916-4B61-A5DC-A8344C9E2429} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0B66142C-A3CB-48DF-AC49-C8C1656F84CA} + EndGlobalSection EndGlobal diff --git a/README.md b/README.md index 9c068f5..6aa7267 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,125 @@ -Health checks for building services +Health checks for building services [![Build status](https://ci.appveyor.com/api/projects/status/nyvfn5yb8g623rt3?svg=true)](https://ci.appveyor.com/project/seven1986/healthchecks) === - This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. + +Project | NuGet| Used For +--------------- | --------------- +Microsoft.AspNet.HealthChecks|[![NuGet downloads Microsoft.AspNet.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.AspNet.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.AspNet.HealthChecks) | AspNet +Microsoft.AspNetCore.HealthChecks|[![NuGet downloads Microsoft.AspNetCore.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.AspNetCore.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.AspNetCore.HealthChecks) | AspNetCore +Microsoft.Extensions.HealthChecks|[![NuGet downloads Microsoft.Extensions.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks) | AspNetCore +Microsoft.Extensions.HealthChecks.AzureStorage|[![NuGet downloads Microsoft.Extensions.HealthChecks.AzureStorage](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.AzureStorage.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks.AzureStorage) | AspNetCore +Microsoft.Extensions.HealthChecks.SqlServer|[![NuGet downloads Microsoft.Extensions.HealthChecks.SqlServer](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.SqlServer.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks.SqlServer) | AspNetCore + +#### for your AspNet Project +``` +Install-Package Microsoft.AspNet.HealthChecks +``` + +```csharp +//Global.cs +public class Global : System.Web.HttpApplication + { + protected void Application_Start(object sender, EventArgs e) + { + HealthCheckHandler.Timeout = TimeSpan.FromSeconds(3); + + GlobalHealthChecks.Build(builder => + builder.WithDefaultCacheDuration(TimeSpan.FromMinutes(1)) + .AddUrlCheck("https://github.com") + .AddHealthCheckGroup( + "servers", + group => group.AddUrlCheck("https://google.com") + .AddUrlCheck("https://twitddter.com") + ) + .AddHealthCheckGroup( + "memory", + group => group.AddPrivateMemorySizeCheck(1) + .AddVirtualMemorySizeCheck(2) + .AddWorkingSetCheck(1) + ) + .AddCheck("thrower", (Func)(() => { throw new DivideByZeroException(); })) + .AddCheck("long-running", async cancellationToken => { await Task.Delay(10000, cancellationToken); return HealthCheckResult.Healthy("I ran too long"); }) + ); + } + } +``` + + + +### for your AspNetCore Project +``` +Install-Package Microsoft.AspNetCore.HealthChecks +``` + +```csharp +//Program.cs + public class Program + { + public static void Main(string[] args) + { + var host = new WebHostBuilder() + .UseKestrel() + .UseHealthChecks("/health", TimeSpan.FromSeconds(3)) // Or to host on a separate port: .UseHealthChecks(port) + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup() + .Build(); + + host.Run(); + } + } +``` + +### Group”¢Custom health check +``` +Install-Package Microsoft.Extensions.HealthChecks +``` + +```csharp +// Startup.cs + public void ConfigureServices(IServiceCollection services) + { + // When doing DI'd health checks, you must register them as services of their concrete type + services.AddSingleton(); + + services.AddHealthChecks(checks => + { + checks.AddUrlCheck("https://github.com") + .AddHealthCheckGroup( + "servers", + group => group.AddUrlCheck("https://google.com") + .AddUrlCheck("https://twitddter.com") + ) + .AddHealthCheckGroup( + "memory", + group => group.AddPrivateMemorySizeCheck(1) + .AddVirtualMemorySizeCheck(2) + .AddWorkingSetCheck(1), + CheckStatus.Unhealthy + ) + .AddCheck("thrower", (Func)(() => { throw new DivideByZeroException(); })) + .AddCheck("long-running", async cancellationToken => { await Task.Delay(10000, cancellationToken); return HealthCheckResult.Healthy("I ran too long"); }) + .AddCheck("custom"); + + // Install-Package Microsoft.Extensions.HealthChecks.AzureStorage + // Install-Package Microsoft.Extensions.HealthChecks.SqlServer + // add valid storage account credentials first + checks.AddAzureBlobStorageCheck("accountName", "accountKey"); + checks.AddAzureBlobStorageCheck("accountName", "accountKey", "containerName"); + + checks.AddAzureTableStorageCheck("accountName", "accountKey"); + checks.AddAzureTableStorageCheck("accountName", "accountKey", "tableName"); + + checks.AddAzureFileStorageCheck("accountName", "accountKey"); + checks.AddAzureFileStorageCheck("accountName", "accountKey", "shareName"); + + checks.AddAzureQueueStorageCheck("accountName", "accountKey"); + checks.AddAzureQueueStorageCheck("accountName", "accountKey", "queueName"); + */ + }); + + services.AddMvc(); + } + +``` \ No newline at end of file diff --git a/src/Microsoft.AspNet.HealthChecks/Microsoft.AspNet.HealthChecks.csproj b/src/Microsoft.AspNet.HealthChecks/Microsoft.AspNet.HealthChecks.csproj index f197372..e355b66 100644 --- a/src/Microsoft.AspNet.HealthChecks/Microsoft.AspNet.HealthChecks.csproj +++ b/src/Microsoft.AspNet.HealthChecks/Microsoft.AspNet.HealthChecks.csproj @@ -2,6 +2,7 @@ net46 + true diff --git a/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj b/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj index 24d5ce9..2f71456 100644 --- a/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj +++ b/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj @@ -6,6 +6,7 @@ false false false + true diff --git a/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj b/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj index 38cb3ff..ca39748 100644 --- a/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj +++ b/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj @@ -2,6 +2,7 @@ netstandard1.3 + true From fef22d6a0bb99710ebd48ff36bf1c1a89df3e2c1 Mon Sep 17 00:00:00 2001 From: Seven Date: Sun, 10 Sep 2017 18:06:48 +0800 Subject: [PATCH 4/6] Update README.md --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6aa7267..3fd4ec5 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,13 @@ Health checks for building services [![Build status](https://ci.appveyor.com/ap This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. -Project | NuGet| Used For ---------------- | --------------- -Microsoft.AspNet.HealthChecks|[![NuGet downloads Microsoft.AspNet.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.AspNet.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.AspNet.HealthChecks) | AspNet -Microsoft.AspNetCore.HealthChecks|[![NuGet downloads Microsoft.AspNetCore.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.AspNetCore.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.AspNetCore.HealthChecks) | AspNetCore -Microsoft.Extensions.HealthChecks|[![NuGet downloads Microsoft.Extensions.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks) | AspNetCore -Microsoft.Extensions.HealthChecks.AzureStorage|[![NuGet downloads Microsoft.Extensions.HealthChecks.AzureStorage](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.AzureStorage.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks.AzureStorage) | AspNetCore -Microsoft.Extensions.HealthChecks.SqlServer|[![NuGet downloads Microsoft.Extensions.HealthChecks.SqlServer](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.SqlServer.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks.SqlServer) | AspNetCore +Project | NuGet | Used For +--------------- | --------------- | --------------- +Microsoft.AspNet.HealthChecks|[![NuGet downloads Microsoft.AspNet.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.AspNet.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.AspNet.HealthChecks)|AspNet +Microsoft.AspNetCore.HealthChecks|[![NuGet downloads Microsoft.AspNetCore.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.AspNetCore.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.AspNetCore.HealthChecks)|AspNetCore +Microsoft.Extensions.HealthChecks|[![NuGet downloads Microsoft.Extensions.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks)|AspNetCore +Microsoft.Extensions.HealthChecks.AzureStorage|[![NuGet downloads Microsoft.Extensions.HealthChecks.AzureStorage](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.AzureStorage.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks.AzureStorage)|AspNetCore +Microsoft.Extensions.HealthChecks.SqlServer|[![NuGet downloads Microsoft.Extensions.HealthChecks.SqlServer](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.SqlServer.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks.SqlServer)|AspNetCore #### for your AspNet Project ``` @@ -71,7 +71,7 @@ Install-Package Microsoft.AspNetCore.HealthChecks } ``` -### Group”¢Custom health check +### GroupĀ”Ā¢Custom health check ``` Install-Package Microsoft.Extensions.HealthChecks ``` @@ -122,4 +122,4 @@ Install-Package Microsoft.Extensions.HealthChecks services.AddMvc(); } -``` \ No newline at end of file +``` From 1c2b5d5e2b2f61243f1a98f24b87ddaffe7bc66c Mon Sep 17 00:00:00 2001 From: Seven Date: Sun, 10 Sep 2017 18:07:19 +0800 Subject: [PATCH 5/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3fd4ec5..e2c02e6 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Install-Package Microsoft.AspNetCore.HealthChecks } ``` -### GroupĀ”Ā¢Custom health check +### Group,Custom health check ``` Install-Package Microsoft.Extensions.HealthChecks ``` From 0e194dad2e5cfb1debb0ceaae49698dc4777b15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=8C=AF?= <361790599@qq.com> Date: Sun, 10 Sep 2017 18:24:21 +0800 Subject: [PATCH 6/6] fix readme --- README.md | 6 +----- .../Microsoft.Extensions.HealthChecks.csproj | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e2c02e6..9683f62 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ Project | NuGet | Used For --------------- | --------------- | --------------- Microsoft.AspNet.HealthChecks|[![NuGet downloads Microsoft.AspNet.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.AspNet.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.AspNet.HealthChecks)|AspNet Microsoft.AspNetCore.HealthChecks|[![NuGet downloads Microsoft.AspNetCore.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.AspNetCore.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.AspNetCore.HealthChecks)|AspNetCore -Microsoft.Extensions.HealthChecks|[![NuGet downloads Microsoft.Extensions.HealthChecks](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks)|AspNetCore Microsoft.Extensions.HealthChecks.AzureStorage|[![NuGet downloads Microsoft.Extensions.HealthChecks.AzureStorage](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.AzureStorage.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks.AzureStorage)|AspNetCore Microsoft.Extensions.HealthChecks.SqlServer|[![NuGet downloads Microsoft.Extensions.HealthChecks.SqlServer](https://img.shields.io/nuget/dt/Microsoft.Extensions.HealthChecks.SqlServer.svg)](https://www.nuget.org/packages/Microsoft.Extensions.HealthChecks.SqlServer)|AspNetCore @@ -71,10 +70,7 @@ Install-Package Microsoft.AspNetCore.HealthChecks } ``` -### Group,Custom health check -``` -Install-Package Microsoft.Extensions.HealthChecks -``` + ```csharp // Startup.cs diff --git a/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj b/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj index 35f0be7..72a44be 100644 --- a/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj +++ b/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj @@ -2,7 +2,7 @@ netstandard1.3 - true + false https://github.com/seven1986/HealthChecks https://github.com/seven1986/HealthChecks