From 4996033aa163a49baabfa1603cee833959fddd66 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 16 Sep 2020 00:01:10 -0700 Subject: [PATCH 1/5] changes for ciprod09162020 non-aks release --- ReleaseNotes.md | 13 +++++++++++++ build/version | 4 ++-- charts/azuremonitor-containers/values.yaml | 6 +++--- kubernetes/linux/Dockerfile | 2 +- kubernetes/omsagent.yaml | 12 ++++++------ kubernetes/windows/Dockerfile | 2 +- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 0f1d932a8..bdbaebc5a 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -11,6 +11,19 @@ additional questions or comments. Note : The agent version(s) below has dates (ciprod), which indicate the agent build dates (not release dates) +### 09/16/2020 - +> Note: This agent release targetted ONLY for non-AKS clusters via Azure Monitor for containers HELM chart update +##### Version microsoft/oms:ciprod09162020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod09162020 (linux) +##### Version microsoft/oms:win-ciprod09162020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod09162020 (windows) +##### Code change log +- Collection of Azure Network Policy Manager Basic and Advanced metrics +- Add support in Windows Agent for Container log collection of CRI runtimes such as ContainerD +- Alertable metrics support Arc K8s cluster to parity with AKS +- Bug fixes related to zero filled metrics +- Support for multiple container log mount paths when docker is updated through knode +- Bug fix related to MDM telemetry + + ### 08/07/2020 - ##### Version microsoft/oms:ciprod08072020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08072020 (linux) ##### Version microsoft/oms:win-ciprod08072020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod08072020 (windows) diff --git a/build/version b/build/version index f26973116..dafd9f9ea 100644 --- a/build/version +++ b/build/version @@ -5,8 +5,8 @@ CONTAINER_BUILDVERSION_MAJOR=10 CONTAINER_BUILDVERSION_MINOR=0 CONTAINER_BUILDVERSION_PATCH=0 -CONTAINER_BUILDVERSION_BUILDNR=4 -CONTAINER_BUILDVERSION_DATE=20200805 +CONTAINER_BUILDVERSION_BUILDNR=5 +CONTAINER_BUILDVERSION_DATE=20200915 CONTAINER_BUILDVERSION_STATUS=Developer_Build #-------------------------------- End of File ----------------------------------- diff --git a/charts/azuremonitor-containers/values.yaml b/charts/azuremonitor-containers/values.yaml index 4d0d7f8f2..9c48cf9fb 100644 --- a/charts/azuremonitor-containers/values.yaml +++ b/charts/azuremonitor-containers/values.yaml @@ -12,10 +12,10 @@ Azure: omsagent: image: repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod" - tag: "ciprod08072020" - tagWindows: "win-ciprod08072020" + tag: "ciprod09162020" + tagWindows: "win-ciprod09162020" pullPolicy: IfNotPresent - dockerProviderVersion: "10.0.0-4" + dockerProviderVersion: "10.0.0-5" agentVersion: "1.10.0.1" ## To get your workspace id and key do the following ## You can create a Azure Loganalytics workspace from portal.azure.com and get its ID & PRIMARY KEY from 'Advanced Settings' tab in the Ux. diff --git a/kubernetes/linux/Dockerfile b/kubernetes/linux/Dockerfile index bc27a5384..ee35cd556 100644 --- a/kubernetes/linux/Dockerfile +++ b/kubernetes/linux/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:18.04 MAINTAINER OMSContainers@microsoft.com LABEL vendor=Microsoft\ Corp \ com.microsoft.product="Azure Monitor for containers" -ARG IMAGE_TAG=ciprod08072020 +ARG IMAGE_TAG=ciprod09162020 ENV AGENT_VERSION ${IMAGE_TAG} ENV tmpdir /opt ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index 947620ebc..b71a95227 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -337,13 +337,13 @@ spec: tier: node annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "10.0.0-4" + dockerProviderVersion: "10.0.0-5" schema-versions: "v1" spec: serviceAccountName: omsagent containers: - name: omsagent - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08072020" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod09162020" imagePullPolicy: IfNotPresent resources: limits: @@ -493,13 +493,13 @@ spec: rsName: "omsagent-rs" annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "10.0.0-4" + dockerProviderVersion: "10.0.0-5" schema-versions: "v1" spec: serviceAccountName: omsagent containers: - name: omsagent - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08072020" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod09162020" imagePullPolicy: IfNotPresent resources: limits: @@ -639,13 +639,13 @@ spec: tier: node-win annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "10.0.0-4" + dockerProviderVersion: "10.0.0-5" schema-versions: "v1" spec: serviceAccountName: omsagent containers: - name: omsagent-win - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod08072020" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod09162020" imagePullPolicy: IfNotPresent resources: limits: diff --git a/kubernetes/windows/Dockerfile b/kubernetes/windows/Dockerfile index 70a5f6045..ca89d1c80 100644 --- a/kubernetes/windows/Dockerfile +++ b/kubernetes/windows/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER OMSContainers@microsoft.com LABEL vendor=Microsoft\ Corp \ com.microsoft.product="Azure Monitor for containers" -ARG IMAGE_TAG=win-ciprod08072020 +ARG IMAGE_TAG=win-ciprod09162020 # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement From d9d96cd0ccb254e89123cabcbbde5229896cff84 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 16 Sep 2020 00:26:53 -0700 Subject: [PATCH 2/5] fix script to handle cross sub scenario --- scripts/onboarding/managed/enable-monitoring.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/onboarding/managed/enable-monitoring.sh b/scripts/onboarding/managed/enable-monitoring.sh index 17c075725..4142dbf6c 100644 --- a/scripts/onboarding/managed/enable-monitoring.sh +++ b/scripts/onboarding/managed/enable-monitoring.sh @@ -620,7 +620,7 @@ add_container_insights_solution $workspaceResourceId # get workspace guid and key get_workspace_guid_and_key $workspaceResourceId -if [ "$isClusterAndWorkspaceInSameSubscription" = true ] ; then +if [ "$isClusterAndWorkspaceInSameSubscription" = false ] ; then echo "switch to cluster subscription id as active subscription for cli: ${clusterSubscriptionId}" set_azure_subscription $clusterSubscriptionId fi From 14ba23ff3a49f3d8cb884d065c0e1f5c45a1cd38 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 16 Sep 2020 10:06:40 -0700 Subject: [PATCH 3/5] fix minor comment --- ReleaseNotes.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index bdbaebc5a..ce672804a 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -23,7 +23,6 @@ Note : The agent version(s) below has dates (ciprod), which indicate t - Support for multiple container log mount paths when docker is updated through knode - Bug fix related to MDM telemetry - ### 08/07/2020 - ##### Version microsoft/oms:ciprod08072020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08072020 (linux) ##### Version microsoft/oms:win-ciprod08072020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod08072020 (windows) @@ -39,7 +38,6 @@ Note : The agent version(s) below has dates (ciprod), which indicate t - Add region check before sending alertable metrics to MDM - Telemetry fix for agent telemetry for sov. clouds - ### 07/15/2020 - ##### Version microsoft/oms:ciprod07152020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod07152020 (linux) ##### Version microsoft/oms:win-ciprod05262020-2 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod05262020-2 (windows) From 4e217f4a953803602239865d6bb4327f76fbbc78 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 16 Sep 2020 10:47:58 -0700 Subject: [PATCH 4/5] fix date in version file --- build/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/version b/build/version index dafd9f9ea..b53b0dcfb 100644 --- a/build/version +++ b/build/version @@ -6,7 +6,7 @@ CONTAINER_BUILDVERSION_MAJOR=10 CONTAINER_BUILDVERSION_MINOR=0 CONTAINER_BUILDVERSION_PATCH=0 CONTAINER_BUILDVERSION_BUILDNR=5 -CONTAINER_BUILDVERSION_DATE=20200915 +CONTAINER_BUILDVERSION_DATE=20200916 CONTAINER_BUILDVERSION_STATUS=Developer_Build #-------------------------------- End of File ----------------------------------- From b5a2f16de7ae406aa9f86110148938f0e851ec07 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 16 Sep 2020 10:51:22 -0700 Subject: [PATCH 5/5] fix pr comments --- ReleaseNotes.md | 1 - 1 file changed, 1 deletion(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index ce672804a..547d00573 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -19,7 +19,6 @@ Note : The agent version(s) below has dates (ciprod), which indicate t - Collection of Azure Network Policy Manager Basic and Advanced metrics - Add support in Windows Agent for Container log collection of CRI runtimes such as ContainerD - Alertable metrics support Arc K8s cluster to parity with AKS -- Bug fixes related to zero filled metrics - Support for multiple container log mount paths when docker is updated through knode - Bug fix related to MDM telemetry