Merge pull request #2300 from splunk/revert-2298-urbiz-OD6367-common-config-2

Revert "[6367]: Collector common config"

Author: aurbiztondo-splunk

_includes/gdi/collector-common-options.rst

@@ -1,7 +1,6 @@
-The Splunk Distribution of the OpenTelemetry Collector has the following :ref:`configuration options <collector-common-config>` than can be used by several :ref:`otel-components`.
+The Splunk Distribution of the OpenTelemetry Collector has the following configuration options than can be used by several :ref:`otel-components`.
 
 * :ref:`collector-common-config-auth`
 * :ref:`collector-common-config-grcp`
-* :ref:`collector-common-config-http`
 * :ref:`collector-common-config-net`
 * :ref:`collector-common-config-tls`

gdi/opentelemetry/collector-common-config.rst

@@ -14,7 +14,6 @@ Common configuration options
 
     Authentication settings <common-config/collector-common-config-auth.rst>
     gRCP settings <common-config/collector-common-config-grcp.rst>
-    HTTP settings <common-config/collector-common-config-http.rst>
     Network settings <common-config/collector-common-config-net.rst>
     TLS settings <common-config/collector-common-config-tls.rst>
 

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

@@ -33,8 +33,6 @@ See the default settings and configuration options at:
 * :ref:`otel-linux-config`
 * By default, you'll obtain these :ref:`metrics <ootb-metrics-windows>` 
 
-.. include:: /_includes/gdi/collector-common-options.rst
-
 To upgrade or uninstall, see:
 
 * :ref:`otel-linux-upgrade` 

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

@@ -34,8 +34,6 @@ See the default settings and configuration options at:
 * :ref:`otel-windows-config`
 * By default, you'll obtain these :ref:`metrics <ootb-metrics-windows>` 
 
-.. include:: /_includes/gdi/collector-common-options.rst
-
 To upgrade or uninstall, see:
 
 * :ref:`otel-windows-upgrade`

gdi/opentelemetry/common-config/collector-common-config-http.rst

@@ -77,7 +77,7 @@ The following settings are required to configure the extension:
 
   * If void, there is no timeout on the client.
 
-For more information on the client side TLS settings, see :ref:`collector-common-config-tls`.
+For more information on the client side TLS settings, see :new-page:`TLS configuration settings <https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/configtls>` in GitHub. 
 
 .. _oauth2client-extension-example:
 

gdi/opentelemetry/components/oauth2client-extension.rst

@@ -89,7 +89,7 @@ To allow the receiver to work with client extensions, add the following in the C
 * :new-page:`OIDC Authentication <https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/oidcauthextension>`
 * :new-page:`OAuth 2 client <https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/oauth2clientauthextension>`
 
-For advanced users, you can implement your own authentication extension to fulfill your requirements using the :new-page:`open-telemetry auth Go package <https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/auth>` and :ref:`collector-common-config-tls`.
+For advanced users, you can implement your own authentication extension to fulfill your requirements using the :new-page:`open-telemetry auth Go package <https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/auth>` and the :new-page:`configauth Go package <https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/configauth>`.
 
 Settings
 ======================

gdi/opentelemetry/components/splunk-hec-receiver.rst

@@ -117,8 +117,6 @@ Use these configurations to change the default settings in each Collector packag
 * :ref:`otel-linux-config`
 * :ref:`otel-windows-config`
 
-.. include:: /_includes/gdi/collector-common-options.rst
-
 .. raw:: html
 
   <embed>