Release 05-20-2021

ReleaseNotes.md

@@ -11,9 +11,15 @@ additional questions or comments.
 
 Note : The agent version(s) below has dates (ciprod<mmddyyyy>), which indicate the agent build dates (not release dates)
 
+### 05/20/2021 -
+##### Version microsoft/oms:ciprod05202021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05202021 (linux)
+##### No Windows changes with this release, win-ciprod04222021 still current.
+##### Code change log
+- Telegraf now waits 30 seconds on startup for network connections to complete (Linux only)
+- Change adding telegraf to the liveness probe reverted (Linux only)
 
 ### 05/12/2021 -
-##### Version microsoft/oms:ciprod00512021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021 (linux)
+##### Version microsoft/oms:ciprod05122021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021 (linux)
 ##### No Windows changes with this release, win-ciprod04222021 still current.
 ##### Code change log
 - Upgrading oneagent to version 1.8 (only for Linux)

build/linux/installer/scripts/livenessprobe.sh

@@ -30,9 +30,9 @@ fi
 (ps -ef | grep telegraf | grep -v "grep")
 if [ $? -ne 0 ]
 then
- echo "Telegraf is not running" > /dev/termination-log
+ # echo "Telegraf is not running" > /dev/termination-log
  echo "Telegraf is not running (controller: ${CONTROLLER_TYPE}, container type: ${CONTAINER_TYPE})" > /dev/write-to-traces  # this file is tailed and sent to traces
- exit 1
+ # exit 1
 fi
 
 if [ -s "inotifyoutput.txt" ]

build/version

@@ -3,7 +3,7 @@
 # Build Version Information
 
 CONTAINER_BUILDVERSION_MAJOR=15
-CONTAINER_BUILDVERSION_MINOR=1
+CONTAINER_BUILDVERSION_MINOR=2
 CONTAINER_BUILDVERSION_PATCH=0
 CONTAINER_BUILDVERSION_BUILDNR=0
 CONTAINER_BUILDVERSION_DATE=20210512

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=ciprod05122021
+ARG IMAGE_TAG=ciprod05202021
 ENV AGENT_VERSION ${IMAGE_TAG}
 ENV tmpdir /opt
 ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi

kubernetes/linux/main.sh

@@ -1,5 +1,43 @@
 #!/bin/bash
 
+waitforlisteneronTCPport() {
+      local sleepdurationsecs=1
+      local totalsleptsecs=0
+      local port=$1
+      local waittimesecs=$2
+      local numeric='^[0-9]+$'
+      local varlistener=""
+
+      if [ -z "$1" ] || [ -z "$2" ]; then
+            echo "${FUNCNAME[0]} called with incorrect arguments<$1 , $2>. Required arguments <#port, #wait-time-in-seconds>"
+            return -1
+      else
+
+            if [[ $port =~ $numeric ]] && [[ $waittimesecs =~ $numeric ]]; then
+                  #local varlistener=$(netstat -lnt | awk '$6 == "LISTEN" && $4 ~ ":25228$"')
+                  while true
+                  do
+                        if [ $totalsleptsecs -gt $waittimesecs ]; then
+                              echo "${FUNCNAME[0]} giving up waiting for listener on port:$port after $totalsleptsecs secs"
+                              return 1
+                        fi
+                        varlistener=$(netstat -lnt | awk '$6 == "LISTEN" && $4 ~ ":'"$port"'$"')
+                        if [ -z "$varlistener" ]; then
+                              #echo "${FUNCNAME[0]} waiting for $sleepdurationsecs more sec for listener on port:$port ..."
+                              sleep $sleepdurationsecs
+                              totalsleptsecs=$(($totalsleptsecs+1))
+                        else
+                              echo "${FUNCNAME[0]} found listener on port:$port in $totalsleptsecs secs"
+                              return 0
+                        fi
+                  done
+            else
+                  echo "${FUNCNAME[0]} called with non-numeric arguments<$1 , $2>. Required arguments <#port, #wait-time-in-seconds>"
+                  return -1
+            fi
+      fi
+}
+
 if [ -e "/etc/config/kube.conf" ]; then
     cat /etc/config/kube.conf > /etc/opt/microsoft/omsagent/sysconf/omsagent.d/container.conf
 elif [ "${CONTAINER_TYPE}" == "PrometheusSidecar" ]; then
@@ -689,6 +727,20 @@ echo "export HOST_ETC=/hostfs/etc" >> ~/.bashrc
 export HOST_VAR=/hostfs/var
 echo "export HOST_VAR=/hostfs/var" >> ~/.bashrc
 
+if [ ! -e "/etc/config/kube.conf" ]; then
+      if [ "${CONTAINER_TYPE}" == "PrometheusSidecar" ]; then
+            echo "checking for listener on tcp #25229 and waiting for 30 secs if not.."
+            waitforlisteneronTCPport 25229 30
+      else
+            echo "checking for listener on tcp #25226 and waiting for 30 secs if not.."
+            waitforlisteneronTCPport 25226 30
+            echo "checking for listener on tcp #25228 and waiting for 30 secs if not.."
+            waitforlisteneronTCPport 25228 30
+      fi
+else
+      echo "checking for listener on tcp #25226 and waiting for 30 secs if not.."
+      waitforlisteneronTCPport 25226 30
+fi
 
 #start telegraf
 /opt/telegraf --config $telegrafConfFile &

kubernetes/omsagent.yaml

@@ -358,7 +358,7 @@ spec:
         tier: node
       annotations:
         agentVersion: "1.10.0.1"
-        dockerProviderVersion: "15.1.0-0"
+        dockerProviderVersion: "15.2.0-0"
         schema-versions: "v1"
     spec:
       serviceAccountName: omsagent
@@ -368,7 +368,7 @@ spec:
             value: "3"       
       containers:
         - name: omsagent
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05202021"
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -446,7 +446,7 @@ spec:
             timeoutSeconds: 15
 #Only in sidecar scraping mode
         - name: omsagent-prometheus
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05202021"
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -583,13 +583,13 @@ spec:
         rsName: "omsagent-rs"
       annotations:
         agentVersion: "1.10.0.1"
-        dockerProviderVersion: "15.1.0-0"
+        dockerProviderVersion: "15.2.0-0"
         schema-versions: "v1"
     spec:
       serviceAccountName: omsagent
       containers:
         - name: omsagent
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05202021"
           imagePullPolicy: IfNotPresent
           resources:
             limits: