Merge pull request #309 from NHSDigital/APM-2016-check-monitoring-to-use-stage-name

HenryIwanejko · web-flow · commit a10f5dcf6b44 · 2021-05-19T16:27:13.000+01:00
APM-2016 Use stage name for key value for monitoring
diff --git a/azure/common/deploy-stage.yml b/azure/common/deploy-stage.yml
@@ -226,6 +226,7 @@ stages:
                     short_service_name: ${{ parameters.short_service_name }}
                     fully_qualified_service_name: $(FULLY_QUALIFIED_SERVICE_NAME)
                     service_base_path: $(SERVICE_BASE_PATH)
+                    stage_name: ${{ parameters.stage_name }}
                     jinja_templates: ${{ parameters.jinja_templates }}
                     apigee_environment: ${{ parameters.environment }}
                     apigee_organization: ${{ parameters.apigee_organization }}
diff --git a/azure/templates/deploy-service.yml b/azure/templates/deploy-service.yml
@@ -3,6 +3,7 @@ parameters:
   - name: product_display_name
   - name: product_description
   - name: service_name
+  - name: stage_name
   - name: short_service_name
   - name: fully_qualified_service_name
   - name: apigee_environment
@@ -259,10 +260,10 @@ steps:
           headers: "apikey: $(MONITORING_API_KEY)"
           ${{ if eq(parameters.apigee_environment, 'prod') }}:
             url: "https://api.service.nhs.uk/monitoring-sd/service"
-            body: '{ "${{ parameters.service_name }}": { "${{ parameters.apigee_environment }}": [ "${{ parameters.service_name }}@${{ parameters.apigee_environment }}=http_2xx https://api.service.nhs.uk/${{ parameters.service_base_path }}/_ping" ] } }'
+            body: '{ "${{ parameters.service_name }}": { "${{ parameters.apigee_environment }}": [ "${{ parameters.service_name }}@${{ parameters.stage_name }}=http_2xx https://api.service.nhs.uk/${{ parameters.service_base_path }}/_ping" ] } }'
           ${{ if not(eq(parameters.apigee_environment, 'prod')) }}:
             url: "https://internal-dev.api.service.nhs.uk/monitoring-sd/service"
-            body: '{ "${{ parameters.service_name }}": { "${{ parameters.apigee_environment }}": [ "${{ parameters.service_name }}@${{ parameters.apigee_environment }}=http_2xx https://${{ parameters.apigee_environment }}.api.service.nhs.uk/${{ parameters.service_base_path }}/_ping" ] } }'
+            body: '{ "${{ parameters.service_name }}": { "${{ parameters.apigee_environment }}": [ "${{ parameters.service_name }}@${{ parameters.stage_name }}=http_2xx https://${{ parameters.apigee_environment }}.api.service.nhs.uk/${{ parameters.service_base_path }}/_ping" ] } }'
 
   - ${{ if parameters.enable_status_monitoring  }}:
      - template: '../components/curl.yml'
@@ -272,10 +273,10 @@ steps:
         headers: "apikey: $(MONITORING_API_KEY)"
         ${{ if eq(parameters.apigee_environment, 'prod') }}:
           url: "https://api.service.nhs.uk/monitoring-sd/service"
-          body: '{ "${{ parameters.service_name }}": { "${{ parameters.apigee_environment }}": [ "${{ parameters.service_name }}@${{ parameters.apigee_environment }}=http_2xx https://api.service.nhs.uk/${{ parameters.service_base_path }}/_ping", "${{ parameters.service_name }}@${{ parameters.apigee_environment }}=http_2xx_with_api_key https://api.service.nhs.uk/${{ parameters.service_base_path }}/_status"  ] } }'
+          body: '{ "${{ parameters.service_name }}": { "${{ parameters.apigee_environment }}": [ "${{ parameters.service_name }}@${{ parameters.stage_name }}=http_2xx https://api.service.nhs.uk/${{ parameters.service_base_path }}/_ping", "${{ parameters.service_name }}@${{ parameters.apigee_environment }}=http_2xx_with_api_key https://api.service.nhs.uk/${{ parameters.service_base_path }}/_status"  ] } }'
         ${{ if not(eq(parameters.apigee_environment, 'prod')) }}:
           url: "https://internal-dev.api.service.nhs.uk/monitoring-sd/service"
-          body: '{ "${{ parameters.service_name }}": { "${{ parameters.apigee_environment }}": [ "${{ parameters.service_name }}@${{ parameters.apigee_environment }}=http_2xx https://${{ parameters.apigee_environment }}.api.service.nhs.uk/${{ parameters.service_base_path }}/_ping", "${{ parameters.service_name }}@${{ parameters.apigee_environment }}=http_2xx_with_api_key https://${{ parameters.apigee_environment }}.api.service.nhs.uk/${{ parameters.service_base_path }}/_status"  ] } }'
+          body: '{ "${{ parameters.service_name }}": { "${{ parameters.apigee_environment }}": [ "${{ parameters.service_name }}@${{ parameters.stage_name }}=http_2xx https://${{ parameters.apigee_environment }}.api.service.nhs.uk/${{ parameters.service_base_path }}/_ping", "${{ parameters.service_name }}@${{ parameters.apigee_environment }}=http_2xx_with_api_key https://${{ parameters.apigee_environment }}.api.service.nhs.uk/${{ parameters.service_base_path }}/_status"  ] } }'
 
   - ${{ each post_deploy_step in parameters.post_deploy }}:
     - ${{ post_deploy_step }}
