Skip to content

Added health checks #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 1 commit into from
Sep 25, 2020
Merged

Added health checks #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions SecurityService/SecurityService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="3.1.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.1">
Expand Down
40 changes: 37 additions & 3 deletions SecurityService/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Net.Http;
using System.Reflection;
using System.Threading.Tasks;
using Database.DbContexts;
using Database.Seeding;
using Factories;
using HealthChecks.UI.Client;
using IdentityServer4.EntityFramework.DbContexts;
using IdentityServer4.EntityFramework.Interfaces;
using Lamar;
using Manager;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.AspNetCore.Identity;
Expand All @@ -22,6 +25,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
Expand Down Expand Up @@ -131,8 +135,6 @@ public void Configure(IApplicationBuilder app,

Logger.Initialise(logger);

ConfigurationReader.Initialise(Startup.Configuration);

app.AddRequestLogging();
app.AddResponseLogging();
app.AddExceptionHandler();
Expand Down Expand Up @@ -163,7 +165,15 @@ public void Configure(IApplicationBuilder app,
// Setup the database
this.InitialiseDatabase(app).Wait();

app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
app.UseEndpoints(endpoints =>
{
endpoints.MapControllers();
endpoints.MapHealthChecks("health", new HealthCheckOptions()
{
Predicate = _ => true,
ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
});
});

app.UseSwagger();

Expand All @@ -179,6 +189,8 @@ public void Configure(IApplicationBuilder app,

public void ConfigureContainer(ServiceRegistry services)
{
ConfigurationReader.Initialise(Startup.Configuration);

this.ConfigureMiddlewareServices(services);

services.AddControllersWithViews().AddNewtonsoftJson(options =>
Expand Down Expand Up @@ -212,6 +224,28 @@ public static IContainer GetConfiguredContainer(ServiceRegistry services,

private void ConfigureMiddlewareServices(IServiceCollection services)
{
services.AddHealthChecks()
.AddSqlServer(connectionString:ConfigurationReader.GetConnectionString("PersistedGrantDbContext"),
healthQuery:"SELECT 1;",
name:"Persisted Grant DB",
failureStatus:HealthStatus.Unhealthy,
tags:new string[] {"db", "sql", "sqlserver", "persistedgrant"})
.AddSqlServer(connectionString:ConfigurationReader.GetConnectionString("ConfigurationDbContext"),
healthQuery:"SELECT 1;",
name:"Configuration DB",
failureStatus:HealthStatus.Unhealthy,
tags:new string[] {"db", "sql", "sqlserver", "configuration"})
.AddSqlServer(connectionString:ConfigurationReader.GetConnectionString("AuthenticationDbContext"),
healthQuery:"SELECT 1;",
name:"Authentication DB",
failureStatus:HealthStatus.Unhealthy,
tags:new string[] {"db", "sql", "sqlserver", "authentication"})
.AddUrlGroup(new Uri($"{ConfigurationReader.GetValue("ServiceAddresses", "MessagingService")}/health"),
name: "Messaging Service",
httpMethod: HttpMethod.Get,
failureStatus: HealthStatus.Unhealthy,
tags: new string[] { "apllication", "messaging" });

services.AddApiVersioning(options =>
{
// reporting api versions will return the headers "api-supported-versions" and "api-deprecated-versions"
Expand Down