diff --git a/VideoApi/VideoApi/Startup.cs b/VideoApi/VideoApi/Startup.cs index d4d9e44fd..b6a3d334b 100644 --- a/VideoApi/VideoApi/Startup.cs +++ b/VideoApi/VideoApi/Startup.cs @@ -50,7 +50,7 @@ public void ConfigureServices(IServiceCollection services) .AllowCredentials(); })); - services.AddApplicationInsightsTelemetry(Configuration["ApplicationInsights:InstrumentationKey"]); + services.AddApplicationInsightsTelemetry(); services.AddApplicationInsightsTelemetryProcessor(); services.AddJsonOptions(); diff --git a/azure-pipelines.sds.pr-release.yml b/azure-pipelines.sds.pr-release.yml index 2426dbd00..dda61b698 100644 --- a/azure-pipelines.sds.pr-release.yml +++ b/azure-pipelines.sds.pr-release.yml @@ -286,8 +286,8 @@ stages: azureSubscription: ${{ variables.subscriptionName }} acceptanceTestSettings: # App Insights - - name: ApplicationInsights:InstrumentationKey - value: applicationinsights--instrumentationkey + - name: ApplicationInsights:ConnectionString + value: connectionstrings--applicationinsights keyVaultName: vh-infra-core-${{ variables.env }} secret: true diff --git a/azure-pipelines.sds.release.yml b/azure-pipelines.sds.release.yml index 0a267c525..3f34cc5c4 100644 --- a/azure-pipelines.sds.release.yml +++ b/azure-pipelines.sds.release.yml @@ -182,8 +182,8 @@ stages: azureSubscription: ${{ variables.subscriptionName }} acceptanceTestSettings: # App Insights - - name: ApplicationInsights:InstrumentationKey - value: applicationinsights--instrumentationkey + - name: ApplicationInsights:ConnectionString + value: connectionstrings--applicationinsights keyVaultName: vh-infra-core-${{ variables.env }} secret: true diff --git a/charts/vh-video-api/Chart.yaml b/charts/vh-video-api/Chart.yaml index 0c0f78dd5..3864a8aaf 100644 --- a/charts/vh-video-api/Chart.yaml +++ b/charts/vh-video-api/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: vh-video-api home: https://github.com/hmcts/vh-video-api -version: 0.0.13 +version: 0.0.14 description: Helm Chart for Video Hearing video-api maintainers: - name: VH Devops diff --git a/charts/vh-video-api/values.dev.template.yaml b/charts/vh-video-api/values.dev.template.yaml index 183658091..be1560492 100644 --- a/charts/vh-video-api/values.dev.template.yaml +++ b/charts/vh-video-api/values.dev.template.yaml @@ -2,69 +2,4 @@ java: image: '${IMAGE_NAME}' ingressHost: ${SERVICE_FQDN} - releaseNameOverride: ${RELEASE_NAME} - keyVaults: - vh-infra-core: - excludeEnvironmentSuffix: false - resourceGroup: vh-infra-core-{{ .Values.global.environment }} - usePodIdentity: true - secrets: - - azuread--tenantid - - applicationinsights--instrumentationkey - - CvpConfiguration--StorageAccountName - - CvpConfiguration--StorageAccountKey - - CvpConfiguration--StorageContainerName - - CvpConfiguration--StorageEndpoint - - name: wowzaconfiguration--managedidentityclientid - alias: CvpConfiguration--ManagedIdentityClientId - - name: wowzaconfiguration--restPassword - alias: wowzaconfiguration--Password - - wowzaconfiguration--storageaccountkey - - wowzaconfiguration--managedidentityclientid - - name: wowzaconfiguration--wowza-storage-directory - alias: wowzaconfiguration--StorageDirectory - - name: wowzaconfiguration--azure-storage-directory - alias: wowzaconfiguration--AzureStorageDirectory - - name: wowzaconfiguration--endpoint-https - alias: wowzaconfiguration--LoadBalancer - - name: wowzaconfiguration--endpoint-rtmps - alias: wowzaconfiguration--StreamingEndpoint - - name: wowzaconfiguration--storage-account - alias: wowzaconfiguration--StorageAccountName - - name: wowzaconfiguration--storage-account-endpoint - alias: wowzaconfiguration--StorageEndpoint - - name: wowzaconfiguration--storage-account-container - alias: wowzaconfiguration--StorageContainerName - - wowzaconfiguration--username - - wowzaconfiguration--ServerName - - wowzaconfiguration--HostName - - connectionstrings--videoapi - - name: wowzaconfiguration--restendpoint--0 - alias: WowzaConfiguration--RestApiEndpoints--0 - - name: wowzaconfiguration--restendpoint--0 - alias: WowzaConfiguration--RestApiEndpoints--1 - vh-video-api: - excludeEnvironmentSuffix: false - resourceGroup: vh-infra-core-{{ .Values.global.environment }} - usePodIdentity: true - secrets: - - azuread--clientsecret - - azuread--clientid - - name: azuread--identifieruri - alias: services--videoapiresourceid - - kinlyconfiguration--apisecret - - kinlyconfiguration--callbacksecret - - kinlyconfiguration--selftestapisecret - - name: kinlyconfiguration--telephoneconferencenumber - alias: kinlyconfiguration--conferencephonenumber - - name: kinlyconfiguration--telephoneconferencenumberwelsh - alias: kinlyconfiguration--conferencephonenumberwelsh - - kinlyconfiguration--kinlyapiurl - - kinlyconfiguration--kinlyselftestapiurl - - kinlyconfiguration--conferenceusername - - kinlyconfiguration--pexipnode - - kinlyconfiguration--pexipselftestnode - - kinlyconfiguration--selftestapisecret - - QuickLinks--Issuer - - QuickLinks--RsaPrivateKey - - QuickLinks--ValidAudience \ No newline at end of file + releaseNameOverride: ${RELEASE_NAME} \ No newline at end of file diff --git a/charts/vh-video-api/values.yaml b/charts/vh-video-api/values.yaml index aa4c5de91..e01be35ae 100644 --- a/charts/vh-video-api/values.yaml +++ b/charts/vh-video-api/values.yaml @@ -17,7 +17,8 @@ java: usePodIdentity: true secrets: - azuread--tenantid - - applicationinsights--instrumentationkey + - name: connectionstrings--applicationinsights + alias: applicationinsights--connectionstring - CvpConfiguration--StorageAccountName - CvpConfiguration--StorageAccountKey - CvpConfiguration--StorageContainerName