WIP

aurbiztondo-splunk · aurbiztondo-splunk · commit 3245270cd434 · 2024-07-08T06:56:23.000+02:00
diff --git a/_includes/gdi/collector-linux-next-steps.rst b/_includes/gdi/collector-linux-next-steps.rst
@@ -0,0 +1,6 @@
+After you have installed the package, see:
+
+* :ref:`linux-config-ootb`.
+* :ref:`otel-linux-config`.
+* :ref:`collector-how-to`.
+* :ref:`use-navigators-imm`.
diff --git a/gdi/opentelemetry/collector-linux/collector-linux-intro.rst b/gdi/opentelemetry/collector-linux/collector-linux-intro.rst
@@ -25,12 +25,13 @@ To install and configure the Splunk Distribution of the OpenTelemetry Collector
 
 * :ref:`otel-install-linux`
 * :ref:`otel-install-linux-manual`
-* :ref:`linux-config-ootb`
-* By default, you'll obtain these :ref:`metrics <ootb-metrics-linux>` 
+* :ref:`otel-install-linux-tools` 
 
-For advanced configuration options, see:
+See the default settings and configuration options at:
 
+* :ref:`linux-config-ootb`
 * :ref:`otel-linux-config`
+* By default, you'll obtain these :ref:`metrics <ootb-metrics-windows>` 
 
 To upgrade or uninstall, see:
 
@@ -39,6 +40,3 @@ To upgrade or uninstall, see:
 
 .. note:: If you have any installation or configuration issues, refer to :ref:`otel-troubleshooting`.
 
-For a walkthrough of common tasks related to the OpenTelemetry Collector for Kubernetes, see:
-
-* :ref:`about-collector-configuration-tutorial`
diff --git a/gdi/opentelemetry/collector-linux/deployments-linux-ansible.rst b/gdi/opentelemetry/collector-linux/deployments-linux-ansible.rst
@@ -155,4 +155,7 @@ The following table shows the variables that you can configure for this Ansible
      - Activates or deactivates JVM metrics. 
      - ``false``
 
+Next steps
+==================================
 
+.. include:: /_includes/gdi/collector-linux-next-steps.rst
diff --git a/gdi/opentelemetry/collector-linux/deployments-linux-chef.rst b/gdi/opentelemetry/collector-linux/deployments-linux-chef.rst
@@ -178,3 +178,7 @@ The following table shows the variables that can be configured with this Chef co
      - The path to the pre-installed ``npm`` command, e.g. ``/my/custom/path/to/npm``.
      - ``npm``
 
+Next steps
+==================================
+
+.. include:: /_includes/gdi/collector-linux-next-steps.rst
diff --git a/gdi/opentelemetry/collector-linux/deployments-linux-puppet.rst b/gdi/opentelemetry/collector-linux/deployments-linux-puppet.rst
@@ -166,3 +166,8 @@ The following table shows the variables that you can configure for this Puppet m
    * - ``auto_instrumentation_npm_path``
      - The path to the pre-installed ``npm`` command required to install the Node.js SDK. For example, ``/my/custom/path/to/npm``.
      - ``npm``
+
+Next steps
+==================================
+
+.. include:: /_includes/gdi/collector-linux-next-steps.rst
diff --git a/gdi/opentelemetry/collector-linux/deployments-linux-salt.rst b/gdi/opentelemetry/collector-linux/deployments-linux-salt.rst
@@ -172,3 +172,8 @@ The following table shows the variables that can be configured for this Salt mod
    * - ``auto_instrumentation_enable_metrics``
      - Activates or deactivates instrumentation metrics.
      - ``false``
+
+Next steps
+==================================
+
+.. include:: /_includes/gdi/collector-linux-next-steps.rst
diff --git a/gdi/opentelemetry/collector-linux/install-linux-manual.rst b/gdi/opentelemetry/collector-linux/install-linux-manual.rst
@@ -478,8 +478,4 @@ If you're running the Collector from a non-default location, the Smart Agent rec
 Next steps
 ==================================
 
-After you've installed the Collector, you can perform these actions:
-
-* Use :ref:`Infrastructure Monitoring <get-started-infrastructure>` to track the health of your infrastructure.
-* Use :ref:`APM <get-started-apm>` to monitor the performance of applications.
-* Use :ref:`Log Observer Connect <logs-intro-logconnect>` to analyze log events and troubleshoot issues with your services.
+.. include:: /_includes/gdi/collector-linux-next-steps.rst
diff --git a/gdi/opentelemetry/collector-linux/install-linux-tools.rst b/gdi/opentelemetry/collector-linux/install-linux-tools.rst
@@ -49,8 +49,8 @@ The following deployment tools to install the Splunk Distribution of the OpenTel
 
 * Use Splunk's Ansible role to install the package configured to collect data (metrics, traces, and logs) from Linux machines and send it to Splunk Observability Cloud. See :ref:`deployment-linux-ansible` for the instructions to download and customize the role.
 * Use Splunk's cookbook to install the Collector with Chef. See :ref:`deployments-linux-chef` for the installation instructions.
-* Use Nomad to deploy the Collector. To learn how to install Nomad, see :ref:`deployments-nomad`.
 * Use Splunk's Puppet module to install and configure the package. A module is a collection of resources, classes, files, definition, and templates. To learn how to download and customize the module, see :ref:`deployment-linux-puppet`.
+* Use Salt to deploy the Collector. For more information, see :ref:`deployments-linux-salt`.
 
 .. note:: See also :ref:`otel_deployments`.
   
