Browse Source

Merge branch 'dotnet3-migration/dev-dotnet3' of https://github.com/dotnet-architecture/eShopOnContainers into dotnet3-migration/dev-dotnet3

dotnet3-migration/dev-dotnet3
eiximenis 5 years ago
parent
commit
a032959460
2 changed files with 27 additions and 101 deletions
  1. +0
    -74
      src/Web/WebStatus/appsettings.json
  2. +27
    -27
      src/docker-compose.override.yml

+ 0
- 74
src/Web/WebStatus/appsettings.json View File

@ -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": { "Serilog": {
"SeqServerUrl": null, "SeqServerUrl": null,
"LogstashgUrl": null, "LogstashgUrl": null,


+ 27
- 27
src/docker-compose.override.yml View File

@ -305,34 +305,34 @@ services:
webstatus: webstatus:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - 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} - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE} - OrchestratorType=${ORCHESTRATOR_TYPE}
ports: ports:


Loading…
Cancel
Save