From a0cc03d35ee44ef2d84326a98fc63b33f650a1e2 Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Thu, 14 Nov 2019 18:34:30 +0000 Subject: [PATCH] Fix webstatus configuration for docker-compose --- src/Web/WebStatus/appsettings.json | 74 ------------------------------ src/docker-compose.override.yml | 54 +++++++++++----------- 2 files changed, 27 insertions(+), 101 deletions(-) diff --git a/src/Web/WebStatus/appsettings.json b/src/Web/WebStatus/appsettings.json index d826db8d7..a7b130e1a 100644 --- a/src/Web/WebStatus/appsettings.json +++ b/src/Web/WebStatus/appsettings.json @@ -1,78 +1,4 @@ { - "HealthChecksUI": { - "HealthChecks": [ - { - "Name": "Ordering HTTP Check", - "Uri": "http://localhost:5102/hc" - }, - { - "Name": "Ordering HTTP Background Check", - "Uri": "http://localhost:5111/hc" - }, - { - "Name": "Basket HTTP Check", - "Uri": "http://localhost:5103/hc" - }, - { - "Name": "Catalog HTTP Check", - "Uri": "http://localhost:5101/hc" - }, - { - "Name": "Identity HTTP Check", - "Uri": "http://localhost:5105/hc" - }, - { - "Name": "Marketing HTTP Check", - "Uri": "http://localhost:5110/hc" - }, - { - "Name": "Locations HTTP Check", - "Uri": "http://localhost:5109/hc" - }, - { - "Name": "Payments HTTP Check", - "Uri": "http://localhost:5108/hc" - }, - { - "Name": "WebMVC HTTP Check (settings-prod)", - "Uri": "http://localhost:5100/hc" - }, - { - "Name": "WebSPA HTTP Check", - "Uri": "http://localhost:5104/hc" - }, - { - "Name": "SignalR HTTP Check", - "Uri": "http://localhost:5112/hc" - }, - { - "Name": "Mobile Shopping API GW HTTP Check", - "Uri": "http://localhost:5200/hc" - }, - { - "Name": "Mobile Marketing API GW HTTP Check", - "Uri": "http://localhost:5201/hc" - }, - { - "Name": "Web Shopping API GW HTTP Check", - "Uri": "http://localhost:5202/hc" - }, - { - "Name": "Web Marketing API GW HTTP Check", - "Uri": "http://localhost:5203/hc" - }, - { - "Name": "Mobile Shopping Aggregator HTTP Check", - "Uri": "http://localhost:5120/hc" - }, - { - "Name": "Web Shopping Aggregator HTTP Check", - "Uri": "http://localhost:5121/hc" - } - ], - "EvaluationTimeOnSeconds": 10, - "MinimumSecondsBetweenFailureNotifications": 60 - }, "Serilog": { "SeqServerUrl": null, "LogstashgUrl": null, diff --git a/src/docker-compose.override.yml b/src/docker-compose.override.yml index 564ff4eb9..95e0a74c2 100644 --- a/src/docker-compose.override.yml +++ b/src/docker-compose.override.yml @@ -305,34 +305,34 @@ services: webstatus: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 - - HealthChecks-UI__HealthChecks__0__Name=WebMVC HTTP Check - - HealthChecks-UI__HealthChecks__0__Uri=http://webmvc/hc - - HealthChecks-UI__HealthChecks__1__Name=WebSPA HTTP Check - - HealthChecks-UI__HealthChecks__1__Uri=http://webspa/hc - - HealthChecks-UI__HealthChecks__2__Name=Web Shopping Aggregator GW HTTP Check - - HealthChecks-UI__HealthChecks__2__Uri=http://webshoppingagg/hc - - HealthChecks-UI__HealthChecks__3__Name=Mobile Shopping Aggregator HTTP Check - - HealthChecks-UI__HealthChecks__3__Uri=http://mobileshoppingagg/hc - - HealthChecks-UI__HealthChecks__4__Name=Ordering HTTP Check - - HealthChecks-UI__HealthChecks__4__Uri=http://ordering-api/hc - - HealthChecks-UI__HealthChecks__5__Name=Basket HTTP Check - - HealthChecks-UI__HealthChecks__5__Uri=http://basket-api/hc - - HealthChecks-UI__HealthChecks__6__Name=Catalog HTTP Check - - HealthChecks-UI__HealthChecks__6__Uri=http://catalog-api/hc - - HealthChecks-UI__HealthChecks__7__Name=Identity HTTP Check - - HealthChecks-UI__HealthChecks__7__Uri=http://identity-api/hc - - HealthChecks-UI__HealthChecks__8__Name=Marketing HTTP Check - - HealthChecks-UI__HealthChecks__8__Uri=http://marketing-api/hc - - HealthChecks-UI__HealthChecks__9__Name=Locations HTTP Check - - HealthChecks-UI__HealthChecks__9__Uri=http://locations-api/hc - - HealthChecks-UI__HealthChecks__10__Name=Payments HTTP Check - - HealthChecks-UI__HealthChecks__10__Uri=http://payment-api/hc - - HealthChecks-UI__HealthChecks__11__Name=Ordering SignalRHub HTTP Check - - HealthChecks-UI__HealthChecks__11__Uri=http://ordering-signalrhub/hc - - HealthChecks-UI__HealthChecks__12__Name=Ordering HTTP Background Check - - HealthChecks-UI__HealthChecks__12__Uri=http://ordering-backgroundtasks/hc + - HealthChecksUI__HealthChecks__0__Name=WebMVC HTTP Check + - HealthChecksUI__HealthChecks__0__Uri=http://webmvc/hc + - HealthChecksUI__HealthChecks__1__Name=WebSPA HTTP Check + - HealthChecksUI__HealthChecks__1__Uri=http://webspa/hc + - HealthChecksUI__HealthChecks__2__Name=Web Shopping Aggregator GW HTTP Check + - HealthChecksUI__HealthChecks__2__Uri=http://webshoppingagg/hc + - HealthChecksUI__HealthChecks__3__Name=Mobile Shopping Aggregator HTTP Check + - HealthChecksUI__HealthChecks__3__Uri=http://mobileshoppingagg/hc + - HealthChecksUI__HealthChecks__4__Name=Ordering HTTP Check + - HealthChecksUI__HealthChecks__4__Uri=http://ordering-api/hc + - HealthChecksUI__HealthChecks__5__Name=Basket HTTP Check + - HealthChecksUI__HealthChecks__5__Uri=http://basket-api/hc + - HealthChecksUI__HealthChecks__6__Name=Catalog HTTP Check + - HealthChecksUI__HealthChecks__6__Uri=http://catalog-api/hc + - HealthChecksUI__HealthChecks__7__Name=Identity HTTP Check + - HealthChecksUI__HealthChecks__7__Uri=http://identity-api/hc + - HealthChecksUI__HealthChecks__8__Name=Marketing HTTP Check + - HealthChecksUI__HealthChecks__8__Uri=http://marketing-api/hc + - HealthChecksUI__HealthChecks__9__Name=Locations HTTP Check + - HealthChecksUI__HealthChecks__9__Uri=http://locations-api/hc + - HealthChecksUI__HealthChecks__10__Name=Payments HTTP Check + - HealthChecksUI__HealthChecks__10__Uri=http://payment-api/hc + - HealthChecksUI__HealthChecks__11__Name=Ordering SignalRHub HTTP Check + - HealthChecksUI__HealthChecks__11__Uri=http://ordering-signalrhub/hc + - HealthChecksUI__HealthChecks__12__Name=Ordering HTTP Background Check + - HealthChecksUI__HealthChecks__12__Uri=http://ordering-backgroundtasks/hc - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - OrchestratorType=${ORCHESTRATOR_TYPE} ports: