Updated Helm scripts to include healthcheck url env vars

Updated Webstatus docker-compose to include HealthCheck url env vars
2018-12-04 15:51:33 +01:00 · 2018-12-04 15:51:33 +01:00 · 8d794a220b
commit 8d794a220b
parent 0f6f4e6d14
19 changed files with 270 additions and 109 deletions
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@ -301,50 +301,41 @@ services:
    environment:
      - ASPNETCORE_ENVIRONMENT=Development
      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - CatalogUrl=http://catalog.api/hc
-      - HealthChecks-UI__HealthChecks__0__Name=Ordering HTTP Check
-      - HealthChecks-UI__HealthChecks__0__Uri=http://ordering.api/hc
-      - HealthChecks-UI__HealthChecks__1__Name=Ordering HTTP Background Check
-      - HealthChecks-UI__HealthChecks__1__Uri=http://ordering.backgroundtasks/hc
-      - HealthChecks-UI__HealthChecks__2__Name=Basket HTTP Background Check
-      - HealthChecks-UI__HealthChecks__2__Uri=http://basket.api/hc
-      - HealthChecks-UI__HealthChecks__3__Name=Catalog HTTP Check
-      - HealthChecks-UI__HealthChecks__3__Uri=http://catalog.api/hc
-      - HealthChecks-UI__HealthChecks__4__Name=Identity HTTP Check
-      - HealthChecks-UI__HealthChecks__4__Uri=http://identity.api/hc
-      - HealthChecks-UI__HealthChecks__5__Name=Marketing HTTP Check
-      - HealthChecks-UI__HealthChecks__5__Uri=http://marketing.api/hc
-      - HealthChecks-UI__HealthChecks__6__Name=Locations HTTP Check
-      - HealthChecks-UI__HealthChecks__6__Uri=http://locations.api/hc
-      - HealthChecks-UI__HealthChecks__7__Name=Payments HTTP Check
-      - HealthChecks-UI__HealthChecks__7__Uri=http://payment.api/hc
-      - HealthChecks-UI__HealthChecks__8__Name=Ordering SignalRHub HTTP Check
-      - HealthChecks-UI__HealthChecks__8__Uri=http://ordering.signalrhub/hc
-      - HealthChecks-UI__HealthChecks__9__Name=WebMVC HTTP Check
-      - HealthChecks-UI__HealthChecks__9__Uri=http://webmvc/hc
-      - HealthChecks-UI__HealthChecks__10__Name=WebSPA HTTP Check
-      - HealthChecks-UI__HealthChecks__10__Uri=http://webspa/hc
-      - HealthChecks-UI__HealthChecks__11__Name=Mobile Shopping API GW HTTP Check
-      - HealthChecks-UI__HealthChecks__11__Uri=http://mobileshoppingapigw/hc
-      - HealthChecks-UI__HealthChecks__12__Name=Mobile Marketing API GW HTTP Check
-      - HealthChecks-UI__HealthChecks__12__Uri=http://mobilemarketingapigw/hc
-      - HealthChecks-UI__HealthChecks__13__Name=Web Shopping API GW HTTP Check
-      - HealthChecks-UI__HealthChecks__13__Uri=http://webshoppingapigw/hc
-      - HealthChecks-UI__HealthChecks__14__Name=Web Marketing API GW HTTP Check
-      - HealthChecks-UI__HealthChecks__14__Uri=http://webmarketingapigw/hc
-      - HealthChecks-UI__HealthChecks__15__Name=Mobile Shopping Aggregator HTTP Check
-      - HealthChecks-UI__HealthChecks__15__Uri=http://mobileshoppingagg/hc
-      - HealthChecks-UI__HealthChecks__16__Name=Web Shopping API GW HTTP Check
-      - HealthChecks-UI__HealthChecks__16__Uri=http://webshoppingagg/hc
-      
+      - HealthChecks-UI__HealthChecks__1__Name=WebMVC HTTP Check
+      - HealthChecks-UI__HealthChecks__1__Uri=http://webmvc/hc
+      - HealthChecks-UI__HealthChecks__2__Name=WebSPA HTTP Check
+      - HealthChecks-UI__HealthChecks__2__Uri=http://webspa/hc
+      - HealthChecks-UI__HealthChecks__3__Name=Web Shopping Aggregator GW HTTP Check
+      - HealthChecks-UI__HealthChecks__3__Uri=http://webshoppingagg/hc
+      - HealthChecks-UI__HealthChecks__4__Name=Mobile Shopping Aggregator HTTP Check
+      - HealthChecks-UI__HealthChecks__4__Uri=http://mobileshoppingagg/hc
+      - HealthChecks-UI__HealthChecks__5__Name=Mobile Shopping API GW HTTP Check
+      - HealthChecks-UI__HealthChecks__5__Uri=http://mobileshoppingapigw/hc
+      - HealthChecks-UI__HealthChecks__6__Name=Mobile Marketing API GW HTTP Check
+      - HealthChecks-UI__HealthChecks__6__Uri=http://mobilemarketingapigw/hc
+      - HealthChecks-UI__HealthChecks__7__Name=Web Shopping API GW HTTP Check
+      - HealthChecks-UI__HealthChecks__7__Uri=http://webshoppingapigw/hc
+      - HealthChecks-UI__HealthChecks__8__Name=Web Marketing API GW HTTP Check
+      - HealthChecks-UI__HealthChecks__8__Uri=http://webmarketingapigw/hc
+      - HealthChecks-UI__HealthChecks__9__Name=Ordering HTTP Check
+      - HealthChecks-UI__HealthChecks__9__Uri=http://ordering.api/hc
+      - HealthChecks-UI__HealthChecks__10__Name=Ordering HTTP Background Check
+      - HealthChecks-UI__HealthChecks__10__Uri=http://ordering.backgroundtasks/hc
+      - HealthChecks-UI__HealthChecks__11__Name=Basket HTTP Check
+      - HealthChecks-UI__HealthChecks__11__Uri=http://basket.api/hc
+      - HealthChecks-UI__HealthChecks__12__Name=Catalog HTTP Check
+      - HealthChecks-UI__HealthChecks__12__Uri=http://catalog.api/hc
+      - HealthChecks-UI__HealthChecks__13__Name=Identity HTTP Check
+      - HealthChecks-UI__HealthChecks__13__Uri=http://identity.api/hc
+      - HealthChecks-UI__HealthChecks__14__Name=Marketing HTTP Check
+      - HealthChecks-UI__HealthChecks__14__Uri=http://marketing.api/hc
+      - HealthChecks-UI__HealthChecks__15__Name=Locations HTTP Check
+      - HealthChecks-UI__HealthChecks__15__Uri=http://locations.api/hc
+      - HealthChecks-UI__HealthChecks__16__Name=Payments HTTP Check
+      - HealthChecks-UI__HealthChecks__16__Uri=http://payment.api/hc
+      - HealthChecks-UI__HealthChecks__17__Name=Ordering SignalRHub HTTP Check
+      - HealthChecks-UI__HealthChecks__17__Uri=http://ordering.signalrhub/hc      
      - OrderingBackgroundTasksUrl=http://ordering.backgroundtasks/hc
-      - BasketUrl=http://basket.api/hc
-      - IdentityUrl=http://identity.api/hc
-      - LocationsUrl=http://locations.api/hc
-      - MarketingUrl=http://marketing.api/hc
-      - PaymentUrl=http://payment.api/hc
-      - mvc=http://webmvc/hc
-      - spa=http://webspa/hc
      - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
      - OrchestratorType=${ORCHESTRATOR_TYPE}
    ports:
@ -357,12 +348,9 @@ services:
      - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
      - PurchaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
      - MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5203   
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
+      - PurchaseUrlHC=http://webshoppingapigw/hc
+      - MarketingUrlHC=http://webmarketingapigw/hc
+      - IdentityUrlHC=http://identity.api/hc
      - UseCustomizationData=True
      - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
      - OrchestratorType=${ORCHESTRATOR_TYPE}
--- a/k8s/helm/apigwmm/templates/configmap.yaml
+++ b/k8s/helm/apigwmm/templates/configmap.yaml
@ -11,4 +11,11 @@ metadata:
    heritage: {{ .Release.Service }}
 data:
  internalurls__identity: http://{{ .Values.app.svc.identity }}
+  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
+  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
+  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
+  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc

--- a/k8s/helm/apigwmm/values.yaml
+++ b/k8s/helm/apigwmm/values.yaml
@ -32,6 +32,20 @@ env:
  configmap:
    - name: IdentityUrl
      key: internalurls__identity
+    - name: CatalogUrlHC
+      key: internalurls__catalog__hc
+    - name: BasketUrlHC
+      key: internalurls__basket__hc
+    - name: IdentityUrlHC
+      key: internalurls__identity__hc
+    - name: OrderingUrlHC
+      key: internalurls__ordering__hc
+    - name: MarketingUrlHC
+      key: internalurls__marketing__hc
+    - name: PaymentUrlHC
+      key: internalurls__payment__hc
+    - name: LocationUrlHC
+      key: internalurls__location__hc
      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
  values:
    - name: ASPNETCORE_ENVIRONMENT
--- a/k8s/helm/apigwms/templates/configmap.yaml
+++ b/k8s/helm/apigwms/templates/configmap.yaml
@ -11,4 +11,11 @@ metadata:
    heritage: {{ .Release.Service }}
 data:
  internalurls__identity: http://{{ .Values.app.svc.identity }}
+  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
+  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
+  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
+  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc

--- a/k8s/helm/apigwms/values.yaml
+++ b/k8s/helm/apigwms/values.yaml
@ -32,6 +32,20 @@ env:
  configmap:
    - name: IdentityUrl
      key: internalurls__identity
+    - name: CatalogUrlHC
+      key: internalurls__catalog__hc
+    - name: BasketUrlHC
+      key: internalurls__basket__hc
+    - name: IdentityUrlHC
+      key: internalurls__identity__hc
+    - name: OrderingUrlHC
+      key: internalurls__ordering__hc
+    - name: MarketingUrlHC
+      key: internalurls__marketing__hc
+    - name: PaymentUrlHC
+      key: internalurls__payment__hc
+    - name: LocationUrlHC
+      key: internalurls__location__hc
      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
  values:
    - name: ASPNETCORE_ENVIRONMENT
--- a/k8s/helm/apigwwm/templates/configmap.yaml
+++ b/k8s/helm/apigwwm/templates/configmap.yaml
@ -11,4 +11,11 @@ metadata:
    heritage: {{ .Release.Service }}
 data:
  internalurls__identity: http://{{ .Values.app.svc.identity }}
+  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
+  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
+  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
+  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc

--- a/k8s/helm/apigwwm/values.yaml
+++ b/k8s/helm/apigwwm/values.yaml
@ -32,6 +32,20 @@ env:
  configmap:
    - name: IdentityUrl
      key: internalurls__identity
+    - name: CatalogUrlHC
+      key: internalurls__catalog__hc
+    - name: BasketUrlHC
+      key: internalurls__basket__hc
+    - name: IdentityUrlHC
+      key: internalurls__identity__hc
+    - name: OrderingUrlHC
+      key: internalurls__ordering__hc
+    - name: MarketingUrlHC
+      key: internalurls__marketing__hc
+    - name: PaymentUrlHC
+      key: internalurls__payment__hc
+    - name: LocationUrlHC
+      key: internalurls__location__hc
      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
  values:
    - name: ASPNETCORE_ENVIRONMENT
--- a/k8s/helm/apigwws/templates/configmap.yaml
+++ b/k8s/helm/apigwws/templates/configmap.yaml
@ -11,4 +11,11 @@ metadata:
    heritage: {{ .Release.Service }}
 data:
  internalurls__identity: http://{{ .Values.app.svc.identity }}
+  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
+  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
+  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
+  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc

--- a/k8s/helm/apigwws/values.yaml
+++ b/k8s/helm/apigwws/values.yaml
@ -32,6 +32,20 @@ env:
  configmap:
    - name: IdentityUrl
      key: internalurls__identity
+    - name: CatalogUrlHC
+      key: internalurls__catalog__hc
+    - name: BasketUrlHC
+      key: internalurls__basket__hc
+    - name: IdentityUrlHC
+      key: internalurls__identity__hc
+    - name: OrderingUrlHC
+      key: internalurls__ordering__hc
+    - name: MarketingUrlHC
+      key: internalurls__marketing__hc
+    - name: PaymentUrlHC
+      key: internalurls__payment__hc
+    - name: LocationUrlHC
+      key: internalurls__location__hc
      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
  values:
    - name: ASPNETCORE_ENVIRONMENT
--- a/k8s/helm/mobileshoppingagg/templates/configmap.yaml
+++ b/k8s/helm/mobileshoppingagg/templates/configmap.yaml
@ -17,3 +17,10 @@ data:
  internalurls__catalog: http://{{ .Values.app.svc.catalog }}
  internalurls__identity: http://{{ .Values.app.svc.identity }}
  internalurls__ordering: http://{{ .Values.app.svc.ordering }}
