Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
254 changes: 254 additions & 0 deletions .pipelines/azure-pipeline-aks-extension-managed-ev2-sdp-canary.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,254 @@
#################################################################################
# OneBranch Pipelines #
# Documentation: https://aka.ms/obpipelines #
# Yaml Schema: https://aka.ms/obpipelines/yaml/schema #
# Reference doc: https://msazure.visualstudio.com/One/_wiki/wikis/One.wiki/ #
# 671961/Automating-release-of-new-versions-using-ev2 #
# #
# Purpose: Roll out new versions of the extension type #
# microsoft.azuremonitor.containers.metrics #
# to AKS (Managed) clusters via the central Ev2 extension rollout artifacts, #
# using packageConfig: Microsoft.AzureMonitor.Containers.Metrics-PromAks052926. #
# #
# This replaces the custom Ev2 ServiceGroup approach previously used in #
# .pipelines/deployment/aks-extension-release/ (now removed in favor of the #
# central artifacts model documented in wiki page 671961). #
#################################################################################

trigger: none

parameters:
- name: 'overrideExtensionVersion'
displayName: 'Override Extension Version (leave as "auto" to use upstream build runName)'
type: string
default: 'auto'

- name: 'releaseTrain'
displayName: 'Release Train'
type: string
default: 'preview'
values:
- preview
- stable

- name: 'rolloutType'
displayName: 'SDP rollout type'
type: string
default: 'normal'
values:
- normal
- emergency
- globaloutage

- name: 'overrideManagedValidationDuration'
displayName: 'Override standard SDP duration?'
type: boolean
default: false

- name: 'managedValidationDurationInHours'
displayName: 'Override standard SDP duration (in hours)'
type: number
default: 0

- name: 'icmIncidentId'
displayName: 'IcM Incident Id (required when rollout type is globaloutage)'
type: number
default: 0

resources:
repositories:
- repository: templates
type: git
name: OneBranch.Pipelines/GovernedTemplates
ref: refs/heads/main
pipelines:
# Upstream build pipeline that publishes the helm chart to MCR.
# runName is used as the extension/chart version unless overridden.
- pipeline: '_ContainerInsights-MultiArch-MergedBranches'
project: 'microsoft'
source: 'CDPX\docker-provider\ContainerInsights-MultiArch-MergedBranches'

variables:
# ---- Identifiers ---------------------------------------------------------
# Prometheus-collector service tree id (same value used in existing
# .pipelines/deployment/**/ServiceGroupRoot/ServiceModel.json).
- name: serviceIdentifier
value: '3170cdd2-19f0-4027-912b-1027311691a2'

# Ev2 ServiceGroup registered with the extension platform team for AKS
# Managed central rollout of microsoft.azuremonitor.containers.metrics.
# TODO: confirm exact name with ClusterConfig/Extensions partner team

Check notice

Code scanning / devskim

A "TODO" or similar was left in source code, possibly indicating incomplete functionality Note

Suspicious comment
Comment thread
suyadav1 marked this conversation as resolved.
Dismissed
# (modelled on the argo example: Microsoft.Azure.ClusterConfig.ExtensionRollout.ArgoCd).
- name: serviceGroup
value: 'microsoft.azuremonitor.containers'

# ---- Version selection ---------------------------------------------------
# When `overrideExtensionVersion` is left at its default value of 'auto',
# the pipeline uses the runName of the latest upstream build pipeline run
# (resolved at runtime by the resources.pipelines reference). Any other
# value is taken as an explicit version override.
- ${{ if ne(parameters.overrideExtensionVersion, 'auto') }}:
- name: extensionVersionValue
value: '${{ parameters.overrideExtensionVersion }}'
- ${{ if eq(parameters.overrideExtensionVersion, 'auto') }}:
- name: extensionVersionValue
value: '$(resources.pipeline._ContainerInsights-MultiArch-MergedBranches.runName)'

# ---- ConfigurationOverrides (per cloud) ---------------------------------
# extensionTypeName / packageConfig / helmChartUrl values were sourced from
# the legacy .pipelines/deployment/aks-extension-release/Configuration.*.json
# files (now removed). MSI ARM IDs below must be the cloud-specific identity
# registered in the extension type registration document (msiClientIds field).
# See: https://msazure.visualstudio.com/One/_wiki/wikis/One.wiki/202225/Extension-Type-Registration

