Gangams/azure mdsd 1.35.1 update (#1415)

* mdsd update for amaca arm64

* add giglaport option

* add paths to bashrc

* remove unneeded changes

Author: ganga1980

build/linux/installer/conf/PA.json

@@ -45,8 +45,6 @@ MAINTAINER:              'Microsoft Corporation'
 
 /opt/tomlparser-geneva-config.rb;                                       build/common/installer/scripts/tomlparser-geneva-config.rb;     755; root; root
 
-/etc/opt/microsoft/azuremonitoragent/amacoreagent/PA.json;              build/linux/installer/conf/PA.json;                             755; root; root
-
 /opt/fluent-bit-geneva-conf-customizer.rb;                     build/common/installer/scripts/fluent-bit-geneva-conf-customizer.rb;     755; root; root
 /etc/opt/microsoft/docker-cimprov/fluent-bit-input.conf;			       build/linux/installer/conf/fluent-bit-input.conf;                644; root; root
 /etc/opt/microsoft/docker-cimprov/fluent-bit-common.conf;			    build/linux/installer/conf/fluent-bit-common.conf;                644; root; root
@@ -194,8 +192,6 @@ MAINTAINER:              'Microsoft Corporation'
 /var/opt/microsoft/linuxmonagent/amaca;                 755; root; root
 /var/opt/microsoft/linuxmonagent/amaca/log;             755; root; root
 
-/etc/opt/microsoft/azuremonitoragent/amacoreagent;      755; root; root
-
 /opt/fluent-bit;                          755; root; root;sysdir
 /opt/fluent-bit/bin;                      755; root; root;sysdir
 /etc/telegraf;                              755; root; root;sysdir

build/linux/installer/datafiles/base_container.data

@@ -8,10 +8,8 @@ echo "startup script start @ $(date +'%Y-%m-%dT%H:%M:%S')"
 startAMACoreAgent() {
       echo "AMACoreAgent: Starting AMA Core Agent since High Log scale mode is enabled"
 
-      AMACALogFileDir="/var/opt/microsoft/linuxmonagent/amaca/log"
-      AMACALogFilePath="$AMACALogFileDir"/amaca.log
-      AMACAConfigFilePath="/etc/opt/microsoft/azuremonitoragent/amacoreagent"
-      export PA_FLUENT_SOCKET_PORT=13000
+      export AMACALogFileDir="/var/opt/microsoft/linuxmonagent/amaca/log"
+      export AMACALogFilePath="$AMACALogFileDir"/amaca.log
       export PA_DATA_PORT=13000
       export PA_GIG_BRIDGE_MODE=true
       export GIG_PA_ENABLE_OPTIMIZATION=true
@@ -20,19 +18,19 @@ startAMACoreAgent() {
       export CounterDataReportFrequencyInMinutes=60
 
       {
-         echo "export PA_FLUENT_SOCKET_PORT=$PA_FLUENT_SOCKET_PORT"
          echo "export PA_DATA_PORT=$PA_DATA_PORT"
          echo "export PA_GIG_BRIDGE_MODE=$PA_GIG_BRIDGE_MODE"
          echo "export GIG_PA_ENABLE_OPTIMIZATION=$GIG_PA_ENABLE_OPTIMIZATION"
          echo "export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=$DOTNET_SYSTEM_GLOBALIZATION_INVARIANT"
          echo "export PA_CONFIG_PORT=$PA_CONFIG_PORT"
          echo "export CounterDataReportFrequencyInMinutes=$CounterDataReportFrequencyInMinutes"
+         echo "export AMACALogFilePath=$AMACALogFilePath"
       } >> ~/.bashrc
 
       source ~/.bashrc
-      /opt/microsoft/azure-mdsd/bin/amacoreagent -c $AMACAConfigFilePath --configport $PA_CONFIG_PORT --amacalog $AMACALogFilePath > /dev/null 2>&1 &
+      /opt/microsoft/azure-mdsd/bin/amacoreagent --configport $PA_CONFIG_PORT --amacalog $AMACALogFilePath --giglaport $PA_DATA_PORT > /dev/null 2>&1 &
 
-      waitforlisteneronTCPport "$PA_FLUENT_SOCKET_PORT" "$WAITTIME_PORT_13000"
+      waitforlisteneronTCPport "$PA_DATA_PORT" "$WAITTIME_PORT_13000"
       waitforlisteneronTCPport "$PA_CONFIG_PORT" "$WAITTIME_PORT_12563"
       # Extract AMACoreAgent version from log file
       version=""

kubernetes/linux/main.sh

@@ -52,7 +52,7 @@ gem uninstall stringio --version 3.0.1
 gem uninstall rexml --version 3.2.5
 gem uninstall webrick --version 1.8.1
 
-sudo tdnf install -y azure-mdsd-1.31.4
+sudo tdnf install -y azure-mdsd-1.35.1
 cp -f $TMPDIR/mdsd.xml /etc/mdsd.d
 cp -f $TMPDIR/envmdsd /etc/mdsd.d
 rm /usr/sbin/telegraf