update version & release notes for ccp hotfix

Azure · Dec 4, 2024 · a367589 · a367589
1 parent 98d2839
commit a367589
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.pipelines/azure-pipeline-build.yml b/.pipelines/azure-pipeline-build.yml
@@ -2,8 +2,6 @@ trigger:
   branches:
     include:
     - main
-    - vishwa/ccp-fix
-
 pr:
   autoCancel: true
   branches:

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,5 +1,11 @@
 # Azure Monitor Metrics for AKS clusters
 
+## Release 12-04-2024 (hot-fix for ccp config map issue ) - CCP release only - 
+* CCP image - 
+
+* Changelog -
+  - Fix for CCP Config map processing issue - (https://github.com/Azure/prometheus-collector/pull/1017)
+
 ## Release 10-21-2024
 * Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.11.0-main-10-21-2024-91ec49e3`
 * Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.11.0-main-10-21-2024-91ec49e3-win`

diff --git a/otelcollector/VERSION b/otelcollector/VERSION
@@ -1 +1 @@
-6.11.0
+6.12.0