+  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
+  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
+  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
+  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc
--- a/k8s/helm/mobileshoppingagg/values.yaml
+++ b/k8s/helm/mobileshoppingagg/values.yaml
@ -40,6 +40,20 @@ env:
      key: internalurls__ordering
    - name: urls__identity
      key: internalurls__identity
+    - name: CatalogUrlHC
+      key: internalurls__catalog__hc
+    - name: BasketUrlHC
+      key: internalurls__basket__hc
+    - name: IdentityUrlHC
+      key: internalurls__identity__hc
+    - name: OrderingUrlHC
+      key: internalurls__ordering__hc
+    - name: MarketingUrlHC
+      key: internalurls__marketing__hc
+    - name: PaymentUrlHC
+      key: internalurls__payment__hc
+    - name: LocationUrlHC
+      key: internalurls__location__hc
      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
  values:
    - name: ASPNETCORE_ENVIRONMENT
--- a/k8s/helm/webmvc/templates/configmap.yaml
+++ b/k8s/helm/webmvc/templates/configmap.yaml
@ -21,12 +21,9 @@ data:
  webmvc__keystore: {{ .Values.inf.redis.keystore.constr }}
  internalurls__apigwws: http://{{ .Values.app.svc.webshoppingapigw }}
  internalurls__apigwwm: http://{{ .Values.app.svc.webmarketingapigw }}
-  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
-  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  internalurls__apigwws__hc: http://{{ .Values.app.svc.webshoppingapigw }}/hc
  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
-  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
-  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
-  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  internalurls__apigwwm__hc: http://{{ .Values.app.svc.webmarketingapigw }}/hc
  urls__apigwws: http://{{ $webshoppingapigw }}
  urls__mvc: http://{{ $mvc }}
  urls__IdentityUrl: http://{{ $identity }}
--- a/k8s/helm/webmvc/values.yaml
+++ b/k8s/helm/webmvc/values.yaml
@ -46,18 +46,12 @@ env:
      key: urls__IdentityUrl
    - name: MarketingUrl
      key: internalurls__apigwwm
-    - name: BasketUrlHC
-      key: internalurls__basket__hc
-    - name: CatalogUrlHC
-      key: internalurls__catalog__hc
+    - name: PurchaseUrlHC
+      key: internalurls__apigwws__hc
    - name: IdentityUrlHC
      key: internalurls__identity__hc      
-    - name: OrderingUrlHC
-      key: internalurls__ordering__hc      
    - name: MarketingUrlHC
-      key: internalurls__marketing__hc      
-    - name: PaymentUrlHC
-      key: internalurls__payment__hc
+      key: internalurls__apigwwm__hc    
    - name: SignalrHubUrl
      key: urls__apigwws
      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
--- a/k8s/helm/webshoppingagg/templates/configmap.yaml
+++ b/k8s/helm/webshoppingagg/templates/configmap.yaml
@ -17,3 +17,10 @@ data:
  internalurls__catalog: http://{{ .Values.app.svc.catalog }}
  internalurls__identity: http://{{ .Values.app.svc.identity }}
  internalurls__ordering: http://{{ .Values.app.svc.ordering }}
+  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
+  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
+  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
+  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc
--- a/k8s/helm/webshoppingagg/values.yaml
+++ b/k8s/helm/webshoppingagg/values.yaml
@ -40,6 +40,20 @@ env:
      key: internalurls__ordering
    - name: urls__identity
      key: internalurls__identity
+    - name: CatalogUrlHC
+      key: internalurls__catalog__hc
+    - name: BasketUrlHC
+      key: internalurls__basket__hc
+    - name: IdentityUrlHC
+      key: internalurls__identity__hc
+    - name: OrderingUrlHC
+      key: internalurls__ordering__hc
+    - name: MarketingUrlHC
+      key: internalurls__marketing__hc
+    - name: PaymentUrlHC
+      key: internalurls__payment__hc
+    - name: LocationUrlHC
+      key: internalurls__location__hc
      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
  values:
    - name: ASPNETCORE_ENVIRONMENT
--- a/k8s/helm/webspa/templates/configmap.yaml
+++ b/k8s/helm/webspa/templates/configmap.yaml
@ -20,12 +20,9 @@ data:
  all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
  webspa__keystore: {{ .Values.inf.redis.keystore.constr }}
  internalurls__apigwws: http://{{ .Values.app.svc.webshoppingapigw }}
-  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
-  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  internalurls__apigwws__hc: http://{{ .Values.app.svc.webshoppingapigw }}/hc
  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
