OTLP changes

Author: suyadav1

charts/azuremonitor-containers-geneva/values.yaml

@@ -17,7 +17,7 @@ image:
   repository: mcr.microsoft.com/azuremonitor/containerinsights/ciprod
   tag: "3.1.28"
   pullPolicy: IfNotPresent
-  agentVersion: "azure-mdsd-1.35.8"
+  agentVersion: "azure-mdsd-1.35.7"
 nameOverride: ""
 enableInternalMetrics: false
 enableKubernetesMetadata: false

kubernetes/ama-logs.yaml

@@ -343,7 +343,7 @@ spec:
         component: ama-logs-agent
         tier: node
       annotations:
-        agentVersion: "azure-mdsd-1.35.8"
+        agentVersion: "azure-mdsd-1.35.7"
         dockerProviderVersion: "18.0.1-0"
         schema-versions: "v1"
         kubernetes.azure.com/no-http-proxy-vars: "true"
@@ -454,6 +454,8 @@ spec:
               value: "false"
             - name: APPMONITORING_OPENTELEMETRYLOGS_PORT
               value: "28331"
+            - name: AZMON_OPENTELEMETRYLOGS_CONTAINER_PORT
+              value: "4319"
             - name: AZMON_RETINA_FLOW_LOGS_ENABLED
               value: "false"
             - name: CLUSTER_CLOUD_ENVIRONMENT
@@ -475,7 +477,7 @@ spec:
               hostPort: 28330
               protocol: TCP
             - name: otlp-logs
-              containerPort: 4317
+              containerPort: 4319
               hostPort: 28331
               protocol: TCP
           volumeMounts:
@@ -788,7 +790,7 @@ spec:
 #       labels:
 #         rsName: "ama-logs-multitenancy"
 #       annotations:
-#         agentVersion: "azure-mdsd-1.35.8"
+#         agentVersion: "azure-mdsd-1.35.7"
 #         dockerProviderVersion: "18.0.1-0"
 #         schema-versions: "v1"
 #         kubernetes.azure.com/no-http-proxy-vars: "true"
@@ -963,7 +965,7 @@ spec:
       labels:
         rsName: "ama-logs-rs"
       annotations:
-        agentVersion: "azure-mdsd-1.35.8"
+        agentVersion: "azure-mdsd-1.35.7"
         dockerProviderVersion: "18.0.1-0"
         schema-versions: "v1"
         kubernetes.azure.com/no-http-proxy-vars: "true"
@@ -1097,10 +1099,6 @@ spec:
             #   value: "true"
             - name: APPMONITORING_AUTOINSTRUMENTATION_ENABLED
               value: "false"
-            - name: APPMONITORING_OPENTELEMETRYLOGS_ENABLED
-              value: "false"
-            - name: APPMONITORING_OPENTELEMETRYLOGS_PORT
-              value: "28331"
             - name: AZMON_TELEGRAF_LIVENESSPROBE_ENABLED
               value: "false"
             - name: AZMON_WINDOWS_FLUENT_BIT_ENABLED

kubernetes/linux/Dockerfile.multiarch

@@ -34,7 +34,6 @@ RUN tdnf install -y \
         gnupg \
         make \
         logrotate \
-        unzip \
         busybox \
         gawk \
         tar \

kubernetes/linux/main.sh

@@ -60,19 +60,18 @@ getClusterCloudEnvironment() {
 }
 
 startAMACoreAgent() {
-      echo "AMACoreAgent: Starting AMA Core Agent for otel"
-
-      export AMACALogFileDir="/var/opt/microsoft/azuremonitoragent/log"
+      if isHighLogScaleMode; then
+             echo "AMACoreAgent: Starting AMA Core Agent since High Log scale mode is enabled"
+      fi
+      
+      export AMACALogFileDir="/var/opt/microsoft/linuxmonagent/amaca/log"
       export AMACALogFilePath="$AMACALogFileDir"/amaca.log
-      export PA_DATA_PORT=13005
+      export PA_DATA_PORT=13000
       export PA_GIG_BRIDGE_MODE=true
       export GIG_PA_ENABLE_OPTIMIZATION=true
       export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
       export PA_CONFIG_PORT=12563
       export CounterDataReportFrequencyInMinutes=60
-      export PA_AMCS_PROTOCOL="HttpProtobuf"
-      export PA_AMCS_PORT=4319
-      export PA_AMCS_HOST="0.0.0.0"
 
       {
          echo "export PA_DATA_PORT=$PA_DATA_PORT"
@@ -82,14 +81,30 @@ startAMACoreAgent() {
          echo "export PA_CONFIG_PORT=$PA_CONFIG_PORT"
          echo "export CounterDataReportFrequencyInMinutes=$CounterDataReportFrequencyInMinutes"
          echo "export AMACALogFilePath=$AMACALogFilePath"
-         echo "export PA_VERBOSE=true"
-         echo "export PA_AMCS_PROTOCOL=$PA_AMCS_PROTOCOL"
-         echo "export PA_AMCS_PORT=$PA_AMCS_PORT"
-         echo "export PA_AMCS_HOST=$PA_AMCS_HOST"
-      } >> ~/.bashrc
+      } >> ~/.bashrc  
+
+      if isOpenTelemetryLogsEnabled; then
+            echo "AMACoreAgent: Starting AMA Core Agent for otel"
+            export PA_AMCS_PROTOCOL="HttpProtobuf"
+            export PA_AMCS_HOST="0.0.0.0"
+            export PA_AMCS_PORT=4319
+            if [ -n "${AZMON_OPENTELEMETRYLOGS_CONTAINER_PORT}" ]; then
+                  # Convert AZMON_OPENTELEMETRYLOGS_CONTAINER_PORT from string to int
+                  port_int=$((AZMON_OPENTELEMETRYLOGS_CONTAINER_PORT + 0))
+                  if [ "$port_int" -gt 0 ] 2>/dev/null; then
+                        export PA_AMCS_PORT=$port_int
+                  fi
+            fi
+            
+            {
+                  echo "export PA_AMCS_PROTOCOL=$PA_AMCS_PROTOCOL"
+                  echo "export PA_AMCS_PORT=$PA_AMCS_PORT"
+                  echo "export PA_AMCS_HOST=$PA_AMCS_HOST"
+            } >> ~/.bashrc
+      fi
 
       source ~/.bashrc
-      /opt/microsoft/azure-mdsd/bin/amacoreagent --configport $PA_CONFIG_PORT --amacalog $AMACALogFilePath --giglaport $PA_DATA_PORT -v > /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_DATA_PORT" "$WAITTIME_PORT_13000"
       waitforlisteneronTCPport "$PA_CONFIG_PORT" "$WAITTIME_PORT_12563"
@@ -237,6 +252,14 @@ isHighLogScaleMode() {
      fi
 }
 
+isOpenTelemetryLogsEnabled() {
+      if [[ "${APPMONITORING_OPENTELEMETRYLOGS_ENABLED}" == "true" ]]; then
+          true
+      else
+          false
+      fi
+}
+
 checkAgentOnboardingStatus() {
       local sleepdurationsecs=1
       local totalsleptsecs=0
@@ -1095,10 +1118,9 @@ if [ "${CONTAINER_TYPE}" == "PrometheusSidecar" ]; then
     fi
 else
       echo "starting mdsd in main container..."
-      # if isHighLogScaleMode; then
-      # start core agent for otlp
-      startAMACoreAgent
-      # fi
+      if isHighLogScaleMode || isOpenTelemetryLogsEnabled; then
+            startAMACoreAgent
+      fi
       export MDSD_ROLE_PREFIX=/var/run/mdsd-ci/default
       echo "export MDSD_ROLE_PREFIX=$MDSD_ROLE_PREFIX" >> ~/.bashrc
       if [[ "${GENEVA_LOGS_INTEGRATION}" != "true" ]]; then

kubernetes/linux/setup.sh

@@ -46,14 +46,6 @@ rm /usr/sbin/telegraf
 mdsd_version=$(sudo tdnf list installed | grep mdsd | awk '{print $2}')
 echo "Azure mdsd: $mdsd_version" >> packages_version.txt
 
-# # install AMACA for otel
-# sudo curl -L -O https://github.com/microsoft/Docker-Provider/releases/download/windows-ama-bits/Azure.Monitor.CoreAgent.Linux-x64-AOT.2.0.31.nupkg
-# sudo unzip -o Azure.Monitor.CoreAgent.Linux-x64-AOT.2.0.31.nupkg -d amaca
-# sudo mkdir -p /opt/microsoft/azuremonitoragent
-# cp -r amaca/* /opt/microsoft/azuremonitoragent/
-# chmod +x /opt/microsoft/azuremonitoragent/content/AMACoreAgent
-# rm -rf amaca Azure.Monitor.CoreAgent.Linux-x64-AOT.2.0.31.nupkg
-
 # log rotate conf for mdsd and can be extended for other log files as well
 cp -f $TMPDIR/logrotate.conf /etc/logrotate.d/ci-agent