From 180f0300850fb26eb191c5c712d4d07cc95dd837 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Fri, 8 Oct 2021 12:18:59 -0700 Subject: [PATCH 1/4] updates for the release ciprod10082021 and win-ciprod10082021 --- ReleaseNotes.md | 31 ++++++++++++++++++++ kubernetes/linux/Dockerfile | 2 +- kubernetes/omsagent.yaml | 4 +-- kubernetes/windows/Dockerfile | 2 +- source/plugins/ruby/in_containerinventory.rb | 12 ++++---- 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index dc42e7d51..0fd0f7948 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -11,6 +11,37 @@ additional questions or comments. Note : The agent version(s) below has dates (ciprod), which indicate the agent build dates (not release dates) +### 10/08/2021 - +##### Version microsoft/oms:ciprod10082021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10082021 (linux) +##### Version microsoft/oms:win-ciprod10082021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10082021 (windows) +##### Code change log +- Linux Agent + - MDSD Proxy support for non-AKS + - log rotation for mdsd log files {err,warn, info & qos} + - Onboarding status + - AAD Auth MSI changes (not usable externally yet) + - Upgrade k8s and adx go packages to fix vulnerabilities + - Fix missing telegraf metrics (TelegrafMetricsSentCount & TelegrafMetricsSendErrorCount) in mdsd route + - Improve fluentd liveness probe checks to handle both supervisor and worker process + - Fix telegraf startup issue when endpoint is unreachable +- Windows Agent + - Windows liveness probe optimization +- Common + - Add new metrics to MDM for allocatable % calculation of cpu and memory usage +- Other changes + - Helm chart updates for removal of rbac api version and deprecation of.Capabilities.KubeVersion.GitVersion to .Capabilities.KubeVersion.Version + - Updates to build and release ev2 + - Scripts to collect troubleshooting logs + - Unit test tooling + - Yaml updates in parity with aks rp yaml + - upgrade golang version for windows in pipelines + - Conformance test updates + +### 09/02/2021 - +##### Version microsoft/oms:ciprod08052021-1 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08052021-1 (linux) +##### Code change log +- Bumping image tag for some tooling (no code changes except the IMAGE_TAG environment variable) + ### 08/05/2021 - ##### Version microsoft/oms:ciprod08052021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08052021 (linux) ##### Code change log diff --git a/kubernetes/linux/Dockerfile b/kubernetes/linux/Dockerfile index 07af7f4a7..fd408b9b2 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=ciprod08052021 +ARG IMAGE_TAG=ciprod10082021 ENV AGENT_VERSION ${IMAGE_TAG} ENV tmpdir /opt ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index 98621b5f0..e02483fef 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -368,7 +368,7 @@ spec: value: "3" containers: - name: omsagent - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08052021" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10082021" imagePullPolicy: IfNotPresent resources: limits: @@ -597,7 +597,7 @@ spec: serviceAccountName: omsagent containers: - name: omsagent - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08052021" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10082021" imagePullPolicy: IfNotPresent resources: limits: diff --git a/kubernetes/windows/Dockerfile b/kubernetes/windows/Dockerfile index aa756b8b8..76667f389 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-ciprod06112021-2 +ARG IMAGE_TAG=win-ciprod10082021 # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement diff --git a/source/plugins/ruby/in_containerinventory.rb b/source/plugins/ruby/in_containerinventory.rb index f52ed4026..c8ffe7d05 100644 --- a/source/plugins/ruby/in_containerinventory.rb +++ b/source/plugins/ruby/in_containerinventory.rb @@ -19,6 +19,7 @@ def initialize require_relative "CAdvisorMetricsAPIClient" require_relative "kubernetes_container_inventory" require_relative "extension_utils" + @addonTokenAdapterImageTag = "" end config_param :run_interval, :time, :default => 60 @@ -57,7 +58,6 @@ def enumerate containerInventory = Array.new eventStream = Fluent::MultiEventStream.new hostName = "" - addonTokenAdapterImageTag = "" $log.info("in_container_inventory::enumerate : Begin processing @ #{Time.now.utc.iso8601}") if ExtensionUtils.isAADMSIAuthMode() $log.info("in_container_inventory::enumerate: AAD AUTH MSI MODE") @@ -83,12 +83,12 @@ def enumerate if hostName.empty? && !containerRecord["Computer"].empty? hostName = containerRecord["Computer"] end - if addonTokenAdapterImageTag.empty? && ExtensionUtils.isAADMSIAuthMode() + if @addonTokenAdapterImageTag.empty? && ExtensionUtils.isAADMSIAuthMode() if !containerRecord["ElementName"].nil? && !containerRecord["ElementName"].empty? && - containerRecord["ElementName"].include?("kube-system") && + containerRecord["ElementName"].include?("_kube-system_") && containerRecord["ElementName"].include?("addon-token-adapter_omsagent") if !containerRecord["ImageTag"].nil? && !containerRecord["ImageTag"].empty? - addonTokenAdapterImageTag = containerRecord["ImageTag"] + @addonTokenAdapterImageTag = containerRecord["ImageTag"] end end end @@ -127,8 +127,8 @@ def enumerate telemetryProperties = {} telemetryProperties["Computer"] = hostName telemetryProperties["ContainerCount"] = containerInventory.length - if !addonTokenAdapterImageTag.empty? - telemetryProperties["addonTokenAdapterImageTag"] = addonTokenAdapterImageTag + if !@addonTokenAdapterImageTag.empty? + telemetryProperties["addonTokenAdapterImageTag"] = @addonTokenAdapterImageTag end ApplicationInsightsUtility.sendTelemetry(@@PluginName, telemetryProperties) end From 414b98ab106687fc0b7f21c469932c3f7d5b1c21 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Fri, 8 Oct 2021 12:21:21 -0700 Subject: [PATCH 2/4] updates for the release ciprod10082021 and win-ciprod10082021 --- kubernetes/omsagent.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index e02483fef..24a66d7d2 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -378,6 +378,12 @@ spec: cpu: 75m memory: 225Mi env: + - name: FBIT_SERVICE_FLUSH_INTERVAL + value: "15" + - name: FBIT_TAIL_BUFFER_CHUNK_SIZE + value: "1" + - name: FBIT_TAIL_BUFFER_MAX_SIZE + value: "1" # azure devops pipeline uses AKS_RESOURCE_ID and AKS_REGION hence ensure to uncomment these - name: AKS_RESOURCE_ID value: "VALUE_AKS_RESOURCE_ID_VALUE" From 03bdd54fc8972f2a036325480a41db58dba72446 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Fri, 8 Oct 2021 12:22:44 -0700 Subject: [PATCH 3/4] updates for the release ciprod10082021 and win-ciprod10082021 --- kubernetes/omsagent.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index 24a66d7d2..2ef26596b 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -776,7 +776,7 @@ spec: value: "3" containers: - name: omsagent-win - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod06112021-2" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10082021" imagePullPolicy: IfNotPresent resources: limits: From e6ed3659986533c1c3d0979b564e347c47f22234 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Fri, 8 Oct 2021 12:27:02 -0700 Subject: [PATCH 4/4] updates for the release ciprod10082021 and win-ciprod10082021 --- kubernetes/omsagent.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index 2ef26596b..97e32c0e1 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -373,10 +373,10 @@ spec: resources: limits: cpu: 500m - memory: 600Mi + memory: 750Mi requests: cpu: 75m - memory: 225Mi + memory: 325Mi env: - name: FBIT_SERVICE_FLUSH_INTERVAL value: "15"