chore: DTOSS-12664 Filter health alerts from logging

.github/workflows/stage-3-build-images-devtest.yaml

@@ -117,8 +117,14 @@ jobs:
         run: |
 
           echo "The branch is: ${GITHUB_REF}"
-          PR_NUM=$(gh api repos/${{ github.repository }}/commits/${{ github.sha }}/pulls --jq '.[0].number')
-          PR_NUM_TAG="pr${PR_NUM}"
+          PR_NUM=$(gh api repos/${{ github.repository }}/commits/${{ github.sha }}/pulls --jq '.[0].number' 2>/dev/null || true)
+          if [ -n "${PR_NUM}" ] && [ "${PR_NUM}" != "null" ]; then
+              PR_NUM_TAG="pr${PR_NUM}"
+              echo "Tag source: PR (${PR_NUM})"
+          else
+              PR_NUM_TAG="${GITHUB_REF_NAME//\//-}"
+              echo "Tag source: fallback ref (${GITHUB_REF_NAME})"
+          fi
           SHORT_COMMIT_HASH=$(git rev-parse --short ${GITHUB_SHA})
 
 
@@ -149,8 +155,14 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
 
-          PR_NUM=$(gh api repos/${{ github.repository }}/commits/${{ github.sha }}/pulls --jq '.[0].number')
-          PR_NUM_TAG="pr${PR_NUM}"
+          PR_NUM=$(gh api repos/${{ github.repository }}/commits/${{ github.sha }}/pulls --jq '.[0].number' 2>/dev/null || true)
+          if [ -n "${PR_NUM}" ] && [ "${PR_NUM}" != "null" ]; then
+            PR_NUM_TAG="pr${PR_NUM}"
+            echo "Tag source: PR (${PR_NUM})"
+          else
+            PR_NUM_TAG="${GITHUB_REF_NAME//\//-}"
+            echo "Tag source: fallback ref (${GITHUB_REF_NAME})"
+          fi
           IMAGE_TAG="latest"
 
           if [[ ${{steps.detect-base-image-changes.outputs.BASE_IMAGE_CHANGE}} == 'true' ]]; then
@@ -213,8 +225,14 @@ jobs:
           ENVIRONMENT_TAG: ${{ inputs.environment_tag }}
         continue-on-error: false
         run: |
-          PR_NUM=$(gh api repos/${{ github.repository }}/commits/${{ github.sha }}/pulls --jq '.[0].number')
-          PR_NUM_TAG="pr${PR_NUM}"
+          PR_NUM=$(gh api repos/${{ github.repository }}/commits/${{ github.sha }}/pulls --jq '.[0].number' 2>/dev/null || true)
+          if [ -n "${PR_NUM}" ] && [ "${PR_NUM}" != "null" ]; then
+            PR_NUM_TAG="pr${PR_NUM}"
+            echo "Tag source: PR (${PR_NUM})"
+          else
+            PR_NUM_TAG="${GITHUB_REF_NAME//\//-}"
+            echo "Tag source: fallback ref (${GITHUB_REF_NAME})"
+          fi
           DEVTEST_PR_NUM_TAG="devtest_${PR_NUM_TAG}"
 
           echo "The branch is: ${GITHUB_REF}"

application/CohortManager/compose.cohort-distribution.yaml

@@ -12,6 +12,7 @@ services:
         BASE_IMAGE: ${FUNCTION_BASE_IMAGE}
     environment:
       - ServiceBusConnectionString_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
+      - ServiceBusConnectionString_client_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - CohortDistributionTopic=cohort-distribution-topic
       - DistributeParticipantSubscription=distribute-participant-sub
       - AzureWebJobsStorage=${AZURITE_CONNECTION_STRING}

application/CohortManager/compose.core.yaml

@@ -67,6 +67,7 @@ services:
       - ManageNemsSubscriptionUnsubscribeURL=http://manage-nems-subscription:9081/api/Unsubscribe
       - ManageNemsSubscriptionSubscribeURL=http://manage-nems-subscription:9081/api/Subscribe
       - DemographicDataServiceURL=http://participant-demographic-data-service:7993/api/ParticipantDemographicDataService
+      - ServiceBusConnectionString_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - ServiceBusConnectionString_client_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - ParticipantManagementTopic=participant-management-topic
 
