[msi] remove FluentD support

Author: atoulme

.chloggen/remove_fluentd_msi.yaml

@@ -0,0 +1,17 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. crosslink)
+component: msi
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: remove FluentD support
+
+# One or more tracking issues related to the change
+issues: []
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  Remove FluentD support after deprecation. Use native receivers such as the filelog receiver instead.

packaging/msi/fluentd/conf.d/eventlog.conf

@@ -21,8 +21,6 @@ WXS_PATH="${MSI_SRC_DIR}/splunk-otel-collector.wxs"
 OTELCOL="${REPO_DIR}/bin/otelcol_windows_amd64.exe"
 AGENT_CONFIG="${REPO_DIR}/cmd/otelcol/config/collector/agent_config.yaml"
 GATEWAY_CONFIG="${REPO_DIR}/cmd/otelcol/config/collector/gateway_config.yaml"
-FLUENTD_CONFIG=${FLUENTD_CONFIG:-"${REPO_DIR}/packaging/fpm/etc/otel/collector/fluentd/fluent.conf"}
-FLUENTD_CONFD="${MSI_SRC_DIR}/fluentd/conf.d"
 SUPPORT_BUNDLE_SCRIPT=${SUPPORT_BUNDLE_SCRIPT:-"${MSI_SRC_DIR}/splunk-support-bundle.ps1"}
 SPLUNK_ICON="${MSI_SRC_DIR}/splunk.ico"
 OUTPUT_DIR="${REPO_DIR}/dist"
@@ -43,16 +41,6 @@ OPTIONS:
                                       Defaults to '$AGENT_CONFIG'.
     --gateway-config PATH             Absolute path to the gateway config.
                                       Defaults to '$GATEWAY_CONFIG'.
-    --fluentd PATH                    DEPRECATED: Fluentd support has been deprecated and will be removed in a future release.
-                                      Please refer to documentation for more information:
-                                      https://github.com/signalfx/splunk-otel-collector/blob/main/docs/deprecations/fluentd-support.md
-                                      Absolute path to the fluentd config.
-                                      Defaults to '$FLUENTD_CONFIG'.
-    --fluentd-confd PATH              DEPRECATED: Fluentd support has been deprecated and will be removed in a future release.
-                                      Please refer to documentation for more information:
-                                      https://github.com/signalfx/splunk-otel-collector/blob/main/docs/deprecations/fluentd-support.md
-                                      Absolute path to the conf.d.
-                                      Defaults to '$FLUENTD_CONFD'.
     --support-bundle PATH             Absolute path to the support bundle script.
                                       Defaults to '$SUPPORT_BUNDLE_SCRIPT'.
     --jmx-metric-gatherer VERSION     The released version of the JMX Metric Gatherer JAR to include (will be downloaded).
@@ -69,8 +57,6 @@ parse_args_and_build() {
     local otelcol="$OTELCOL"
     local agent_config="$AGENT_CONFIG"
     local gateway_config="$GATEWAY_CONFIG"
-    local fluentd_config="$FLUENTD_CONFIG"
-    local fluentd_confd="$FLUENTD_CONFD"
     local support_bundle="$SUPPORT_BUNDLE_SCRIPT"
     local jmx_metric_gatherer_release="$JMX_METRIC_GATHERER_RELEASE"
     local splunk_icon="$SPLUNK_ICON"
@@ -92,16 +78,6 @@ parse_args_and_build() {
                 gateway_config="$2"
                 shift 1
                 ;;
-            --fluentd)
-                echo "[WARNING] DEPRECATED: Fluentd support has been deprecated and will be removed in a future release. Please refer to documentation for more information: https://github.com/signalfx/splunk-otel-collector/blob/main/docs/deprecations/fluentd-support.md"
-                fluentd_config="$2"
-                shift 1
-                ;;
-            --fluentd-confd)
-                echo "[WARNING] DEPRECATED: Fluentd support has been deprecated and will be removed in a future release. Please refer to documentation for more information: https://github.com/signalfx/splunk-otel-collector/blob/main/docs/deprecations/fluentd-support.md"
-                fluentd_confd="$2"
-                shift 1
-                ;;
             --support-bundle)
                 support_bundle="$2"
                 shift 1
@@ -156,12 +132,9 @@ parse_args_and_build() {
         echo "Skipping build directory removal"
     fi
 
-    mkdir -p "${files_dir}/fluentd/conf.d"
     cp "$support_bundle" "${files_dir}/splunk-support-bundle.ps1"
     cp "$agent_config" "${files_dir}/agent_config.yaml"
     cp "$gateway_config" "${files_dir}/gateway_config.yaml"
-    cp "$fluentd_config" "${files_dir}/fluentd/td-agent.conf"
-    cp "${fluentd_confd}"/*.conf "${files_dir}/fluentd/conf.d/"
 
     if [ -z "$skip_build_dir_removal" ]; then
         unzip -d "$files_dir" "${OUTPUT_DIR}/agent-bundle_windows_amd64.zip"

packaging/msi/msi-builder/build.sh

@@ -196,12 +196,6 @@ function getConfig {
     } else {
         Copy-Item -Path "$CONFDIR" -Destination "$TMPDIR/config" -Recurse
     }
-    $FLUENTD_CONFDIR="${env:SYSTEMDRIVE}\opt\td-agent\etc\td-agent"
-    if (-NOT (Test-Path -Path $FLUENTD_CONFDIR)) {
-        Write-Output "WARN: Could not find directory ($FLUENTD_CONFDIR)."
-    } else {
-        Copy-Item -Path "$FLUENTD_CONFDIR" -Destination "$TMPDIR/config" -Recurse
-    }
 }
 
 #######################################
@@ -214,15 +208,10 @@ function getConfig {
 function getStatus {
     Write-Output "INFO: Getting status..."
     Get-Service splunk-otel-collector -ErrorAction SilentlyContinue > $TMPDIR/logs/splunk-otel-collector.txt 2>&1
-    Get-Service fluentdwinsvc -ErrorAction SilentlyContinue > $TMPDIR/logs/td-agent.txt 2>&1
     if (-NOT (Get-Content -Path "$TMPDIR/logs/splunk-otel-collector.txt")) {
         Set-Content -Path "$TMPDIR/logs/splunk-otel-collector.txt" -Value "Service splunk-otel-collector not exist."
         Write-Output "WARN: Service splunk-otel-collector not exist."
     }
-    if (-NOT (Get-Content -Path "$TMPDIR/logs/td-agent.txt")) {
-        Set-Content -Path "$TMPDIR/logs/td-agent.txt" -Value "Service td-agent not exist."
-        Write-Output "WARN: Service td-agent not exist."
-    }
 }
 
 #######################################
@@ -341,10 +330,6 @@ function getHostInfo {
         Write-Output "WARN: Unable to find otelcol PIDs"
         Write-Output "      Get-Process will not be collected for otelcol";
     }
-    if (-NOT (Get-Process -Name 'ruby' -ErrorAction SilentlyContinue | Where-Object {$_.Path -eq "${env:SYSTEMDRIVE}\opt\td-agent\bin\ruby.exe"})) {
-        Write-Output "WARN: Unable to find fluentd (ruby) PIDs"
-        Write-Output "      Get-Process will not be collected for fluentd (ruby)";
-    }
     Get-PSDrive > $TMPDIR/metrics/df.txt 2>&1
 
     Get-CIMInstance Win32_OperatingSystem | Select TotalVisibleMemorySize,FreePhysicalMemory,TotalVirtualMemorySize,FreeVirtualMemory > $TMPDIR/metrics/free.txt 2>&1