diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 563d712c1..1ec7879b3 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -331,40 +331,40 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Production - 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=Mobile Shopping API GW HTTP Check - - HealthChecks-UI__HealthChecks__4__Uri=http://mobileshoppingapigw/hc - - HealthChecks-UI__HealthChecks__5__Name=Mobile Marketing API GW HTTP Check - - HealthChecks-UI__HealthChecks__5__Uri=http://mobilemarketingapigw/hc - - HealthChecks-UI__HealthChecks__6__Name=Web Shopping API GW HTTP Check - - HealthChecks-UI__HealthChecks__6__Uri=http://webshoppingapigw/hc - - HealthChecks-UI__HealthChecks__7__Name=Web Marketing API GW HTTP Check - - HealthChecks-UI__HealthChecks__7__Uri=http://webmarketingapigw/hc - - HealthChecks-UI__HealthChecks__8__Name=Ordering HTTP Check - - HealthChecks-UI__HealthChecks__8__Uri=http://ordering.api/hc - - HealthChecks-UI__HealthChecks__9__Name=Ordering HTTP Background Check - - HealthChecks-UI__HealthChecks__9__Uri=http://ordering.backgroundtasks/hc - - HealthChecks-UI__HealthChecks__10__Name=Basket HTTP Check - - HealthChecks-UI__HealthChecks__10__Uri=http://basket.api/hc - - HealthChecks-UI__HealthChecks__11__Name=Catalog HTTP Check - - HealthChecks-UI__HealthChecks__11__Uri=http://catalog.api/hc - - HealthChecks-UI__HealthChecks__12__Name=Identity HTTP Check - - HealthChecks-UI__HealthChecks__12__Uri=http://identity.api/hc - - HealthChecks-UI__HealthChecks__13__Name=Marketing HTTP Check - - HealthChecks-UI__HealthChecks__13__Uri=http://marketing.api/hc - - HealthChecks-UI__HealthChecks__14__Name=Locations HTTP Check - - HealthChecks-UI__HealthChecks__14__Uri=http://locations.api/hc - - HealthChecks-UI__HealthChecks__15__Name=Payments HTTP Check - - HealthChecks-UI__HealthChecks__15__Uri=http://payment.api/hc - - HealthChecks-UI__HealthChecks__16__Name=Ordering SignalRHub HTTP Check - - HealthChecks-UI__HealthChecks__16__Uri=http://ordering.signalrhub/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=Mobile Shopping API GW HTTP Check + - HealthChecksUI__HealthChecks__4__Uri=http://mobileshoppingapigw/hc + - HealthChecksUI__HealthChecks__5__Name=Mobile Marketing API GW HTTP Check + - HealthChecksUI__HealthChecks__5__Uri=http://mobilemarketingapigw/hc + - HealthChecksUI__HealthChecks__6__Name=Web Shopping API GW HTTP Check + - HealthChecksUI__HealthChecks__6__Uri=http://webshoppingapigw/hc + - HealthChecksUI__HealthChecks__7__Name=Web Marketing API GW HTTP Check + - HealthChecksUI__HealthChecks__7__Uri=http://webmarketingapigw/hc + - HealthChecksUI__HealthChecks__8__Name=Ordering HTTP Check + - HealthChecksUI__HealthChecks__8__Uri=http://ordering.api/hc + - HealthChecksUI__HealthChecks__9__Name=Ordering HTTP Background Check + - HealthChecksUI__HealthChecks__9__Uri=http://ordering.backgroundtasks/hc + - HealthChecksUI__HealthChecks__10__Name=Basket HTTP Check + - HealthChecksUI__HealthChecks__10__Uri=http://basket.api/hc + - HealthChecksUI__HealthChecks__11__Name=Catalog HTTP Check + - HealthChecksUI__HealthChecks__11__Uri=http://catalog.api/hc + - HealthChecksUI__HealthChecks__12__Name=Identity HTTP Check + - HealthChecksUI__HealthChecks__12__Uri=http://identity.api/hc + - HealthChecksUI__HealthChecks__13__Name=Marketing HTTP Check + - HealthChecksUI__HealthChecks__13__Uri=http://marketing.api/hc + - HealthChecksUI__HealthChecks__14__Name=Locations HTTP Check + - HealthChecksUI__HealthChecks__14__Uri=http://locations.api/hc + - HealthChecksUI__HealthChecks__15__Name=Payments HTTP Check + - HealthChecksUI__HealthChecks__15__Uri=http://payment.api/hc + - HealthChecksUI__HealthChecks__16__Name=Ordering SignalRHub HTTP Check + - HealthChecksUI__HealthChecks__16__Uri=http://ordering.signalrhub/hc - OrderingBackgroundTasksUrl=http://ordering.backgroundtasks/hc - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - OrchestratorType=${ORCHESTRATOR_TYPE} diff --git a/k8s/helm/webstatus/values.yaml b/k8s/helm/webstatus/values.yaml index 88cae5d7f..808fd8ba9 100644 --- a/k8s/helm/webstatus/values.yaml +++ b/k8s/helm/webstatus/values.yaml @@ -34,73 +34,73 @@ env: configmap: - name: ApplicationInsights__InstrumentationKey key: all__InstrumentationKey - - name: HealthChecks-UI__HealthChecks__0__Name + - name: HealthChecksUI__HealthChecks__0__Name key: name__mvc__hc - - name: HealthChecks-UI__HealthChecks__0__Uri + - name: HealthChecksUI__HealthChecks__0__Uri key: internalurls__mvc__hc - - name: HealthChecks-UI__HealthChecks__1__Name + - name: HealthChecksUI__HealthChecks__1__Name key: name__spa__hc - - name: HealthChecks-UI__HealthChecks__1__Uri + - name: HealthChecksUI__HealthChecks__1__Uri key: internalurls__spa__hc - - name: HealthChecks-UI__HealthChecks__2__Name + - name: HealthChecksUI__HealthChecks__2__Name key: name__apigwws__hc - - name: HealthChecks-UI__HealthChecks__2__Uri + - name: HealthChecksUI__HealthChecks__2__Uri key: internalurls__apigwws__hc - - name: HealthChecks-UI__HealthChecks__3__Name + - name: HealthChecksUI__HealthChecks__3__Name key: name__apigwwm__hc - - name: HealthChecks-UI__HealthChecks__3__Uri + - name: HealthChecksUI__HealthChecks__3__Uri key: internalurls__apigwwm__hc - - name: HealthChecks-UI__HealthChecks__4__Name + - name: HealthChecksUI__HealthChecks__4__Name key: name__apigwms__hc - - name: HealthChecks-UI__HealthChecks__4__Uri + - name: HealthChecksUI__HealthChecks__4__Uri key: internalurls__apigwms__hc - - name: HealthChecks-UI__HealthChecks__5__Name + - name: HealthChecksUI__HealthChecks__5__Name key: name__apigwmm__hc - - name: HealthChecks-UI__HealthChecks__5__Uri + - name: HealthChecksUI__HealthChecks__5__Uri key: internalurls__apigwmm__hc - - name: HealthChecks-UI__HealthChecks__6__Name + - name: HealthChecksUI__HealthChecks__6__Name key: name__apigwwsagg__hc - - name: HealthChecks-UI__HealthChecks__6__Uri + - name: HealthChecksUI__HealthChecks__6__Uri key: internalurls__apigwwsagg__hc - - name: HealthChecks-UI__HealthChecks__7__Name + - name: HealthChecksUI__HealthChecks__7__Name key: name__apigwmsagg__hc - - name: HealthChecks-UI__HealthChecks__7__Uri + - name: HealthChecksUI__HealthChecks__7__Uri key: internalurls__apigwmsagg__hc - - name: HealthChecks-UI__HealthChecks__8__Name + - name: HealthChecksUI__HealthChecks__8__Name key: name__ordering__hc - - name: HealthChecks-UI__HealthChecks__8__Uri + - name: HealthChecksUI__HealthChecks__8__Uri key: internalurls__ordering__hc - - name: HealthChecks-UI__HealthChecks__9__Name + - name: HealthChecksUI__HealthChecks__9__Name key: name__orderingbackground__hc - - name: HealthChecks-UI__HealthChecks__9__Uri + - name: HealthChecksUI__HealthChecks__9__Uri key: internalurls__orderingbackground__hc - - name: HealthChecks-UI__HealthChecks__10__Name + - name: HealthChecksUI__HealthChecks__10__Name key: name__signalrhub__hc - - name: HealthChecks-UI__HealthChecks__10__Uri + - name: HealthChecksUI__HealthChecks__10__Uri key: internalurls__signalrhub__hc - - name: HealthChecks-UI__HealthChecks__11__Name + - name: HealthChecksUI__HealthChecks__11__Name key: name__basket__hc - - name: HealthChecks-UI__HealthChecks__11__Uri + - name: HealthChecksUI__HealthChecks__11__Uri key: internalurls__basket__hc - - name: HealthChecks-UI__HealthChecks__12__Name + - name: HealthChecksUI__HealthChecks__12__Name key: name__catalog__hc - - name: HealthChecks-UI__HealthChecks__12__Uri + - name: HealthChecksUI__HealthChecks__12__Uri key: internalurls__catalog__hc - - name: HealthChecks-UI__HealthChecks__13__Name + - name: HealthChecksUI__HealthChecks__13__Name key: name__identity__hc - - name: HealthChecks-UI__HealthChecks__13__Uri + - name: HealthChecksUI__HealthChecks__13__Uri key: internalurls__identity__hc - - name: HealthChecks-UI__HealthChecks__14__Name + - name: HealthChecksUI__HealthChecks__14__Name key: name__marketing__hc - - name: HealthChecks-UI__HealthChecks__14__Uri + - name: HealthChecksUI__HealthChecks__14__Uri key: internalurls__marketing__hc - - name: HealthChecks-UI__HealthChecks__15__Name + - name: HealthChecksUI__HealthChecks__15__Name key: name__locations__hc - - name: HealthChecks-UI__HealthChecks__15__Uri + - name: HealthChecksUI__HealthChecks__15__Uri key: internalurls__locations__hc - - name: HealthChecks-UI__HealthChecks__16__Name + - name: HealthChecksUI__HealthChecks__16__Name key: name__payment__hc - - name: HealthChecks-UI__HealthChecks__16__Uri + - name: HealthChecksUI__HealthChecks__16__Uri key: internalurls__payment__hc # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value) values: diff --git a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj index b1b6b1db6..d5622ccc4 100644 --- a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj +++ b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj index 1dd1ba1b6..5fbc5ec63 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj index d438e4602..abfd4ab03 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index d5fc0a301..d211446c6 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index 6150179ee..d98e7f58f 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -38,7 +38,7 @@ - + diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 728843f71..d4625fc98 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj index 6c33656e1..3bf3f5814 100644 --- a/src/Services/Location/Locations.API/Locations.API.csproj +++ b/src/Services/Location/Locations.API/Locations.API.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Services/Marketing/Marketing.API/Marketing.API.csproj b/src/Services/Marketing/Marketing.API/Marketing.API.csproj index c47989611..6db2eeffa 100644 --- a/src/Services/Marketing/Marketing.API/Marketing.API.csproj +++ b/src/Services/Marketing/Marketing.API/Marketing.API.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index e2b25c2a7..a98948bad 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj index 63df5da80..331916014 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj index 00d70cbe6..df9ff1c11 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj +++ b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj index efce8b8ab..ec095bd6f 100644 --- a/src/Services/Payment/Payment.API/Payment.API.csproj +++ b/src/Services/Payment/Payment.API/Payment.API.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj b/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj index 4b7fe7eae..5527413b5 100644 --- a/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj +++ b/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 878bcbe7f..ef204dfb6 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj index 56f94d530..e94417c50 100644 --- a/src/Web/WebSPA/WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -85,7 +85,7 @@ - + diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index 7e83ddc7b..fa7247106 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -5,8 +5,8 @@ ..\..\..\docker-compose.dcproj - - + + diff --git a/src/Web/WebStatus/appsettings.Development.json b/src/Web/WebStatus/appsettings.Development.json index 39aa0f472..43c777c55 100644 --- a/src/Web/WebStatus/appsettings.Development.json +++ b/src/Web/WebStatus/appsettings.Development.json @@ -1,5 +1,5 @@ { - "HealthChecks-UI": { + "HealthChecksUI": { "HealthChecks": [ { "Name": "Ordering HTTP Check", diff --git a/src/Web/WebStatus/appsettings.json b/src/Web/WebStatus/appsettings.json index aa19b2cc2..8c72dc232 100644 --- a/src/Web/WebStatus/appsettings.json +++ b/src/Web/WebStatus/appsettings.json @@ -1,5 +1,5 @@ { - "HealthChecks-UI": { + "HealthChecksUI": { "HealthChecks": [ { "Name": "Ordering HTTP Check",