VIH-9972 Update app insights config (#593)

* Update app insights config * Bumping chart version * Update sds pipelines * Revert --------- Co-authored-by: hmcts-ado-cnp <174565+hmcts-ado-cnp[bot]@users.noreply.github.com>
hmcts · Jul 25, 2023 · 1a3b879 · 1a3b879
1 parent e1c7104
commit 1a3b879
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 73 deletions.
diff --git 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<SuccessfulDependencyProcessor>();
 
             services.AddJsonOptions();

diff --git 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
@@ -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
@@ -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
@@ -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
+  releaseNameOverride: ${RELEASE_NAME}
diff --git 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