Cherry - Pick Hotfix update (ci_prod) into ci_dev

.trivyignore

@@ -1,9 +1,25 @@
 # telegraf vulnerabilities
 CVE-2019-3826
-CVE-2022-29190
-CVE-2022-29222
-CVE-2022-29189
 CVE-2022-1996
 
-#dpkg vulnerability in ubuntu
+# still present in mdsd telegraf
+CVE-2021-42836
+
+# ruby in /usr/lib
+CVE-2020-36327
+CVE-2021-43809
+CVE-2021-41816
+CVE-2021-41819
+CVE-2021-31799
+CVE-2021-28965
+
+# dpkg vulnerability in ubuntu
 CVE-2022-1304
+
+# Adding for Hotfix : This needs to be fixed
+CVE-2022-27191
+CVE-2022-29190
+CVE-2022-29222
+CVE-2022-31030  
+CVE-2022-29189 
+CVE-2022-29526

ReleaseNotes.md

@@ -11,6 +11,10 @@ additional questions or comments.
 
 Note : The agent version(s) below has dates (ciprod<mmddyyyy>), which indicate the agent build dates (not release dates)
 
+### 07/27/2022 -
+##### Version microsoft/oms:ciprod06272022-hotfix Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod06272022-hotfix (linux)
+- Fixes for sending the proper node allocatable cpu and memory value for the container which does not specify limits.
+
 ### 06/27/2022 -
 ##### Version microsoft/oms:ciprod06272022 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod06272022 (linux)
 ##### Code change log

charts/azuremonitor-containers/Chart.yaml

@@ -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: 2.9.4
+version: 2.9.5
 kubeVersion: "^1.10.0-0"
 keywords:
   - monitoring

charts/azuremonitor-containers/values.yaml

@@ -22,7 +22,7 @@ Azure:
 omsagent:
   image:
     repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod"
-    tag: "ciprod06272022"
+    tag: "ciprod06272022-hotfix"
     tagWindows: "win-ciprod06142022"
     pullPolicy: IfNotPresent
     dockerProviderVersion: "18.0.1-0"

kubernetes/linux/Dockerfile

@@ -18,7 +18,7 @@ ENV RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR 0.9
 RUN /usr/bin/apt-get update && /usr/bin/apt-get install -y libc-bin wget openssl curl sudo python-ctypes init-system-helpers  net-tools rsyslog cron vim dmidecode apt-transport-https gnupg && rm -rf /var/lib/apt/lists/*
 COPY setup.sh main.sh defaultpromenvvariables defaultpromenvvariables-rs defaultpromenvvariables-sidecar mdsd.xml envmdsd logrotate.conf $tmpdir/
 
-ARG IMAGE_TAG=ciprod06272022
+ARG IMAGE_TAG=ciprod06272022-hotfix
 ENV AGENT_VERSION ${IMAGE_TAG}
 
 WORKDIR ${tmpdir}

kubernetes/linux/Dockerfile.multiarch

@@ -33,7 +33,7 @@ RUN /usr/bin/apt-get update && /usr/bin/apt-get install -y libc-bin wget openssl
 COPY --from=builder /src/kubernetes/linux/Linux_ULINUX_1.0_*_64_Release/docker-cimprov-*.*.*-*.*.sh $tmpdir/
 COPY kubernetes/linux/setup.sh kubernetes/linux/main.sh kubernetes/linux/defaultpromenvvariables kubernetes/linux/defaultpromenvvariables-rs kubernetes/linux/defaultpromenvvariables-sidecar kubernetes/linux/mdsd.xml kubernetes/linux/envmdsd kubernetes/linux/logrotate.conf $tmpdir/
 
-ARG IMAGE_TAG=ciprod06272022
+ARG IMAGE_TAG=ciprod06272022-hotfix
 ENV AGENT_VERSION ${IMAGE_TAG}
 
 WORKDIR ${tmpdir}

kubernetes/omsagent.yaml

@@ -379,7 +379,7 @@ spec:
         #         - NET_ADMIN
         #         - NET_RAW
         - name: omsagent
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod06272022"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod06272022-hotfix"
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -468,7 +468,7 @@ spec:
             timeoutSeconds: 15
 #Only in sidecar scraping mode
         - name: omsagent-prometheus
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod06272022"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod06272022-hotfix"
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -653,7 +653,7 @@ spec:
         #         - NET_ADMIN
         #         - NET_RAW
         - name: omsagent
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod06272022"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod06272022-hotfix"
           imagePullPolicy: IfNotPresent
           resources:
             limits:

source/plugins/ruby/KubernetesApiClient.rb

@@ -517,7 +517,7 @@ def getContainerResourceRequestsAndLimits(pod, metricCategory, metricNameToColle
               #No container level limit for the given metric, so default to node level limit
             else
               if (metricCategory == "limits" && !nodeAllocatableRecord.nil? && !nodeAllocatableRecord.empty? && nodeAllocatableRecord.has_key?(metricNameToCollect))
-                metricValue = nodeAllocatableRecord[metricNameToCollect]
+                metricValue = getMetricNumericValue(metricNameToCollect, nodeAllocatableRecord[metricNameToCollect])
                 metricProps = {}
                 metricProps["Timestamp"] = metricTime
                 metricProps["Host"] = nodeName
@@ -591,7 +591,7 @@ def getContainerResourceRequestsAndLimitsAsInsightsMetrics(pod, metricCategory,
               #No container level limit for the given metric, so default to node level limit for non-gpu metrics
               if (metricNameToCollect.downcase != "nvidia.com/gpu") && (metricNameToCollect.downcase != "amd.com/gpu")
                 if !nodeAllocatableRecord.nil? && !nodeAllocatableRecord.empty? && nodeAllocatableRecord.has_key?(metricNameToCollect)
-                  metricValue = nodeAllocatableRecord[metricNameToCollect]
+                  metricValue = getMetricNumericValue(metricNameToCollect, nodeAllocatableRecord[metricNameToCollect])
                 end
               end
             end