Merge branch 'master' into aswatt-docspatch-1

docs/OMS-Agent-for-Linux.md

@@ -37,7 +37,7 @@ After installing the Log Analytics agent for Linux packages, the following addit
  **Required package** | **Description** | **Minimum version**
 --------------------- | --------------------- | -------------------
 Glibc |	GNU C Library	| 2.5-12 
-Openssl	| OpenSSL Libraries | 1.0.1 or 1.1.x
+Openssl	| OpenSSL Libraries | 1.0.1, 1.1.x or 3.0.x
 Curl | cURL web client | 7.15.5
 Python 2 | | 2.6
 Python-ctypes | |

installer/bundle/bundle_skel.sh

@@ -298,6 +298,7 @@ ulinux_detect_openssl_version()
 
     TMPBINDIR=
     # the system OpenSSL version is 1.0.0.  Likewise with OPENSSL_SYSTEM_VERSION_11X
+    # take system current openssl version as default
     OPENSSL_SYSTEM_VERSION_FULL=`$OPENSSL_PATH version | awk '{print $2}'`
     OPENSSL_SYSTEM_VERSION_10X=`echo $OPENSSL_SYSTEM_VERSION_FULL | grep -Eq '^1.0.'; echo $?`
     OPENSSL_SYSTEM_VERSION_100_ONLY=`echo $OPENSSL_SYSTEM_VERSION_FULL | grep -Eq '^1.0.0'; echo $?`
@@ -316,6 +317,8 @@ ulinux_detect_openssl_version()
         echo "Supported versions: 1.0.1 onward (1.0.0 was deprecated), 1.1.*, 3.0.*"
         cleanup_and_exit $UNSUPPORTED_OPENSSL
     fi
+    echo "Detected OpenSSL version $OPENSSL_SYSTEM_VERSION_FULL set as system default."
+    echo "Install/Upgrade will use package(s) from OMS bundle installer's $TMPBINDIR openssl directtory."
 }
 
 ulinux_detect_installer()
@@ -545,6 +548,7 @@ pkg_add()
     echo "----- Installing package: $pkg_name ($pkg_filename) -----"
 
     ulinux_detect_openssl_version
+    # TMPBINDIR now points to the openssl version folder to take pkg from
     pkg_filename=$TMPBINDIR/$pkg_filename
 
     if [ "$INSTALLER" = "DPKG" ]; then
@@ -612,6 +616,7 @@ pkg_upd() {
     fi
 
     ulinux_detect_openssl_version
+    # TMPBINDIR now points to the openssl version folder to take pkg from
     pkg_filename=$TMPBINDIR/$pkg_filename
 
     if [ "$INSTALLER" = "DPKG" ]

installer/datafiles/linux.data

@@ -76,6 +76,8 @@ fi
 
 # Ensure omsagent is in the omiusers group, but leave omsagent as a group
 /usr/sbin/usermod -g omiusers omsagent 1> /dev/null 2> /dev/null
+# Ensure omsagent is in the omi group as well
+/usr/sbin/usermod -g omi omsagent 1> /dev/null 2> /dev/null
 
 # Add the 'nxautomation' group if it does not already exist
 # (Can't use useradd with -U since that doesn't exist on older systems)
@@ -165,6 +167,10 @@ if ${{PERFORMING_UPGRADE_NOT}}; then
     # Unconfigure sudo if it's already configured
     RemoveSudoersSupport
 
+    # Remove omsagent from the omi group
+    echo "Removing omsagent from the omi group ..."
+    gpasswd -d omsagent omi
+
     # Remove the service accounts
     echo "Deleting nxautomation service account ..."
     userdel nxautomation 2> /dev/null