@@ -94,6 +95,7 @@ services:
       - batchDivisionFactor=5
       - ScreeningLkpDataServiceURL=http://screening-lkp-data-service:8996/api/ScreeningLkpDataService
       - inboundBlobName=inbound
+      - ServiceBusConnectionString_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - ServiceBusConnectionString_client_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - fileExceptions=file-exceptions
       - ParticipantManagementTopic=participant-management-topic
@@ -194,6 +196,7 @@ services:
         BASE_IMAGE: ${FUNCTION_BASE_IMAGE}
     profiles: [ui]
     environment:
+      - ServiceBusConnectionString_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - ServiceBusConnectionString_client_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - ServiceNowParticipantManagementTopic=servicenow-participant-management-topic
       - RetrievePdsDemographicURL=http://retrieve-pds-demographic:8082/api/RetrievePDSDemographic
@@ -210,7 +213,8 @@ services:
     environment:
       - AzureWebJobsStorage=${AZURITE_CONNECTION_STRING}
       - DtOsDatabaseConnectionString=Server=db,1433;Database=${DB_NAME};User Id=SA;Password=${PASSWORD};TrustServerCertificate=True
-      - ServiceBusConnectionString=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
+      - ServiceBusConnectionString_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
+      - ServiceBusConnectionString_client_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - AuditTopicName=participant-audit-topic
       - AuditSubscription=audit-writer-sub
 
@@ -231,6 +235,8 @@ services:
       - DemographicDataServiceURL=http://participant-demographic-data-service:7993/api/ParticipantDemographicDataService/
       - ExceptionManagementDataServiceURL=http://exception-management-data-service:7911/api/ExceptionManagementDataService/
       - GPPracticeDataServiceURL=http://localhost:7999/api/GPPracticeDataService/
+      - ServiceBusConnectionString_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
+      - ServiceBusConnectionString_client_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
 
   update-exception:
     container_name: update-exception
@@ -326,6 +332,7 @@ services:
       - AuthTokenURL=https://int.api.service.nhs.uk/oauth2/token
       - LocalPrivateKeyFileName=RetrievePdsDemographic-DEV1.pem.key
       - ParticipantManagementTopic=participant-management-topic
+      - ServiceBusConnectionString_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - ServiceBusConnectionString_client_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - ClientId=Get-private-key-from-NHS-dev-portal
       - UseFakePDSServices=true
@@ -430,6 +437,7 @@ services:
       - ServiceNowClientSecret=MockClientSecret-123
       - ServiceNowRefreshToken=MockRefreshToken-123
       - ServiceNowParticipantManagementTopic=servicenow-participant-management-topic
+      - ServiceBusConnectionString_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - ServiceBusConnectionString_client_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
     ports:
       - 9092:9092

application/CohortManager/src/Functions/AuditServices/AuditWriter/AuditConfig.cs

@@ -5,7 +5,7 @@ namespace NHS.CohortManager.AuditServices;
 public class AuditConfig
 {
     [Required]
-    public required string ServiceBusConnectionString { get; set; }
+    public required string ServiceBusConnectionString_client_internal { get; set; }
     [Required]
     public required string AzureWebJobsStorage { get; set; }
     [Required]

application/CohortManager/src/Functions/AuditServices/AuditWriter/AuditWriter.cs

@@ -24,7 +24,7 @@ public AuditWriter(DataServicesContext dbContext, ILogger<AuditWriter> logger)
 
     [Function(nameof(AuditWriter))]
     public async Task Run(
-        [ServiceBusTrigger(topicName: "%AuditTopicName%", subscriptionName: "%AuditSubscription%", Connection = "ServiceBusConnectionString")] string messageText, FunctionContext context)
+        [ServiceBusTrigger(topicName: "%AuditTopicName%", subscriptionName: "%AuditSubscription%", Connection = "ServiceBusConnectionString_internal")] string messageText, FunctionContext context)
     {
         ParticipantAuditMessage? audit;
         try

application/CohortManager/src/Functions/AuditServices/AuditWriter/Program.cs

@@ -1,19 +1,15 @@
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using DataServices.Core;
-using DataServices.Database;
 using HealthChecks.Extensions;
 using Common;
 using NHS.CohortManager.AuditServices;
 
 var host = new HostBuilder()
     .ConfigureFunctionsWorkerDefaults()
     .AddConfiguration<AuditConfig>(out AuditConfig auditConfig)
-    .AddDataServicesHandler<DataServicesContext>()
-    .AddServiceBusClient(auditConfig.ServiceBusConnectionString)
+    .AddServiceBusClient(auditConfig.ServiceBusConnectionString_client_internal)
     .ConfigureServices(services =>
     {
-        services.AddDatabaseHealthCheck("AuditWriter");
+        services.AddBasicHealthCheck("AuditWriter");
     })
     .AddTelemetry()
     .Build();

application/CohortManager/src/Functions/CaasIntegration/RetrieveMeshFile/host.json

@@ -10,7 +10,8 @@
     },
     "logLevel": {
       "HealthChecks": "Error",
-      "HealthChecks.Extensions": "Error"
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
     }
   }
 }

