Merge pull request splunk#1733 from splunk/repo-sync

Pulling refs/heads/main into main

Author: aurbiztondo-splunk

_images/gdi/gdi-onboarding-diagram.png

@@ -1,10 +1,10 @@
 The Collector supports the following Linux distributions and versions:
 
-* Amazon Linux: 2, 2023. Log collection with Fluentd is not currently supported for Amazon Linux 2023.
+* Amazon Linux: 2, 2023. 
 * CentOS: 7, 8, 9
 * Red Hat: 7, 8, 9
 * Oracle: 8, 9
 * Debian: 11, 12
-* SUSE: 12, 15 for version 0.34.0 or higher. Log collection with Fluentd is not currently supported.
+* SUSE: 12, 15 for version 0.34.0 or higher. 
 * Ubuntu: 16.04, 18.04, 20.04, 22.04, and 24.04
 * Rocky Linux: 8, 9

_includes/requirements/collector-linux.rst

@@ -216,9 +216,6 @@ If you're unable to allow all URLs as described in :ref:`allow-urls`, ensure tha
    # RUM ingest endpoint 
    rum-ingest.<YOUR_REALM>.signalfx.com/v1/rum
    
-   # For td-agent/Fluentd on Linux and Windows
-   packages.treasuredata.com
-   
    # For DEB/RPM collector packages
    splunk.jfrog.io 
    jfrog-prod-use1-shared-virginia-main.s3.amazonaws.com

admin/authentication/allow-services.rst

@@ -24,7 +24,12 @@ Use Splunk Observability Cloud to achieve full-stack observability of all your d
 - :ref:`Splunk Log Observer Connect <logs-intro-logconnect>`
 - :ref:`Splunk Synthetic Monitoring <intro-synthetics>` - Splunk Synthetic Monitoring does not have a data import component
 
-This guide provides 4 chapters that guide you through the process of setting up each component of Splunk Observability Cloud.
+This guide provides 4 chapters that guide you through the process of setting up each component of Splunk Observability Cloud. The following diagram shows the step-by-step process of setting up each Splunk Observability Cloud component:
+
+.. image:: /_images/gdi/gdi-onboarding-diagram.png
+  :width: 80%
+  :alt: The step-by-step process for setting up each Splunk Observability Cloud component.
+
 
 .. raw:: html 
 

apm/span-tags/metricsets.rst

@@ -89,8 +89,6 @@ Using the installer script, you can install and activate zero-code instrumentati
                             curl -sSL https://dl.signalfx.com/splunk-otel-collector.sh > /tmp/splunk-otel-collector.sh && \
                             sudo sh /tmp/splunk-otel-collector.sh --with-instrumentation --realm <SPLUNK_REALM> -- <SPLUNK_ACCESS_TOKEN>
 
-                        .. note:: If you wish to collect logs for the target host, make sure Fluentd is installed and enabled in your Collector instance by specifying the ``--with-fluentd`` option.
-
                         The system-wide zero-code instrumentation method automatically adds environment variables to ``/etc/splunk/zeroconfig/java.conf``.
 
                         To automatically define the optional ``deployment.environment`` resource attribute at installation time, run the installer script with the ``--deployment-environment <env>`` option. Replace ``<env>`` with the desired attribute value, for example, ``prod``, as shown in the following example:
@@ -125,8 +123,6 @@ Using the installer script, you can install and activate zero-code instrumentati
                         
                         The ``systemd`` instrumentation automatically adds environment variables to ``/usr/lib/systemd/system.conf.d/00-splunk-otel-auto-instrumentation.conf``.
 
-                        .. note:: If you wish to collect logs for the target host, make sure Fluentd is installed and enabled in your Collector instance by specifying the ``--with-fluentd`` option. 
-
                         To automatically define the optional ``deployment.environment`` resource attribute at installation time, run the installer script with the ``--deployment-environment <env>`` option. Replace ``<env>`` with the desired attribute value, for example, ``prod``, as shown in the following example:
 
                         .. code-block:: bash
