Skip to content

Commit 97b7318

Browse files
Fixes
1 parent 4c0bd4c commit 97b7318

File tree

2 files changed

+11
-20
lines changed

2 files changed

+11
-20
lines changed

gdi/opentelemetry/collector-windows/install-windows-msi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Custom MSI URLs
177177

178178
By default, the Collector MSI is downloaded from :new-page:`https://dl.signalfx.com <https://dl.signalfx.com>`.
179179

180-
To specify custom URLs for these downloads, replace ``COLLECTOR_MSI_URL``with the URLs to the desired MSI packages to install:
180+
To specify custom URLs for these downloads, replace ``COLLECTOR_MSI_URL`` with the URL to the desired MSI packages to install:
181181

182182
.. code-block:: PowerShell
183183

gdi/opentelemetry/components/fluentd-receiver.rst

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,15 @@ Fluent Forward receiver
77
.. meta::
88
:description: The Fluent Forward receiver allows the Splunk Distribution of OpenTelemetry Collector to collect logs and events using the Fluent Forward protocol.
99

10+
.. caution:: ``fluentd``` will be deprecated in October 2025. In Kubernetes environments use native OpenTelemetry log collection instead. In Linux and Windows platforms use the Universal Forwarder. See :ref:otel-config-logs`.
11+
1012
The Fluent Forward receiver allows the Splunk Distribution of the OpenTelemetry Collector to collect events using the bundled Fluentd application. The supported pipeline type is ``logs``. See :ref:`otel-data-processing` for more information.
1113

1214
The receiver accepts data formatted as Fluent Forward events through a TCP connection. All three Fluent event types, message, forward, and packed forward, are supported, including compressed packed forward.
1315

14-
.. caution:: Fluentd is deactivated by default for Linux and Windows. To activate it, use the ``--with-fluentd`` option when installing the Collector for Linux, or the ``with_fluentd = 1`` option when installing the Collector for Windows.
15-
1616
Get started
1717
======================
1818

19-
.. note::
20-
21-
This component is included in the default configuration of the Splunk Distribution of the OpenTelemetry Collector when deploying in host monitoring (agent) mode. See :ref:`otel-deployment-mode` for more information.
22-
23-
For details about the default configuration, see :ref:`otel-kubernetes-config`, :ref:`linux-config-ootb`, or :ref:`windows-config-ootb`. You can customize your configuration any time as explained in this document.
24-
2519
Follow these steps to configure and activate the component:
2620

2721
1. Deploy the Splunk Distribution of the OpenTelemetry Collector to your host or container platform:
@@ -33,7 +27,7 @@ Follow these steps to configure and activate the component:
3327
2. Configure the receiver as described in the next document.
3428
3. Restart the Collector.
3529

36-
By default, the Splunk Distribution of the OpenTelemetry Collector includes the Fluent Forward receiver in the ``logs`` pipeline:
30+
Next, add the Fluent Forward receiver in the ``logs`` pipeline:
3731

3832
.. code-block:: yaml
3933
@@ -46,12 +40,6 @@ By default, the Splunk Distribution of the OpenTelemetry Collector includes the
4640
logs:
4741
receivers: [fluentforward]
4842
49-
For more information on how to install Fluentd when manually installing the Collector, see:
50-
51-
* :ref:`fluentd-manual-config-linux`
52-
* :ref:`fluentd-manual-config-windows`
53-
* :ref:`windows-manual-fluentd`
54-
5543
Settings
5644
======================
5745

@@ -64,9 +52,12 @@ The following table shows the configuration options for the Fluent Forward recei
6452
Troubleshooting
6553
======================
6654

67-
For troubleshooting Fluentd, see:
55+
.. raw:: html
56+
57+
<div class="include-start" id="troubleshooting-components.rst"></div>
6858

69-
* :ref:`fluentd-collector-troubleshooting`
70-
* :ref:`otel-linux-uninstall-both-otel-and-tdagent`
59+
.. include:: /_includes/troubleshooting-components.rst
60+
61+
.. raw:: html
7162

72-
.. caution:: If you wish to collect logs for the target host with Fluentd, make sure Fluentd is installed and turned on in your Collector instance.
63+
<div class="include-stop" id="troubleshooting-components.rst"></div>

0 commit comments

Comments
 (0)