Merge pull request #1615 from splunk/repo-sync

Pulling refs/heads/main into main

Author: aurbiztondo-splunk

gdi/opentelemetry/splunk-collector-troubleshooting.rst

@@ -7,11 +7,13 @@ Troubleshoot the Splunk OpenTelemetry Collector
 .. meta::
       :description: Describes known issues when using the Splunk Distribution of OpenTelemetry Collector.
 
+.. caution:: Splunk only provides best-effort support for the upstream OpenTelemetry Collector. 
+
 See the following issues and workarounds for the Splunk Distribution of the OpenTelemetry Collector.
 
-.. note:: See also the :new-page:`OpenTelemetry Project troublehooting docs <https://opentelemetry.io/docs/collector/troubleshooting>`.
+To understand how the Collector implements security see :ref:`otel-security`.
 
-.. caution:: Splunk only provides best-effort support for the upstream OpenTelemetry Collector. 
+To learn about the Collector's internal logs and other telemetry refer to the OpenTelemetry project :new-page:`Internal telemetry <https://opentelemetry.io/docs/collector/internal-telemetry/>` documentation.
 
 The Collector isn't behaving as expected
 =================================================

gdi/opentelemetry/troubleshoot-logs.rst

@@ -9,16 +9,27 @@ Troubleshoot log collection
 
 This document describes common issues related to log collection with the Collector.
 
-.. note:: 
-  
-  To collect logs see:
-
-  * :ref:`kubernetes-config-logs`
-  * :ref:`linux-config-logs`
-  * :ref:`windows-config-logs`
-  
 To troubleshoot the health and performance of the Collector see the :new-page:`OpenTelemetry Project troublehooting docs <https://opentelemetry.io/docs/collector/troubleshooting>`. It includes information about troubleshooting tools and debugging.
 
+For more information on log collection see:
+
+.. list-table::
+    :width: 100%
+    :widths: 25 75
+    :header-rows: 1
+
+    * - Platform
+      - Docs
+
+    * - Kubernetes
+      - :ref:`kubernetes-config-logs`
+
+    * - Linux
+      - :ref:`linux-config-logs`
+
+    * - Windows
+      - :ref:`windows-config-logs`
+  
 My source isn't generating logs
 =========================================
 

gdi/opentelemetry/troubleshooting.rst

@@ -13,10 +13,10 @@ Troubleshoot the Collector
     :hidden:
 
     General troubleshooting <splunk-collector-troubleshooting.rst>
-    Logs troubleshooting <troubleshoot-logs.rst>
+    Troubleshoot log collection <troubleshoot-logs.rst>
     Support checklist <support-checklist.rst>
 
-.. note:: To activate the Collector's debug logging, see the :new-page:`OpenTelemetry project documentation in GitHub <https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/troubleshooting.md#logs>`.
+.. note:: To learn about the Collector's internal logs and other telemetry refer to the OpenTelemetry project :new-page:`Internal telemetry <https://opentelemetry.io/docs/collector/internal-telemetry/>` documentation.
 
 Here are some common issues that you might encounter when using the OpenTelemetry Collector and the Splunk Distribution of the OpenTelemetry Collector, and tips on how to address them. 
 
@@ -25,9 +25,11 @@ Here are some common issues that you might encounter when using the OpenTelemetr
 * :ref:`otel-support-checklist`
 * :ref:`support`
 
-To :ref:`troubleshoot-k8s-landing`, see:
+For :ref:`troubleshooting specific to the Collector for Kubernetes <troubleshoot-k8s-landing>` see:
 
 * :ref:`troubleshoot-k8s`
 * :ref:`troubleshoot-k8s-sizing`
 * :ref:`troubleshoot-k8s-missing-metrics`
-* :ref:`troubleshoot-k8s-container`
+* :ref:`troubleshoot-k8s-container`
+
+