- name: ProdConfigurationOverrides
value: |
{
"ConfigurationSpecification": {
"settings": {
"extensionTypeName": "microsoft.azuremonitor.containers",
"packageConfig": "microsoft.azuremonitor.containers-pkgciaks062626",
"helmChartUrl": "mcr.microsoft.com/azuremonitor/containerinsights/prod1/stable/azuremonitor-containers",
"userAssignedIdentity": "/subscriptions/30c56c3a-54da-46ea-b004-06eb33432687/resourceGroups/containerinsightsprod/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ev2-agent-release",
"version": "$(extensionVersionValue)",
"releaseTrain": "${{ parameters.releaseTrain }}",
"kustoGatingWaitDuration": "PT1H"
}
}
}
# Will be uncommenting the below once we have tested out all clouds
# - name: FairfaxConfigurationOverrides
# value: |
# {
# "ConfigurationSpecification": {
# "settings": {
# "extensionTypeName": "microsoft.azuremonitor.containers.metrics",
# "packageConfig": "Microsoft.AzureMonitor.Containers.Metrics-PromAks052926",
# "helmChartUrl": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod/ama-metrics",
# "userAssignedIdentity": "REPLACE_WITH_FAIRFAX_MSI_ARM_ID",
# "version": "$(extensionVersionValue)",
# "releaseTrain": "${{ parameters.releaseTrain }}"
# }
# }
# }

# - name: MooncakeConfigurationOverrides
# value: |
# {
# "ConfigurationSpecification": {
# "settings": {
# "extensionTypeName": "microsoft.azuremonitor.containers.metrics",
# "packageConfig": "Microsoft.AzureMonitor.Containers.Metrics-PromAks052926",
# "helmChartUrl": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod/ama-metrics",
# "userAssignedIdentity": "REPLACE_WITH_MOONCAKE_MSI_ARM_ID",
# "version": "$(extensionVersionValue)",
# "releaseTrain": "${{ parameters.releaseTrain }}"
# }
# }
# }

- name: LinuxContainerImage
value: 'mcr.microsoft.com/oss/go/microsoft/golang:1.24.2-fips-azurelinux3.0'
- name: RevisionCounter
value: $[counter('0', 1)]
- name: CustomBuildVersion
value: "Build - $(extensionVersionValue) Release - $(RevisionCounter) ReleaseTrain - ${{ parameters.releaseTrain }}"

# Disable showing the last commit message.
appendCommitMessageToRunName: false

extends:
template: v2/OneBranch.Official.CrossPlat.yml@templates
parameters:
ev2ManagedSdpRolloutConfig:
rolloutType: ${{ parameters.rolloutType }}
overrideManagedValidationDuration: ${{ parameters.overrideManagedValidationDuration }}
managedValidationOverrideDurationInHours: ${{ parameters.managedValidationDurationInHours }}
icmIncidentId: ${{ parameters.icmIncidentId }}

stages:
- stage: PROD_Managed_SDP
displayName: "PROD: Managed SDP"
variables:
ob_release_environment: Production
jobs:
- job: PROD_Managed_SDP
displayName: "PROD: Managed SDP"
pool:
type: release
steps:
- task: onebranch.pipeline.version@1
condition: ne(variables['CustomBuildVersion'], '')
displayName: "Setup BuildNumber"
inputs:
system: 'Custom'
customVersion: '$(CustomBuildVersion)'
- task: vsrm-ev2.ev2-rollout.ev2-rollout-task.Ev2RARollout@2
displayName: "Ev2 Managed SDP Rollout (Prod)"
inputs:
EndpointProviderType: ApprovalService
ApprovalServiceEnvironment: Production
TaskAction: CentralArtifactsRollout
CentralArtifactsServiceIdentifier: 2bbbdccc-fa4c-4f81-b9fd-12cd0234701c
CentralArtifactsPolicyName: CentralArtifactsPolicy
ServiceIdentifier: $(serviceIdentifier)
ServiceGroup: $(serviceGroup)
ConfigurationOverrides: $(ProdConfigurationOverrides)
# Uncomment below to only rollout the extension version in euap regions for testing
Select: regions(centraluseuap,eastus2euap)
# Select: regions(*)

# - stage: FF_Managed_SDP
# displayName: "FF: Managed SDP"
# dependsOn: PROD_Managed_SDP
# variables:
# ob_release_environment: Fairfax
# templateContext:
# cloud: Public
# isProduction: true
# approval:
# workflow: approvalService
# jobs:
# - job: FF_Managed_SDP
# displayName: "FF: Managed SDP"
# pool:
# type: release
# steps:
# - task: vsrm-ev2.ev2-rollout.ev2-rollout-task.Ev2RARollout@2
# displayName: "Ev2 Managed SDP Rollout (Fairfax)"
# inputs:
# EndpointProviderType: ApprovalService
# ApprovalServiceEnvironment: Fairfax
# TaskAction: CentralArtifactsRollout
# CentralArtifactsServiceIdentifier: 2bbbdccc-fa4c-4f81-b9fd-12cd0234701c
# CentralArtifactsPolicyName: CentralArtifactsPolicy
# ServiceIdentifier: $(serviceIdentifier)
# ServiceGroup: $(serviceGroup)
# ConfigurationOverrides: $(FairfaxConfigurationOverrides)
# Select: regions(*)
# # ArtifactsVersionOverride: $(extensionVersionValue)

