enable networkflowlogs through helm chart (#1649)

Author: zanejohnson-azure

.pipelines/azure_pipeline_mergedbranches.yaml

@@ -1055,6 +1055,8 @@ extends:
           imageRepository: $(ImageRepositoryOverride)
           environment: 'CI-Agent-NetworkFlowLogs'
           azureSubscription: 'ContainerInsights_Build_Subscription_CI'
+          # TODO: Use OmsAgent.retinaFlowLogsEnabled=true once we use the merged chart
+          additionalOverrides: 'OmsAgent.isRetinaFlowLogsEnabled=true'
 
       # Cluster 6: ci-logs-prod-aks-networkflowlogs — Run E2E Tests
       - template: /.pipelines/e2e-test-templates/test-ci-image-in-aks-cluster.yml@self

.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml

@@ -51,6 +51,10 @@ parameters:
 - name: releaseName
   type: string
   default: 'azuremonitor-containers'
+- name: additionalOverrides
+  type: string
+  default: ''
+  displayName: 'Additional Helm override values (comma-separated key=value pairs)'
 - name: dependsOn
   type: object
   default: []
@@ -101,7 +105,10 @@ jobs:
             # TODO: When it is merged to ci_prod, the following chartPath will be updated accordingly.
             chartPath: '$(Build.SourcesDirectory)/charts/azuremonitor-containerinsights-for-prod-clusters'
             releaseName: '${{ parameters.releaseName }}'
-            overrideValues: 'global.commonGlobals.CloudEnvironment=${{ parameters.cloudEnvironment }},global.commonGlobals.Region=${{ parameters.region }},OmsAgent.aksResourceID=$(AKS_RESOURCE_ID),OmsAgent.workspaceID=${{ parameters.workspaceId }},OmsAgent.imageRepository=${{ parameters.imageRepository }},OmsAgent.imageTagLinux=${{ parameters.amalogsLinuxImage }},OmsAgent.imageTagWindows=${{ parameters.amalogsWindowsImage }}'
+            ${{ if ne(parameters.additionalOverrides, '') }}:
+              overrideValues: 'global.commonGlobals.CloudEnvironment=${{ parameters.cloudEnvironment }},global.commonGlobals.Region=${{ parameters.region }},OmsAgent.aksResourceID=$(AKS_RESOURCE_ID),OmsAgent.workspaceID=${{ parameters.workspaceId }},OmsAgent.imageRepository=${{ parameters.imageRepository }},OmsAgent.imageTagLinux=${{ parameters.amalogsLinuxImage }},OmsAgent.imageTagWindows=${{ parameters.amalogsWindowsImage }},${{ parameters.additionalOverrides }}'
+            ${{ else }}:
+              overrideValues: 'global.commonGlobals.CloudEnvironment=${{ parameters.cloudEnvironment }},global.commonGlobals.Region=${{ parameters.region }},OmsAgent.aksResourceID=$(AKS_RESOURCE_ID),OmsAgent.workspaceID=${{ parameters.workspaceId }},OmsAgent.imageRepository=${{ parameters.imageRepository }},OmsAgent.imageTagLinux=${{ parameters.amalogsLinuxImage }},OmsAgent.imageTagWindows=${{ parameters.amalogsWindowsImage }}'
             waitForExecution: false
             arguments: '--timeout 10m --install'
         - task: AzureCLI@2