@@ -60,7 +60,7 @@ The following deployment tools to install the Splunk Distribution of the OpenTel
     <h2>Next steps<a name="install-linux-next" class="headerlink" href="#install-linux-next" title="Permalink to this headline">¶</a></h2>
   </embed>
 
-NBED
+.. include:: /_includes/gdi/collector-linux-next-steps.rst
 
 
 
diff --git a/gdi/opentelemetry/collector-linux/install-linux.rst b/gdi/opentelemetry/collector-linux/install-linux.rst
@@ -273,10 +273,6 @@ To display all the configuration options supported by the script, use the ``-h``
    curl -sSL https://dl.signalfx.com/splunk-otel-collector.sh > /tmp/splunk-otel-collector.sh;
    sh /tmp/splunk-otel-collector.sh -h
 
-
-
-
-
 .. _linux-deployments:
 
 Install the Collector using deployment tools
@@ -354,13 +350,7 @@ Salt
 ---------------
 Splunk provides a Salt formula to install and configure the Collector. See :ref:`deployments-salt` for the instructions.
 
-
 Next steps
 ==================================
 
-After you've installed the package, you can perform these actions:
-
-* :ref:`Configure the Collector <otel-configuration>`.
-* Use :ref:`Infrastructure Monitoring <get-started-infrastructure>` to track the health of your infrastructure.
-* Use :ref:`APM <get-started-apm>` to monitor the performance of applications.
-* Use :ref:`Log Observer Connect <logs-intro-logconnect>` to analyze log events and troubleshoot issues with your services.
+.. include:: /_includes/gdi/collector-linux-next-steps.rst
diff --git a/gdi/opentelemetry/collector-windows/deployments-windows-ansible.rst b/gdi/opentelemetry/collector-windows/deployments-windows-ansible.rst
@@ -116,3 +116,8 @@ The following table describes the variables that can be configured for this role
      - The path to the Fluentd configuration file on the remote host. The default is ``%SYSTEMDRIVE%\opt\td-agent\etc\td-agent\td-agent.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.
+
+Next steps
+==================================
+
+.. include:: /_includes/gdi/collector-windows-next-steps.rst
diff --git a/gdi/opentelemetry/collector-windows/deployments-windows-chef.rst b/gdi/opentelemetry/collector-windows/deployments-windows-chef.rst
@@ -105,4 +105,9 @@ For example, if the Collector's configuration file includes references to ``${MY
 
 On Linux, the variables/values will be added to the ``/etc/otel/collector/splunk-otel-collector.conf`` systemd environment file. 
 
-On Windows, the variables/values will be added to the Environment value under the ``HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\splunk-otel-collector`` registry key.
+On Windows, the variables/values will be added to the Environment value under the ``HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\splunk-otel-collector`` registry key.
+
+Next steps
+==================================
+
+.. include:: /_includes/gdi/collector-windows-next-steps.rst
diff --git a/gdi/opentelemetry/collector-windows/deployments-windows-puppet.rst b/gdi/opentelemetry/collector-windows/deployments-windows-puppet.rst
@@ -91,3 +91,8 @@ The class accepts the parameters described in the following table:
    * - ``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``.
      - ``%PROGRAMFILES\Splunk\OpenTelemetry Collector\fluentd\td-agent.conf``
+
+Next steps
+==================================
+
+.. include:: /_includes/gdi/collector-windows-next-steps.rst
diff --git a/gdi/opentelemetry/collector-windows/install-windows-tools.rst b/gdi/opentelemetry/collector-windows/install-windows-tools.rst
@@ -51,7 +51,6 @@ The following deployment tools to install the Splunk Distribution of the OpenTel
 
 * Use Splunk's Ansible role to install the package configured to collect data (metrics, traces, and logs) from Windows machines and send it to Splunk Observability Cloud. See :ref:`deployment-windows-ansible` for the instructions to download and customize the role.
 * Use Splunk's cookbook to install the Collector with Chef. See :ref:`deployments-chef` for the installation instructions.
-* Use Nomad to deploy the Collector. To learn how to install Nomad, see :ref:`deployments-nomad`.
 * Use Splunk's Puppet module to install and configure the package. A module is a collection of resources, classes, files, definition, and templates. To learn how to download and customize the module, see :ref:`deployment-windows-puppet`.
 
 .. note:: See also :ref:`otel_deployments`.
diff --git a/gdi/opentelemetry/deployments/otel-deployments.rst b/gdi/opentelemetry/deployments/otel-deployments.rst
@@ -5,7 +5,7 @@ Other Collector deployment tools and options
 **************************************************
 
 .. meta::
-    :description: Options for deploying the Splunk Observability Cloud OpenTelemetry Collector: ECS/EC2, Fargate, Ansible, Chef, Nomad, Puppet, Salt.
+    :description: Options for deploying the Splunk Observability Cloud OpenTelemetry Collector: ECS/EC2, Fargate, Nomad, PFC.
 
 .. toctree::
     :maxdepth: 4
@@ -30,8 +30,8 @@ Use the following deployment and configuration management tools to automate the
 
 * :ref:`deployments-pivotal-cloudfoundry`
 
-See also the install options for each platform:
+See also the install options available for each platform:
 
 * :ref:`collector-kubernetes-intro` and :ref:`otel-install-k8s`
-* :ref:`collector-linux-intro` and :ref:`otel-install-linux`
-* :ref:`collector-windows-intro` and :ref:`otel-install-windows`
+* :ref:`collector-linux-intro` and :ref:`otel-install-linux`, including instructions on how to deploy using Ansible, Chef, Puppet and Salt
+* :ref:`collector-windows-intro` and :ref:`otel-install-windows`, including instructions on how to deploy using Ansible, Chef and Puppet