# - stage: MC_Managed_SDP
# displayName: "MC: Managed SDP"
# dependsOn: PROD_Managed_SDP
# variables:
# ob_release_environment: Mooncake
# jobs:
# - job: MC_Managed_SDP
# displayName: "MC: Managed SDP"
# pool:
# type: release
# steps:
# - task: vsrm-ev2.ev2-rollout.ev2-rollout-task.Ev2RARollout@2
# displayName: "Ev2 Managed SDP Rollout (Mooncake)"
# inputs:
# EndpointProviderType: ApprovalService
# ApprovalServiceEnvironment: Mooncake
# TaskAction: CentralArtifactsRollout
# CentralArtifactsServiceIdentifier: 2bbbdccc-fa4c-4f81-b9fd-12cd0234701c
# CentralArtifactsPolicyName: CentralArtifactsPolicy
# ServiceIdentifier: $(serviceIdentifier)
# ServiceGroup: $(serviceGroup)
# ConfigurationOverrides: $(MooncakeConfigurationOverrides)
# Select: regions(*)
# # ArtifactsVersionOverride: $(extensionVersionValue)
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ variables:
"settings": {
"extensionTypeName": "microsoft.azuremonitor.containers",
"packageConfig": "microsoft.azuremonitor.containers-pkg092025",
"helmChartUrl": "mcr.microsoft.com/azuremonitor/helmchart/containerinsights/ciprod/azuremonitor-containers",
"helmChartUrl": "mcr.microsoft.com/azuremonitor/containerinsights/prod1/stable/azuremonitor-containers",
"userAssignedIdentity": "/subscriptions/30c56c3a-54da-46ea-b004-06eb33432687/resourceGroups/containerinsightsprod/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ev2-agent-release",
"version": "$(extensionVersionValue)",
"releaseTrain": "${{ parameters.releaseTrain }}"
Expand Down
55 changes: 55 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,61 @@ information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeo
additional questions or comments.

## Release History
### 07/21/2026 -
##### Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.5.0 (linux)
##### Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.5.0 (windows)
- Linux
- [azurelinux 3.0.20260706](https://github.com/microsoft/azurelinux/releases/tag/3.0.20260706-3.0)
- Golang - 1.26.5
- Ruby - arm64 - 3.3.5-7, x86_64 - 3.3.10
- MDSD - 1.40.3
- Telegraf - 1.39.1
- Fluent-bit - 5.0.4
- Fluentd - 1.19.3
- Windows
- Golang - 1.26.5
- Ruby - 3.1.1
- Windows AMA - 47.7.1
- Telegraf - 1.24.2
- Fluent-bit - 5.0.3
- Fluentd - 1.16.3
##### Code change log
## What's Changed
- Common (Linux + Windows)
* 3.5.0 CVE fixes by @suyadav1 in https://github.com/microsoft/Docker-Provider/pull/1728
* fix(ci): install openssl-devel on arm64 for fluentd openssl gem build by @suyadav1 in https://github.com/microsoft/Docker-Provider/pull/1740
* fix(agent): prevent panic in parseImageDetails for digest-pinned images by @suyadav1 in https://github.com/microsoft/Docker-Provider/pull/1723
* Emit multiline telemetry from DaemonSet heartbeat by @suyadav1 in https://github.com/microsoft/Docker-Provider/pull/1672
* chore(deps): Upgrade Go to 1.26.3 and update dependencies by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1697
* Revert "chore(deps): Upgrade Go to 1.26.3 and update dependencies (#1697)" by @zanejohnson-azure in https://github.com/microsoft/Docker-Provider/pull/1702
* chore(deps): Upgrade Go to 1.26.4 and update dependencies by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1707
* chore(deps): Upgrade Go to 1.26.4 and update dependencies by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1710
* chore(deps): Upgrade Go to 1.26.4 and update dependencies by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1712
* chore(deps): Upgrade Go to 1.26.4 and update dependencies by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1722
* chore(deps): Upgrade Go to 1.26.4 and update dependencies by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1724
* chore(deps): Upgrade Go to 1.26.4 and update dependencies by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1731
* chore(deps): Upgrade Go to 1.26.4 and update dependencies by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1732
* chore(deps): Upgrade Go to 1.26.5 and update dependencies by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1733
* Upgrade telegraf-agent to 1.39.0 by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1713
* Upgrade telegraf-agent to 1.39.1 by @azure-monitor-assistant in https://github.com/microsoft/Docker-Provider/pull/1725

- Infra
* Toggle File Name Fixes by @NicAtMS in https://github.com/microsoft/Docker-Provider/pull/1691
* Sync CI toggles by @suyadav1 in https://github.com/microsoft/Docker-Provider/pull/1708
* Cleanup toggles for CI by @suyadav1 in https://github.com/microsoft/Docker-Provider/pull/1743
* clean up trivyignore by @zanejohnson-azure in https://github.com/microsoft/Docker-Provider/pull/1695
* Arc release pipelines SDP migration by @wanlonghenry in https://github.com/microsoft/Docker-Provider/pull/1689
* fix(ci): stamp unique Ev2 buildver.txt per build to prevent chart freeze by @zanejohnson-azure in https://github.com/microsoft/Docker-Provider/pull/1704
* add canary in arc prod release pipeline by @zanejohnson-azure in https://github.com/microsoft/Docker-Provider/pull/1715
* Fix for extension dropped config issue & revert canary release PR by @suyadav1 in https://github.com/microsoft/Docker-Provider/pull/1718
* feat(ci): re-add Arc canary stages to prod release pipeline by @zanejohnson-azure in https://github.com/microsoft/Docker-Provider/pull/1720
* Release 3.4.1 chart by @suyadav1 in https://github.com/microsoft/Docker-Provider/pull/1719
* revert 3.4.1 chart changes by @suyadav1 in https://github.com/microsoft/Docker-Provider/pull/1734
* fix(ci): gate Stage_3 deploy on MCR image availability instead of Stage_2 completion by @zanejohnson-azure in https://github.com/microsoft/Docker-Provider/pull/1727
* fix(ci): switch e2e helm deploy to merged azuremonitor-containerinsights chart by @zanejohnson-azure in https://github.com/microsoft/Docker-Provider/pull/1726
* fix(ci): set Azure.Cluster.ResourceId in e2e helm deploy so AKS workloads render by @zanejohnson-azure in https://github.com/microsoft/Docker-Provider/pull/1738
* managed ev2 pipeline for logs by @rashmichandrashekar in https://github.com/microsoft/Docker-Provider/pull/1745

### 05/28/2026 -
##### Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.4.0 (linux)
##### Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.4.0 (windows)
Expand Down
2 changes: 1 addition & 1 deletion charts/azuremonitor-containerinsights/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: azuremonitor-containers
description: Azure Monitor container monitoring agent Helm chart for Kubernetes (supports both AKS addon and Arc K8s extension)
version: 3.4.1
version: 3.5.0
appVersion: 7.0.0-1
kubeVersion: "^1.10.0-0"
keywords:
Expand Down
8 changes: 4 additions & 4 deletions charts/azuremonitor-containerinsights/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ OmsAgent:

# Image configuration
imageRepository: "/azuremonitor/containerinsights/ciprod"
imageTagLinux: "3.4.0"
imageTagWindows: "win-3.4.0"
imageTagLinux: "3.5.0"
imageTagWindows: "win-3.5.0"
isImagePullPolicyAlways: false

# Resource ID and cluster information
Expand Down Expand Up @@ -214,8 +214,8 @@ OmsAgent:
amalogs:
image:
repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod"
tag: "3.4.0"
tagWindows: "win-3.4.0"
tag: "3.5.0"
tagWindows: "win-3.5.0"
pullPolicy: IfNotPresent
dockerProviderVersion: "18.0.1-0"
agentVersion: "azure-mdsd-1.40.3"
Expand Down
2 changes: 1 addition & 1 deletion charts/azuremonitor-containers-geneva/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ genevaLogsConfig:

image:
repository: mcr.microsoft.com/azuremonitor/containerinsights/ciprod
tag: "3.4.0"
tag: "3.5.0"
pullPolicy: IfNotPresent
agentVersion: "azure-mdsd-1.40.3"
nameOverride: ""
Expand Down
2 changes: 1 addition & 1 deletion charts/azuremonitor-containers/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 7.0.0-1
description: Helm chart for deploying Azure Monitor container monitoring agent in Kubernetes
name: azuremonitor-containers
version: 3.4.0
version: 3.5.0
kubeVersion: "^1.10.0-0"
keywords:
- monitoring
Expand Down
4 changes: 2 additions & 2 deletions charts/azuremonitor-containers/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ Azure:
amalogs:
image:
repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod"
tag: "3.4.0"
tagWindows: "win-3.4.0"
tag: "3.5.0"
tagWindows: "win-3.5.0"
pullPolicy: IfNotPresent
dockerProviderVersion: "18.0.1-0"
agentVersion: "azure-mdsd-1.40.3"
Expand Down
Loading
Loading