Gangams/agent release ciprod10082021 & win-ciprod10082021

ReleaseNotes.md

@@ -11,6 +11,37 @@ additional questions or comments.
 
 Note : The agent version(s) below has dates (ciprod<mmddyyyy>), 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

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

kubernetes/omsagent.yaml

@@ -368,16 +368,22 @@ 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:
               cpu: 500m
-              memory: 600Mi
+              memory: 750Mi
             requests:
               cpu: 75m
-              memory: 225Mi
+              memory: 325Mi
           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"
@@ -597,7 +603,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:
@@ -770,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:

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

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