@@ -230,7 +226,6 @@ Using the installer script, you can install and activate zero-code instrumentati
                                 curl -sSL https://dl.signalfx.com/splunk-otel-collector.sh > /tmp/splunk-otel-collector.sh && \
                                 sh /tmp/splunk-otel-collector.sh --with-instrumentation --realm <SPLUNK_REALM> -- <SPLUNK_ACCESS_TOKEN>
 
-                            .. note:: If you wish to collect logs for the target host, make sure Fluentd is installed and enabled in your Collector instance by specifying the ``--with-fluentd`` option. 
 
                         The system-wide zero-code instrumentation method automatically adds environment variables to ``/etc/splunk/zeroconfig/node.conf``.
 
@@ -257,8 +252,6 @@ Using the installer script, you can install and activate zero-code instrumentati
                             
                             The ``systemd`` zero-code instrumentation method automatically adds environment variables to ``/usr/lib/systemd/system.conf.d/00-splunk-otel-auto-instrumentation.conf``.
 
-                            .. note:: If you wish to collect logs for the target host, make sure Fluentd is installed and enabled in your Collector instance by specifying the ``--with-fluentd`` option.
-
                         You can activate AlwaysOn Profiling for CPU and memory, as well as metrics, using additional options, as in the following example:
 
                         .. code-block:: bash
@@ -309,8 +302,6 @@ Using the installer script, you can install and activate zero-code instrumentati
                             curl -sSL https://dl.signalfx.com/splunk-otel-collector.sh > /tmp/splunk-otel-collector.sh && \
                             sudo sh /tmp/splunk-otel-collector.sh --with-instrumentation --realm <SPLUNK_REALM> -- <SPLUNK_ACCESS_TOKEN>
 
-                        .. note:: If you wish to collect logs for the target host, make sure Fluentd is installed and enabled in your Collector instance by specifying the ``--with-fluentd`` option.
-
                         The system-wide zero-code instrumentation method automatically adds environment variables to ``/etc/splunk/zeroconfig/dotnet.conf``.
 
                         To automatically define the optional ``deployment.environment`` resource attribute at installation time, run the installer script with the ``--deployment-environment <env>`` option. Replace ``<env>`` with the desired attribute value, for example, ``prod``, as shown in the following example:
@@ -345,8 +336,6 @@ Using the installer script, you can install and activate zero-code instrumentati
                                 
                         The ``systemd`` instrumentation automatically adds environment variables to ``/usr/lib/systemd/system.conf.d/00-splunk-otel-auto-instrumentation.conf``.
 
-                        .. note:: If you wish to collect logs for the target host, make sure Fluentd is installed and enabled in your Collector instance by specifying the ``--with-fluentd`` option. 
-
                         To automatically define the optional ``deployment.environment`` resource attribute at installation time, run the installer script with the ``--deployment-environment <env>`` option. Replace ``<env>`` with the desired attribute value, for example, ``prod``, as shown in the following example:
 
                         .. code-block:: bash

gdi/get-data-in/get-data-in.rst

@@ -66,7 +66,6 @@ After you've installed the Collector, navigate to /etc/otel/collector to find th
    .
    |-- agent_config.yaml
    |-- config.d
-   |-- fluentd
    |-- gateway_config.yaml
    |-- splunk-otel-collector.conf
    |-- splunk-otel-collector.conf.example

gdi/opentelemetry/automatic-discovery/linux/linux-backend.rst

@@ -96,14 +96,6 @@ The following table describes the variables that can be configured for this role
      - The amount of allocated memory in MiB. The default value is ``512``, or 500 x 2^20 bytes, of memory .
    * - ``splunk_ballast_size_mib``
      - ``splunk_ballast_size_mib`` is deprecated starting on Collector version 0.97.0. If you're using it, see :ref:`how to update your configuration <collector-upgrade-memory-ballast>`.
-   * - ``install_fluentd``
-     - The option to install or manage Fluentd and dependencies for log collection. The dependencies include ``capng_c`` for activating Linux capabilities, ``fluent-plugin-systemd`` for systemd journal log collection, and the required libraries or development tools. The default value is ``false``.
-   * - ``td_agent_version``
-     - The version of td-agent (Fluentd package) that is installed. The default value is ``3.3.0`` for Debian jessie, ``3.7.1`` for Debian stretch, and ``4.3.0`` for other distros.
-   * - ``splunk_fluentd_config``
-     - The path to the Fluentd configuration file on the remote host. The default location is ``/etc/otel/collector/fluentd/fluent.conf``.
-   * - ``splunk_fluentd_config_source``
-     - The source path to a Fluentd configuration file on your control host that is uploaded and set in place of the value set in ``splunk_fluentd_config`` on remote hosts. Use this variable to submit a custom Fluentd configuration, for example, ``./custom_fluentd_config.conf``. The default value is ``""``, which means that nothing is copied and the configuration file set with ``splunk_otel_collector_config`` is used.
 
 .. _ansible-zero-config:
 

gdi/opentelemetry/collector-linux/collector-configuration-tutorial/collector-config-tutorial-start.rst

@@ -112,18 +112,6 @@ For Linux, the cookbook accepts the attributes described in the following table:
    * - ``package_stage``
      - The Collector package repository stage to use. Can be ``release``, ``beta``, or ``test``.
      - ``release``
-   * - ``with_fluentd``
-     - Whether to install or manage Fluentd and dependencies for log collection. On Linux, the dependencies include ``capng_c`` for activating Linux capabilities, ``fluent-plugin-systemd`` for systemd journal log collection, and the required libraries and development tools.
-     - ``false``
-   * - ``fluentd_version``
-     -  Version of the td-agent (Fluentd) package to install 
-     -  ``3.7.1`` for Debian stretch and ``4.3.1`` for all other Linux distros 
-   * - ``fluentd_config_source``
-     - Source path to the Fluentd configuration file. This file is copied to the ``$fluentd_config_dest`` path on the node. See the :new-page:`source attribute <https://puppet.com/docs/puppet/latest/types/file.html#file-attribute-source>` of the file resource for the supported value types. The default source file is provided by the Collector package. Only applicable if ``$with_fluentd`` is set to ``true``.
-     - ``/etc/otel/collector/fluentd/fluent.conf``
-   * - ``fluentd_config_dest``
-     - Destination path to the Fluentd configuration file on the node. Only applicable if ``$with_fluentd`` is set to ``true``.
-     - ``/etc/otel/collector/fluentd/fluent.conf``
 
 .. _chef-zero-config:
 

gdi/opentelemetry/collector-linux/deployments-linux-ansible.rst

@@ -101,18 +101,6 @@ The class accepts the parameters described in the following table:
    * - ``service_user and $service_group``
      - Sets the user or group ownership for the Collector service. The user or group is created if they do not exist.
      - ``splunk-otel-collector``
-   * - ``with_fluentd``
-     - Whether to install or manage Fluentd and dependencies for log collection. On Linux, the dependencies include ``capng_c`` for activating Linux capabilities, ``fluent-plugin-systemd`` for systemd journal log collection, and the required libraries and development tools.
-     - ``false``
-   * - ``fluentd_config_source``
-     - Source path to the Fluentd configuration file. This file is copied to the ``$fluentd_config_dest`` path on the node. See the :new-page:`source attribute <https://puppet.com/docs/puppet/latest/types/file.html#file-attribute-source>` of the file resource for the supported value types. The default source file is provided by the Collector package. Only applicable if ``$with_fluentd`` is set to ``true``.
-     - ``/etc/otel/collector/fluentd/fluent.conf``
-   * - ``fluentd_config_dest``
-     - Destination path to the Fluentd configuration file on the node. Only applicable if ``$with_fluentd`` is set to ``true``.
-     - ``/etc/otel/collector/fluentd/fluent.conf``
-   * - ``manage_repo`` 
-     - In cases where the Collector and Fluentd apt/yum repositories are managed externally, set this to ``false`` to deactivate management of the repositories by this module. If set to ``false``, the externally managed repositories should provide the ``splunk-otel-collector`` and ``td-agent`` packages. Also, the apt (``/etc/apt/sources.list.d/splunk-otel-collector.list`` and ``/etc/apt/sources.list.d/splunk-td-agent.list``) and yum (``/etc/yum.repos.d/splunk-otel-collector.repo`` and ``/etc/yum.repos.d/splunk-td-agent.repo``) repository definition files are deleted if they exist in order to avoid any conflicts.
-     - ``true``
 
 .. _puppet-zero-config: