Longw/Unify AKS addon + Arc extension Helm charts into azuremonitor-containerinsights

.pipelines/azure_pipeline_mergedbranches.yaml

@@ -90,7 +90,7 @@ extends:
             cd $(Build.SourcesDirectory)/deployment/mergebranch-multiarch-agent-deployment/ServiceGroupRoot/Scripts
             tar -czvf ../artifacts.tar.gz pushAgentToAcr.sh
             cd $(Build.SourcesDirectory)/deployment/arc-k8s-extension/ServiceGroupRoot/Scripts
-            tar -czvf ../artifacts.tar.gz ../../../../charts/azuremonitor-containers/ pushChartToAcr.sh
+            tar -czvf ../artifacts.tar.gz ../../../../charts/azuremonitor-containers/ ../../../../charts/azuremonitor-containerinsights/ ../../../../charts/azuremonitor-containers-geneva/ pushChartToAcr.sh
             cd $(Build.SourcesDirectory)/deployment/arc-k8s-extension-release-v2/ServiceGroupRoot/Scripts
             tar -czvf ../artifacts.tar.gz arcExtensionRelease.sh
             windowsAMAUrl=""

.trivyignore

@@ -1,2 +1,21 @@
-# to merge trivy scan PR, temporarily ignore CVE-2026-24051 until a fix is available
-CVE-2026-24051
+# telegraf
+CVE-2026-24051
+CVE-2026-32287
+CVE-2026-34040
+CVE-2026-33997
+CVE-2026-27889
+CVE-2026-29785
+CVE-2026-33216
+CVE-2026-33217
+CVE-2026-33218
+CVE-2026-33247
+CVE-2026-33215
+CVE-2026-33219
+CVE-2026-33222
+CVE-2026-33223
+CVE-2026-33246
+CVE-2026-33248
+CVE-2026-33249
+CVE-2026-33186
+CVE-2026-25679
+CVE-2026-27142