application/CohortManager/src/Functions/CaasIntegration/receiveCaasFile/host.json

@@ -11,7 +11,8 @@
     },
     "logLevel": {
       "HealthChecks": "Error",
-      "HealthChecks.Extensions": "Error"
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
     }
   },
   "concurrency": {

application/CohortManager/src/Functions/CohortDistributionServices/DistributeParticipant/host.json

@@ -7,11 +7,12 @@
         "isEnabled": true,
         "excludedTypes": "Request"
       },
-      "enableLiveMetricsFilters": true,
-      "logLevel": {
-        "HealthChecks": "Error",
-        "HealthChecks.Extensions": "Error"
-      }
+      "enableLiveMetricsFilters": true
+    },
+    "logLevel": {
+      "HealthChecks": "Error",
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
     }
   },
   "concurrency": {

application/CohortManager/src/Functions/CohortDistributionServices/RetrieveCohortDistribution/host.json

@@ -11,7 +11,8 @@
     },
     "logLevel": {
       "HealthChecks": "Error",
-      "HealthChecks.Extensions": "Error"
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
     }
   }
 }

application/CohortManager/src/Functions/CohortDistributionServices/RetrieveCohortRequestAudit/host.json

@@ -11,7 +11,8 @@
     },
     "logLevel": {
       "HealthChecks": "Error",
-      "HealthChecks.Extensions": "Error"
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
     }
   }
 }

application/CohortManager/src/Functions/CohortDistributionServices/TransformDataService/host.json

@@ -11,7 +11,8 @@
     },
     "logLevel": {
       "HealthChecks": "Error",
-      "HealthChecks.Extensions": "Error"
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
     }
   }
 }

application/CohortManager/src/Functions/DemographicServices/DemographicDurableFunction/HealthCheckFunction.cs

@@ -1,7 +1,7 @@
 namespace NHS.CohortManager.DemographicServices;
 
-using System.Net;
 using System.Threading.Tasks;
+using HealthChecks.Extensions;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
@@ -18,15 +18,6 @@ public HealthCheckFunction(HealthCheckService healthCheckService)
     [Function("health")]
     public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get")] HttpRequestData req)
     {
-        var healthReport = await _healthCheckService.CheckHealthAsync();
-
-        var response = req.CreateResponse(healthReport.Status == HealthStatus.Healthy ? HttpStatusCode.OK : HttpStatusCode.ServiceUnavailable);
-        await response.WriteAsJsonAsync(new
-        {
-            status = healthReport.Status.ToString(),
-            details = healthReport.Entries
-        });
-
-        return response;
+        return await HealthCheckServiceExtensions.CreateHealthCheckResponseAsync(req, _healthCheckService);
     }
 }

application/CohortManager/src/Functions/DemographicServices/DemographicDurableFunction/host.json

@@ -10,7 +10,8 @@
     },
     "logLevel": {
       "HealthChecks": "Error",
-      "HealthChecks.Extensions": "Error"
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
     }
   },
   "extensions": {

application/CohortManager/src/Functions/DemographicServices/ManageCaasSubscription/host.json

@@ -0,0 +1,18 @@
+{
+  "version": "2.0",
+  "functionTimeout": "01:00:00",
+  "logging": {
+    "applicationInsights": {
+      "samplingSettings": {
+        "isEnabled": true,
+        "excludedTypes": "Request"
+      },
+      "enableLiveMetricsFilters": true
+    },
+    "logLevel": {
+      "HealthChecks": "Error",
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
+    }
+  }
+}

application/CohortManager/src/Functions/DemographicServices/ManageNemsSubscription/host.json

@@ -11,7 +11,8 @@
     },
     "logLevel": {
       "HealthChecks": "Error",
-      "HealthChecks.Extensions": "Error"
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
     }
   }
 }