-  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
-  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
-  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  internalurls__apigwwm__hc: http://{{ .Values.app.svc.webmarketingapigw }}/hc
  urls__apigwws: http://{{ $webshoppingapigw }}
  urls__spa: http://{{ $spa }}
  urls__IdentityUrl: http://{{ $identity }}
--- a/k8s/helm/webspa/values.yaml
+++ b/k8s/helm/webspa/values.yaml
@ -44,18 +44,12 @@ env:
      key: urls__IdentityUrl
    - name: MarketingUrl
      key: urls__apigwwm
-    - name: BasketUrlHC
-      key: internalurls__basket__hc
-    - name: CatalogUrlHC
-      key: internalurls__catalog__hc
+    - name: PurchaseUrlHC
+      key: internalurls__apigwws__hc
    - name: IdentityUrlHC
      key: internalurls__identity__hc      
-    - name: OrderingUrlHC
-      key: internalurls__ordering__hc      
    - name: MarketingUrlHC
-      key: internalurls__marketing__hc      
-    - name: PaymentUrlHC
-      key: internalurls__payment__hc
+      key: internalurls__apigwwm__hc      
    - name: SignalrHubUrl
      key: urls__apigwws
      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
--- a/k8s/helm/webstatus/templates/configmap.yaml
+++ b/k8s/helm/webstatus/templates/configmap.yaml
@ -19,18 +19,37 @@ data:
  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
  all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
  webstatus__keystore: {{ .Values.inf.redis.keystore.constr }}
-  internalurls__apigwws: http://{{ .Values.app.svc.webshoppingapigw }}
-  internalurls__apigwwm: http://{{ .Values.app.svc.webmarketingapigw }}
-  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
-  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
-  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
-  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
-  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
-  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
-  internalurls__locations__hc: http://{{ .Values.app.svc.locations }}/hc
-  internalurls__orderingbackground__hc: http://{{ .Values.app.svc.orderingbackgroundtasks }}/hc
+  name__mvc__hc: WebMVC HTTP Check
  internalurls__mvc__hc: http://{{ .Values.app.svc.mvc }}/hc
+  name__spa__hc: WebSPA HTTP Check
  internalurls__spa__hc: http://{{ .Values.app.svc.spa }}/hc
-  urls__apigwws: http://{{ $webshoppingapigw }}
-  urls__mvc: http://{{ $mvc }}
-  urls__IdentityUrl: http://{{ $identity }}
+  name__apigwws__hc: Web Shopping API GW HTTP Check
+  internalurls__apigwws__hc: http://{{ .Values.app.svc.webshoppingapigw }}/hc
+  name__apigwwm__hc: Web Marketing API GW HTTP Check
+  internalurls__apigwwm__hc: http://{{ .Values.app.svc.webmarketingapigw }}/hc
+  name__apigwms__hc: Mobile Shopping API GW HTTP Check
+  internalurls__apigwms__hc: http://{{ .Values.app.svc.mobileshoppingapigw }}/hc
+  name__apigwmm__hc: Mobile Marketing API GW HTTP Check
+  internalurls__apigwmm__hc: http://{{ .Values.app.svc.mobilemarketingapigw }}/hc
+  name__apigwwsagg__hc: Web Shopping Aggregator GW HTTP Check
+  internalurls__apigwwsagg__hc: http://{{ .Values.app.svc.webshoppingagg }}/hc
+  name__apigwmsagg__hc: Mobile Shopping Aggregator HTTP Check
+  internalurls__apigwmsagg__hc: http://{{ .Values.app.svc.mobileshoppingagg }}/hc
+  name__ordering__hc: Ordering HTTP Check
+  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
+  name__orderingbackground__hc: Ordering HTTP Background Check
+  internalurls__orderingbackground__hc: http://{{ .Values.app.svc.orderingbackgroundtasks }}/hc
+  name__basket__hc: Basket HTTP Check
+  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
+  name__catalog__hc: Catalog HTTP Check
+  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  name__identity__hc: Identity HTTP Check
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  name__marketing__hc: Marketing HTTP Check
+  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
+  name__locations__hc: Locations HTTP Check
+  internalurls__locations__hc: http://{{ .Values.app.svc.locations }}/hc
+  name__payment__hc: Payment HTTP Check
+  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  name__signalrhub__hc: Ordering SignalR Hub HTTP Check
+  internalurls__signalrhub__hc: http://{{ .Values.app.svc.orderingsignalrhub }}/hc
--- a/k8s/helm/webstatus/values.yaml
+++ b/k8s/helm/webstatus/values.yaml
@ -32,27 +32,73 @@ env:
  configmap:
    - name: ApplicationInsights__InstrumentationKey
      key: all__InstrumentationKey
-    - name: BasketUrl
-      key: internalurls__basket__hc
-    - name: CatalogUrl
-      key: internalurls__catalog__hc
-    - name: IdentityUrl
-      key: internalurls__identity__hc
-    - name: OrderingUrl
-      key: internalurls__ordering__hc      
-    - name: OrderingBackgroundTasksUrl
-      key: internalurls__orderingbackground__hc
-    - name: LocationsUrl
-      key: internalurls__locations__hc
-    - name: MarketingUrl
-      key: internalurls__marketing__hc
-    - name: IdentityUrlHC
-      key: internalurls__identity__hc      
-    - name: mvc
+    - name: HealthChecks-UI__HealthChecks__1__Name
+      key: name__mvc__hc
+    - name: HealthChecks-UI__HealthChecks__1__Uri
      key: internalurls__mvc__hc
-    - name: spa
+    - name: HealthChecks-UI__HealthChecks__2__Name
+      key: name__spa__hc
+    - name: HealthChecks-UI__HealthChecks__2__Uri
      key: internalurls__spa__hc
-    - name: PaymentUrl
+    - name: HealthChecks-UI__HealthChecks__3__Name
+      key: name__apigwws__hc
+    - name: HealthChecks-UI__HealthChecks__3__Uri
+      key: internalurls__apigwws__hc
+    - name: HealthChecks-UI__HealthChecks__4__Name
+      key: name__apigwwm__hc
+    - name: HealthChecks-UI__HealthChecks__4__Uri
+      key: internalurls__apigwwm__hc
+    - name: HealthChecks-UI__HealthChecks__5__Name
+      key: name__apigwms__hc
+    - name: HealthChecks-UI__HealthChecks__5__Uri
+      key: internalurls__apigwms__hcç
+    - name: HealthChecks-UI__HealthChecks__6__Name
+      key: name__apigwmm__hc
+    - name: HealthChecks-UI__HealthChecks__6__Uri
+      key: internalurls__apigwmm__hc
+    - name: HealthChecks-UI__HealthChecks__7__Name
+      key: name__apigwwsagg__hc
+    - name: HealthChecks-UI__HealthChecks__7__Uri
+      key: internalurls__apigwwsagg__hc
+    - name: HealthChecks-UI__HealthChecks__8__Name
+      key: name__apigwmsagg__hc
+    - name: HealthChecks-UI__HealthChecks__8__Uri
+      key: internalurls__apigwmsagg__hc
+    - name: HealthChecks-UI__HealthChecks__9__Name
+      key: name__ordering__hc
+    - name: HealthChecks-UI__HealthChecks__9__Uri
+      key: internalurls__ordering__hc
+    - name: HealthChecks-UI__HealthChecks__10__Name
+      key: name__orderingbackground__hc
+    - name: HealthChecks-UI__HealthChecks__10__Uri
+      key: internalurls__orderingbackground__hc
+    - name: HealthChecks-UI__HealthChecks__11__Name
+      key: name__signalrhub__hc
+    - name: HealthChecks-UI__HealthChecks__11__Uri
+      key: internalurls__signalrhub__hc
+    - name: HealthChecks-UI__HealthChecks__12__Name
+      key: name__basket__hc
+    - name: HealthChecks-UI__HealthChecks__12__Uri
+      key: internalurls__basket__hc
+    - name: HealthChecks-UI__HealthChecks__13__Name
+      key: name__catalog__hc
+    - name: HealthChecks-UI__HealthChecks__13__Uri
+      key: internalurls__catalog__hc
+    - name: HealthChecks-UI__HealthChecks__14__Name
+      key: name__identity__hc
+    - name: HealthChecks-UI__HealthChecks__14__Uri
+      key: internalurls__identity__hc
+    - name: HealthChecks-UI__HealthChecks__15__Name
+      key: name__marketing__hc
+    - name: HealthChecks-UI__HealthChecks__15__Uri
+      key: internalurls__marketing__hc
+    - name: HealthChecks-UI__HealthChecks__16__Name
+      key: name__locations__hc
+    - name: HealthChecks-UI__HealthChecks__16__Uri
+      key: internalurls__locations__hc
+    - name: HealthChecks-UI__HealthChecks__17__Name
+      key: name__payment__hc
+    - name: HealthChecks-UI__HealthChecks__17__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: