Merge pull request #2481 from splunk/urbiz-OD6472-autodiscovery-linux

[6472]: AD for Linux improvements

Author: aurbiztondo-splunk

_includes/gdi/auto-discovery-intro.rst

@@ -1,11 +1,3 @@
-The Splunk Distribution of the OpenTelemetry Collector can automatically identify data sources and collect metrics and traces to send them to Splunk Observability Cloud. With automatic discovery and zero-code instrumentation you don't need to manually configure the Splunk Distribution of the OpenTelemetry Collector or your applications before deploying them: 
+Automatic discovery detects and collects signal data from third-party services, such as databases and web servers. Through auto discovery the Collector automatically generates a configuration snipet that you can modify and incorporate into your existing configuration to retrieve your services' data. Auto discovery of services is only available for the Collector in Linux and Kubernetes environments. 
 
-* Automatic discovery detects and collects signal data from third-party services, such as databases and web servers. Through auto discovery the Collector automatically generates a configuration snipet that you can modify and incorporate into your existing configuration to retrieve your services' data. 
-
-* With automatic discovery you can also enable zero-code instrumentation, which allows the Collector to retrieve data from application language runtimes without having to modify the source application code or adding any new installation or configuration steps. With this option you won't have to install and configure your instrumentation agents separately. 
-
-.. caution:: 
-
-   Auto discovery of services is only available for the Collector in Linux and Kubernetes environments.
-
-   Zero-code instrumentation using the Collector's automatic discovery feature is only available for Java, Node.js, and .NET applications. If deployed independently from the Collector, zero-code instrumentation is supported for 8 back-end language runtimes. For more information, see :ref:`get-started-application`.
+With automatic discovery you can also enable zero-code instrumentation of back-end applications, which allows the Collector to retrieve data from application language runtimes without having to modify the source application code or adding any new installation or configuration steps. With this option you won't have to install and configure your instrumentation agents separately. Zero-code instrumentation using the Collector's automatic discovery feature is only available for the Java, Node.js, and .NET language runtimes. Alternatively you can deploy zero-code instrumentation independently from the Collector for 8 back-end languages, as described in :ref:`get-started-application`.

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

@@ -22,4 +22,6 @@ Automatic discovery for Linux
 
 To enable the Collector's zero-code instrumentation of back-end applications written in Java, Node.js, and .NET see :ref:`linux-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. 
 
-To use the Collector's automatic discovery and configuration of third-party applications in Linux environments see :ref:`linux-third-party`. With this option you'll only have to reuse a config file automatically generated by the Collector. 
+To use the Collector's automatic discovery and configuration of third-party applications in Linux environments see :ref:`linux-third-party`. With this option you'll only have to reuse a config file automatically generated by the Collector. 
+
+For advanced auto discovery configuration see :ref:`linux-advanced-auto-discovery-config`.

gdi/opentelemetry/automatic-discovery/linux/linux-advanced-config.rst

@@ -1,22 +1,20 @@
 .. _linux-advanced-auto-discovery-config:
 
 *****************************************************************************
-Advanced customization for automatic discovery and instrumentation in Linux
+Advanced customization for automatic discovery in Linux
 *****************************************************************************
 
 .. meta:: 
     :description: Learn how to customize your deployment of automatic discovery and instrumentation in a Linux environment.
 
-Learn how to customize automatic discovery and instrumentation for advanced scenarios. 
+Learn how to customize automatic discovery and zero-code instrumentation for advanced scenarios. 
 
 Through advanced customization, you can achieve the following tasks:
 
 * :ref:`Override automatic instrumentation settings <override-default-settings-linux>`
 * :ref:`Use automatic discovery with gateway mode <use-with-gateway-linux>`
 * :ref:`Customize discovery settings for third-party applications <customize-third-party-settings-linux>`
 
-.. note:: For advanced customization options in Kubernetes, see :ref:`k8s-advanced-auto-discovery-config`.
-
 .. _override-default-settings-linux:
 
 Override default automatic instrumentation settings
@@ -76,6 +74,8 @@ To activate runtime metrics collection for an individual language, follow these
 #. Set the environment variable ``SPLUNK_METRICS_ENABLED=true``.
 #. Restart your applications.
 
+
+
 .. _use-with-gateway-linux:
 
 Use automatic discovery with gateway mode

gdi/opentelemetry/collector-kubernetes/collector-kubernetes-intro.rst

@@ -37,30 +37,32 @@ To install, configure and use the Splunk Distribution of the Collector for Kuber
     <h2>Install the Collector for Kubernetes<a name="k8s-install" class="headerlink" href="#k8s-install" title="Permalink to this headline">¶</a></h2>
   </embed>
 
-To install the Splunk Distribution of the OpenTelemetry Collector for Kubernetes using the Helm chart, read and follow these docs:
+To install the Splunk Distribution of the OpenTelemetry Collector for Kubernetes using the Helm chart read and follow these docs:
 
 * :ref:`otel-install-k8s`
 * :ref:`kubernetes-helm-architecture`
 * :ref:`kubernetes-helm-releases`
 
+.. note:: By default you'll obtain these :ref:`Kubernetes metrics <ootb-metrics-k8s>`. 
+
 Optionally, you can also:
 
 * :ref:`otel-install-k8s-manifests`
 * :ref:`Deploy the Collector as an AWS EKS Add-on <install-k8s-addon-eks>`
-
-.. note:: By default, you'll obtain these :ref:`Kubernetes metrics <ootb-metrics-k8s>`. 
+* Deploy the Collector using the Technical Add-on, which provides out-of-the box Collector content and configuration. Learn more at :ref:`collector-addon-intro`
 
 .. raw:: html
 
   <embed>
     <h2>Configure the Collector for Kubernetes<a name="k8s-configure" class="headerlink" href="#k8s-configure" title="Permalink to this headline">¶</a></h2>
   </embed>
 
-To configure the Collector, including adding additional components or activating automatic discovery, see:
+.. note:: To deploy the Collector for Kubernetes and automatically find services and applications running in your environment refer to :ref:`discovery-kubernetes`.   
+
+To configure the Collector see:
 
 * :ref:`otel-kubernetes-config`
 * :ref:`kubernetes-config-add` 
-* :ref:`discovery-mode-k8s`
 * :ref:`kubernetes-config-logs`
 * :ref:`otel-kubernetes-config-advanced`
 
@@ -72,7 +74,7 @@ To configure the Collector, including adding additional components or activating
     <h2>Upgrade, uninstall and troubleshoot<a name="k8s-ts" class="headerlink" href="#k8s-ts" title="Permalink to this headline">¶</a></h2>
   </embed>
 
-To upgrade or uninstall, see:
+To upgrade or uninstall the Collector see:
 
 * :ref:`otel-kubernetes-upgrade`
 * :ref:`otel-kubernetes-uninstall`

gdi/opentelemetry/collector-linux/collector-linux-intro.rst

@@ -24,11 +24,26 @@ Get started with the Collector for Linux
 
 To install and configure the Splunk Distribution of the OpenTelemetry Collector for Linux, follow these docs:
 
+.. raw:: html
+
+  <embed>
+    <h2>Install the Collector for Linux<a name="linux-install" class="headerlink" href="#linux-install" title="Permalink to this headline">¶</a></h2>
+  </embed>
+
+To install the Splunk Distribution of the OpenTelemetry Collector for Linux you have the following options:
+
 * :ref:`otel-install-linux`
 * :ref:`otel-install-linux-manual`
 * :ref:`otel-install-linux-tools` 
+* You can also deploy the Collector using the Technical Add-on, which provides out-of-the box Collector content and configuration. Learn more at :ref:`collector-addon-intro`.
+
+.. raw:: html
+
+  <embed>
+    <h2>Configure the Collector for Linux<a name="linux-configure" class="headerlink" href="#linux-configure" title="Permalink to this headline">¶</a></h2>
+  </embed>
 
-.. note:: You can also deploy the Collector using the Technical Add-on, which provides out-of-the box Collector content and configuration. Learn more at :ref:`collector-addon-intro`.
+.. note:: To deploy the Collector for Linux and automatically find services and applications running in your environment refer to :ref:`discovery-linux`.   
 
 See the default settings and configuration options at:
 
@@ -39,11 +54,23 @@ See the default settings and configuration options at:
 
 .. include:: /_includes/gdi/collector-common-options.rst
 
-To upgrade or uninstall, see:
+.. raw:: html
+
+  <embed>
+    <h2>Upgrade, uninstall and troubleshoot<a name="linux-ts" class="headerlink" href="#linux-ts" title="Permalink to this headline">¶</a></h2>
+  </embed>
+
+To upgrade or uninstall the Collector see:
 
 * :ref:`otel-linux-upgrade` 
 * :ref:`otel-linux-uninstall`
 
-.. note:: If you have any installation or configuration issues, refer to :ref:`otel-troubleshooting`.
+If you have any installation or configuration issues refer to :ref:`otel-troubleshooting`.
+
+.. raw:: html
+
+  <embed>
+    <h2>Tutorials<a name="linux-tutorials" class="headerlink" href="#linux-tutorials" title="Permalink to this headline">¶</a></h2>
+  </embed>
 
 For a walkthrough of common tasks related to the OpenTelemetry Collector for Linux see: :ref:`about-collector-configuration-tutorial`.

gdi/opentelemetry/collector-linux/install-linux.rst

@@ -92,7 +92,7 @@ Configure automatic discovery for back-end applications
 
 You can also automatically instrument your Java, Node.js, and .NET applications along with the Collector installation. Automatic discovery removes the need to configure receivers for each back-end application. See :ref:`linux-backend-auto-discovery` for the installation instructions. 
 
-For more information on instrumentation, see: 
+For more information on APM instrumentation, see: 
 
 * :ref:`get-started-java` 
 * :ref:`get-started-nodejs`
@@ -143,7 +143,7 @@ To use host bindings, run this command:
 Options of the installer script of the Collector for Linux
 ==================================================================
 
-The Linux installer script supports the following options for the Collector, Automatic Discovery for back-end services and Fluentd.
+The Linux installer script supports the following options for the Collector, automatic discovery for back-end services and Fluentd.
 
 To display all the configuration options supported by the script, use the ``-h`` flag.
 

gdi/opentelemetry/collector-linux/linux-config.rst

@@ -29,3 +29,4 @@ You can view the ``splunk-otel-collector`` service logs and errors in the system
   sudo journalctl -u splunk-otel-collector   
 
 .. note:: See :ref:`about-collector-configuration-tutorial` to learn how to configure the Collector.
+

gdi/opentelemetry/collector-windows/collector-windows-intro.rst

@@ -28,6 +28,7 @@ To install the Splunk Distribution of the OpenTelemetry Collector for Windows, f
 * :ref:`otel-install-windows-msi` 
 * :ref:`otel-install-windows-tools`
 * :ref:`otel-install-windows-manual`
+* You can also deploy the Collector using the Technical Add-on, which provides out-of-the box Collector content and configuration. Learn more at :ref:`collector-addon-intro`.
 
 See the default settings and configuration options at:
 
@@ -38,6 +39,8 @@ See the default settings and configuration options at:
 
 .. include:: /_includes/gdi/collector-common-options.rst
 
+To automatically find services and applications running in your Windows environment and send data from them to Splunk Observability Cloud refer to :ref:`discovery-windows`.        
+
 To upgrade or uninstall, see:
 
 * :ref:`otel-windows-upgrade`

gdi/opentelemetry/discovery-mode.rst

@@ -14,7 +14,7 @@ Automatic discovery of apps and services
    Linux <automatic-discovery/discovery-linux>
    Windows <automatic-discovery/discovery-windows>
 
-.. include:: /_includes/gdi/auto-discovery-intro.rst
+The Splunk Distribution of the OpenTelemetry Collector can automatically identify data sources and collect metrics and traces to send them to Splunk Observability Cloud. With automatic discovery and zero-code instrumentation you don't need to manually configure the Splunk Distribution of the OpenTelemetry Collector or your applications before deploying them. 
 
 The following diagram shows how automatic discovery finds data sources:
 
@@ -33,6 +33,8 @@ The following diagram shows how automatic discovery finds data sources:
 
       X --> Y --> Z
 
+.. include:: /_includes/gdi/auto-discovery-intro.rst
+
 .. raw:: html
 
   <h2>Supported host services and applications for automatic discovery</h2>