Update default td-agent version to 4.3.2 in the installer scripts (op…

…en-telemetry#1733)

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### 💡 Enhancements 💡
+
+- Update default `td-agent` version to 4.3.2 in the [Linux installer script](https://github.com/signalfx/splunk-otel-collector/blob/main/docs/getting-started/linux-installer.md) to support log collection with fluentd on Ubuntu 22.04
+
 ## v0.54.0
 
 This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.54.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.54.0) and the [opentelemetry-collector-contrib v0.54.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.54.0) releases.

docs/getting-started/linux-installer.md

@@ -22,7 +22,7 @@ Currently, the following Linux distributions and versions are supported:
 - CentOS / Red Hat / Oracle: 7, 8
 - Debian: 9, 10, 11
 - SUSE: 12, 15 (**Note:** Only for Collector versions v0.34.0 or higher.  Log collection with Fluentd not currently supported.)
-- Ubuntu: 16.04, 18.04, 20.04, 22.04 (**Note:** Log collection with Fluentd [not currently supported on Ubuntu 22.04](https://www.fluentd.org/blog/td-agent-v4.3.1-has-been-released).)
+- Ubuntu: 16.04, 18.04, 20.04, 22.04
 
 ## Getting Started
 

internal/buildscripts/packaging/installer/install.ps1

@@ -145,7 +145,7 @@ try {
 }
 $regkey = "HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment"
 
-$fluentd_msi_name = "td-agent-4.3.0-x64.msi"
+$fluentd_msi_name = "td-agent-4.3.2-x64.msi"
 $fluentd_dl_url = "https://packages.treasuredata.com/4/windows/$fluentd_msi_name"
 try {
     Resolve-Path $env:SYSTEMDRIVE

internal/buildscripts/packaging/installer/install.sh

@@ -88,7 +88,7 @@ default_realm="us0"
 default_memory_size="512"
 
 default_collector_version="latest"
-default_td_agent_version="4.3.0"
+default_td_agent_version="4.3.2"
 default_td_agent_version_stretch="3.7.1-0"
 
 default_service_user="splunk-otel-collector"
@@ -859,11 +859,6 @@ parse_args_and_install() {
     sles|opensuse*)
       with_fluentd="false"
       ;;
-    ubuntu)
-      if [ "$distro_codename" = "jammy" ]; then
-        with_fluentd="false"
-      fi
-      ;;
   esac
 
   ensure_not_installed "$with_fluentd" "$with_instrumentation"

internal/buildscripts/packaging/tests/installer_test.py

@@ -139,7 +139,7 @@ def test_installer_mode(distro, version, mode):
             # verify collector service status
             assert wait_for(lambda: service_is_running(container, service_owner=SERVICE_OWNER))
 
-            if "opensuse" not in distro and distro != "ubuntu-jammy":
+            if "opensuse" not in distro:
                 assert container.exec_run("systemctl status td-agent").exit_code == 0
 
             # test support bundle script
@@ -148,7 +148,7 @@ def test_installer_mode(distro, version, mode):
             verify_uninstall(container, distro)
 
         finally:
-            if "opensuse" not in distro and distro != "ubuntu-jammy":
+            if "opensuse" not in distro:
                 run_container_cmd(container, "journalctl -u td-agent --no-pager")
                 if container.exec_run("test -f /var/log/td-agent/td-agent.log").exit_code == 0:
                     run_container_cmd(container, "cat /var/log/td-agent/td-agent.log")
@@ -187,13 +187,13 @@ def test_installer_ballast(distro, version):
             # verify collector service status
             assert wait_for(lambda: service_is_running(container, service_owner=SERVICE_OWNER))
 
-            if "opensuse" not in distro and distro != "ubuntu-jammy":
+            if "opensuse" not in distro:
                 assert container.exec_run("systemctl status td-agent").exit_code == 0
 
             verify_uninstall(container, distro)
 
         finally:
-            if "opensuse" not in distro and distro != "ubuntu-jammy":
+            if "opensuse" not in distro:
                 run_container_cmd(container, "journalctl -u td-agent --no-pager")
                 if container.exec_run("test -f /var/log/td-agent/td-agent.log").exit_code == 0:
                     run_container_cmd(container, "cat /var/log/td-agent/td-agent.log")
@@ -234,13 +234,13 @@ def test_installer_service_owner(distro, version):
             # verify collector service status
             assert wait_for(lambda: service_is_running(container, service_owner=service_owner))
 
-            if "opensuse" not in distro and distro != "ubuntu-jammy":
+            if "opensuse" not in distro:
                 assert container.exec_run("systemctl status td-agent").exit_code == 0
 
             verify_uninstall(container, distro)
 
         finally:
-            if "opensuse" not in distro and distro != "ubuntu-jammy":
+            if "opensuse" not in distro:
                 run_container_cmd(container, "journalctl -u td-agent --no-pager")
             run_container_cmd(container, f"journalctl -u {SERVICE_NAME} --no-pager")