application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/HealthCheckFunction.cs

@@ -1,7 +1,7 @@
 namespace NHS.CohortManager.DemographicServices;
 
-using System.Net;
 using System.Threading.Tasks;
+using HealthChecks.Extensions;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
@@ -18,15 +18,6 @@ public HealthCheckFunction(HealthCheckService healthCheckService)
     [Function("health")]
     public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get")] HttpRequestData req)
     {
-        var healthReport = await _healthCheckService.CheckHealthAsync();
-
-        var response = req.CreateResponse(healthReport.Status == HealthStatus.Healthy ? HttpStatusCode.OK : HttpStatusCode.ServiceUnavailable);
-        await response.WriteAsJsonAsync(new
-        {
-            status = healthReport.Status.ToString(),
-            details = healthReport.Entries
-        });
-
-        return response;
+        return await HealthCheckServiceExtensions.CreateHealthCheckResponseAsync(req, _healthCheckService);
     }
 }

application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/host.json

@@ -11,7 +11,8 @@
     },
     "logLevel": {
       "HealthChecks": "Error",
-      "HealthChecks.Extensions": "Error"
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
     }
   }
 }

application/CohortManager/src/Functions/ExceptionHandling/CreateException/CreateException.cs

@@ -53,7 +53,7 @@ public async Task<HttpResponseData> RunAsync([HttpTrigger(AuthorizationLevel.Ano
 
     [Function("RunCreateException")]
     public async Task Run(
-      [ServiceBusTrigger(topicName: "%CreateExceptionTopic%", subscriptionName: "%ExceptionSubscription%", Connection = "ServiceBusConnectionString", AutoCompleteMessages = false)]
+            [ServiceBusTrigger(topicName: "%CreateExceptionTopic%", subscriptionName: "%ExceptionSubscription%", Connection = "ServiceBusConnectionString_internal", AutoCompleteMessages = false)]
         ServiceBusReceivedMessage message,
        ServiceBusMessageActions messageActions)
     {

application/CohortManager/src/Functions/ExceptionHandling/CreateException/CreateExceptionConfig.cs

@@ -8,4 +8,6 @@ public class CreateExceptionConfig
     public required string ExceptionManagementDataServiceURL {get; set;}
     [Required]
     public required string DemographicDataServiceURL {get; set;}
+    [Required]
+    public required string ServiceBusConnectionString_client_internal { get; set; }
 }

application/CohortManager/src/Functions/ExceptionHandling/CreateException/HealthCheckFunction.cs

@@ -1,7 +1,7 @@
 namespace NHS.CohortManager.ExceptionService;
 
-using System.Net;
 using System.Threading.Tasks;
+using HealthChecks.Extensions;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
@@ -18,15 +18,6 @@ public HealthCheckFunction(HealthCheckService healthCheckService)
     [Function("health")]
     public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get")] HttpRequestData req)
     {
-        var healthReport = await _healthCheckService.CheckHealthAsync();
-
-        var response = req.CreateResponse(healthReport.Status == HealthStatus.Healthy ? HttpStatusCode.OK : HttpStatusCode.ServiceUnavailable);
-        await response.WriteAsJsonAsync(new
-        {
-            status = healthReport.Status.ToString(),
-            details = healthReport.Entries
-        });
-
-        return response;
+        return await HealthCheckServiceExtensions.CreateHealthCheckResponseAsync(req, _healthCheckService);
     }
 }

application/CohortManager/src/Functions/ExceptionHandling/CreateException/Program.cs

@@ -13,6 +13,7 @@
     .AddDataService<ExceptionManagement>(config.ExceptionManagementDataServiceURL)
     .AddDataService<ParticipantDemographic>(config.DemographicDataServiceURL)
     .Build()
+    .AddServiceBusClient(config.ServiceBusConnectionString_client_internal)
     .ConfigureFunctionsWebApplication()
     .ConfigureServices(services =>
     {

application/CohortManager/src/Functions/ExceptionHandling/CreateException/host.json

@@ -11,7 +11,8 @@
     },
     "logLevel": {
       "HealthChecks": "Error",
-      "HealthChecks.Extensions": "Error"
+      "HealthChecks.Extensions": "Error",
+      "Function.health": "Error"
     }
   }
 }