healt check ui added 🎨

oguzzaydin · Apr 29, 2021 · 49d9853 · 49d9853
1 parent 3868c2b
commit 49d9853
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -61,6 +61,9 @@ The user adds their products to the basket during shopping and creates an order.
 
 # Screenshots
 
+## Healthcheck UI
+![](img/healtcheck-screenshot.png)
+
 ## Order Api
 
 ![](img/order-api-screenshot.png)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -64,6 +64,7 @@ services:
       - PORT=80
       - IdentityUrl=http://identity-api
       - IdentityUrlExternal=http://${ESHOPZERO_EXTERNAL_DNS_NAME_OR_IP}:5201
+      - EventBusConnection=rabbitmq 
       - EventBusUserName=${ESHOPZERO_SERVICE_BUS_USERNAME}
       - EventBusPassword=${ESHOPZERO_SERVICE_BUS_PASSWORD}
       - ConnectionString=User ID=eshopzero;Password=7eeb43dedd28b53b69f7cd74505b3457;Server=postgresdata;Database=eshopzero.order;Integrated Security=true;Pooling=true
@@ -78,6 +79,8 @@ services:
       - PORT=80
       - IdentityUrl=http://identity-api
       - IdentityUrlExternal=http://${ESHOPZERO_EXTERNAL_DNS_NAME_OR_IP}:5201
+      - RedisConnection=redis
+      - EventBusConnection=rabbitmq 
       - EventBusUserName=${ESHOPZERO_SERVICE_BUS_USERNAME}
       - EventBusPassword=${ESHOPZERO_SERVICE_BUS_PASSWORD}
       - ConnectionString=User ID=eshopzero;Password=7eeb43dedd28b53b69f7cd74505b3457;Server=postgresdata;Database=eshopzero.product;Integrated Security=true;Pooling=true

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,6 +29,9 @@ services:
      - identity-api
      - order-api  
      - product-api
+     - postgresdata
+     - rabbitmq
+     - redis
 
   identity-api:
     image: ${DOCKER_REGISTRY-}eshopzero/identity-api:${TAG:-latest}
@@ -47,6 +50,7 @@ services:
       - identity-api 
       - postgresdata 
       - rabbitmq
+      - redis
 
   order-api:
     image: ${DOCKER_REGISTRY-}eshopzero/order-api:${TAG:-latest}

diff --git a/gateway/Gateway/Extensions/ServiceCollectionExtensions.cs b/gateway/Gateway/Extensions/ServiceCollectionExtensions.cs
@@ -43,13 +43,19 @@ public static IServiceCollection AddCustomAuthentication(this IServiceCollection
 
         public static void AddCustomHealthCheck(this IServiceCollection services, IConfiguration configuration)
         {
-            services.AddHealthChecksUI(setup => setup.DisableDatabaseMigrations())
-                .AddInMemoryStorage(); 
             services.AddHealthChecks()
                 .AddCheck("self", () => HealthCheckResult.Healthy())
                 .AddUrlGroup(new Uri(configuration["OrderUrlHC"]), name: "orderapi-check", tags: new[] { "orderapi" })
                 .AddUrlGroup(new Uri(configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new[] { "identityapi" })
                 .AddUrlGroup(new Uri(configuration["ProductUrlHC"]), name: "productapi-check", tags: new[] { "productapi" });
+
+            services.AddHealthChecksUI(setupSettings: setup =>
+            {
+                setup.AddHealthCheckEndpoint("Order Api Healthcheck", configuration["OrderUrlHC"]);
+                setup.AddHealthCheckEndpoint("Product Api Healthcheck", configuration["ProductUrlHC"]);
+                setup.AddHealthCheckEndpoint("Identity Healthcheck", configuration["IdentityUrlHC"]);
+                setup.DisableDatabaseMigrations();
+            }).AddInMemoryStorage();
         }
     }
 }
diff --git a/gateway/Gateway/Gateway.csproj b/gateway/Gateway/Gateway.csproj
@@ -10,12 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="5.0.1" />
+    <PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="5.0.1" />
+    <PackageReference Include="AspNetCore.HealthChecks.Redis" Version="5.0.2" />
     <PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="5.0.1" />
     <PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" />
     <PackageReference Include="Ocelot" Version="17.0.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.0.1" />

diff --git a/img/healtcheck-screenshot.png b/img/healtcheck-screenshot.png
diff --git a/services/order/Order.Api/Web/Extensions/RegisterExtensions.cs b/services/order/Order.Api/Web/Extensions/RegisterExtensions.cs
@@ -136,7 +136,11 @@ public static IServiceCollection AddCustomHealtCheck(this IServiceCollection ser
                 .AddCheck("self", () => HealthCheckResult.Healthy())
                 .AddNpgSql(configuration["ConnectionString"],
                     name: "OrderDB-check",
-                    tags: new[] { "OrderDB" });
+                    tags: new[] { "OrderDB" })
+                .AddRabbitMQ(
+                    $"amqp://{configuration["EventBusConnection"]}",
+                    name: "order-rabbitmqbus-check",
+                    tags: new[] { "rabbitmqbus" }); 
 
             return services;
         }

diff --git a/services/order/Order.Test/Application/OrderQueryTest.cs b/services/order/Order.Test/Application/OrderQueryTest.cs
@@ -1,10 +1,9 @@
-using System;
+using Moq;
+using Order.Api.Application.Queries;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
-using Moq;
-using Order.Api.Application.Queries;
 using Xunit;
 using Zero.Core.Repositories;
 using Zero.Core.Sessions;

diff --git a/services/product/Product.Api/Product.Api.csproj b/services/product/Product.Api/Product.Api.csproj
@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="5.0.2" />
     <PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="5.0.1" />
+    <PackageReference Include="AspNetCore.HealthChecks.Redis" Version="5.0.2" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
     <PackageReference Include="Autofac" Version="6.2.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />

diff --git a/services/product/Product.Api/Web/Extensions/RegisterExtensions.cs b/services/product/Product.Api/Web/Extensions/RegisterExtensions.cs
@@ -134,7 +134,14 @@ public static IServiceCollection AddCustomHealtCheck(this IServiceCollection ser
                 .AddCheck("self", () => HealthCheckResult.Healthy())
                 .AddNpgSql(configuration["ConnectionString"],
                     name: "productDB-check",
-                    tags: new[] { "OrderDB" });
+                    tags: new[] { "OrderDB" })
+                .AddRabbitMQ(
+                    $"amqp://{configuration["EventBusConnection"]}",
+                    name: "order-rabbitmqbus-check",
+                    tags: new[] { "rabbitmqbus" })
+                .AddRedis(configuration["RedisConnection"], 
+                    name: "redis-check", 
+                    tags: new[] { "redis" });
 
             return services;
         }