diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 5b39432cf..8ba8d66bd 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,18 +1,27 @@ # Azure Monitor Metrics for AKS clusters -## Pending +## Release 07-19-2024 +* Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:` +* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:-win` +* TA image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:-targetallocator` +* cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:-cfg` +* Change log - * fix: Truncate DCE/DCR to 44/64 chars in ARM, Bicep, Terraform... - https://github.com/Azure/prometheus-collector/pull/922 * fix: add single quotes to pod annotations for multiple namespace scenario - https://github.com/Azure/prometheus-collector/pull/927 * feat: Upgrade components to 0.99 and use golang for config processing - https://github.com/Azure/prometheus-collector/pull/891 +* fix: move to single quote for telegraf - https://github.com/Azure/prometheus-collector/pull/946 +* compliance: add codeql to build pipeline - https://github.com/Azure/prometheus-collector/pull/939 +* Updating deployment specs for ama-metrics-operator-targets as this pod was not getting cleaned up by GC on low memory evictions due to memory pressure - https://github.com/Azure/prometheus-collector/pull/931 +* Test: unit tests and some small fixes for configmap processing - https://github.com/Azure/prometheus-collector/pull/930 ## Release 06-12-2024 * Target Allocator Chart update to add Tls secret to the config reader sidecar container ## Release 06-10-2024 (CCP release only) -* Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:` -* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:-win` -* TA image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:-targetallocator` -* cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:-cfg` +* Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.14-main-06-10-2024-b20600b3` +* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.14-main-06-10-2024-b20600b3-win` +* TA image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.14-main-06-10-2024-b20600b3-targetallocator` +* cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.14-main-06-10-2024-b20600b3-cfg` * Change log - * fix: honor minimal ingestion profile setting for ccp - https://github.com/Azure/prometheus-collector/pull/911 diff --git a/otelcollector/VERSION b/otelcollector/VERSION index b6d1dc565..97f578152 100644 --- a/otelcollector/VERSION +++ b/otelcollector/VERSION @@ -1 +1 @@ -6.8.14 +6.9.0 diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/local_testing_aks.ps1 b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/local_testing_aks.ps1 new file mode 100644 index 000000000..d8ea0afc4 --- /dev/null +++ b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/local_testing_aks.ps1 @@ -0,0 +1,44 @@ +# This script is only for AKS cluster testing. It reads the template files (Chart-template.yaml and values-template.yaml), +# replaces placeholders with actual values, removes specific sections, +# and then writes the modified content back to new files (Chart.yaml and values.yaml). +# The placeholders replaced include HELM_CHART_NAME, IMAGE_TAG, MCR_REPOSITORY, ARC_EXTENSION, +# AKS_REGION, and AKS_RESOURCE_ID. It also removes the dependencies section from the +# Chart-template.yaml file. + +# Define variables +$ImageTag = "6.8.14-kaveesh-q-07-19-2024-e7626ca2" +$AKSRegion = "westeurope" +$AKSResourceId = "/subscriptions/ce4d1293-71c0-4c72-bc55-133553ee9e50/resourceGroups/kaveeshtest/providers/Microsoft.ContainerService/managedClusters/kaveeshtest" + +# Read files +$chartTemplatePath = ".\Chart-template.yaml" +$valuesTemplatePath = ".\values-template.yaml" + +$chartTemplateContent = Get-Content -Path $chartTemplatePath -Raw +$valuesTemplateContent = Get-Content -Path $valuesTemplatePath -Raw + +# Create copies of the files +$chartOutputPath = ".\Chart.yaml" +$valuesOutputPath = ".\values.yaml" +$chartTemplateContent | Out-File -FilePath $chartOutputPath +$valuesTemplateContent | Out-File -FilePath $valuesOutputPath + +# Replace placeholders in Chart-template.yaml +$chartTemplateContent = $chartTemplateContent -replace '\$\{HELM_CHART_NAME\}', 'ama-metrics' +$chartTemplateContent = $chartTemplateContent -replace '\$\{IMAGE_TAG\}', $ImageTag +# Remove the dependencies section +$chartTemplateContent = $chartTemplateContent -replace '(?s)dependencies:\s*-\s*name:\s*prometheus-node-exporter\s*version:\s*"4\.26\.0"\s*repository:\s*oci://\$\{MCR_REGISTRY\}\$\{MCR_REPOSITORY_HELM_DEPENDENCIES\}\s*condition:\s*AzureMonitorMetrics\.ArcExtension\s*', '' + + +# Replace placeholders in values-template.yaml +$valuesTemplateContent = $valuesTemplateContent -replace '\$\{IMAGE_TAG\}', $ImageTag +$valuesTemplateContent = $valuesTemplateContent -replace '\$\{MCR_REPOSITORY\}', '/azuremonitor/containerinsights/cidev/prometheus-collector/images' +$valuesTemplateContent = $valuesTemplateContent -replace '\$\{ARC_EXTENSION\}', 'false' +$valuesTemplateContent = $valuesTemplateContent -replace '\$\{AKS_REGION\}', $AKSRegion +$valuesTemplateContent = $valuesTemplateContent -replace '\$\{AKS_RESOURCE_ID\}', $AKSResourceId + +# Write the modified content back to the files +$chartTemplateContent | Out-File -FilePath $chartOutputPath +$valuesTemplateContent | Out-File -FilePath $valuesOutputPath + +Write-Host "Files have been processed and saved as Chart.yaml and values.yaml"