Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.

Commit 7e60196

Browse files
Merge pull request #2298 from splunk/urbiz-OD6367-common-config-2
[6367]: Collector common config
2 parents 93c82ba + 12eedbb commit 7e60196

File tree

8 files changed

+42
-3
lines changed

8 files changed

+42
-3
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
The Splunk Distribution of the OpenTelemetry Collector has the following configuration options than can be used by several :ref:`otel-components`.
1+
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`.
22

33
* :ref:`collector-common-config-auth`
44
* :ref:`collector-common-config-grcp`
5+
* :ref:`collector-common-config-http`
56
* :ref:`collector-common-config-net`
67
* :ref:`collector-common-config-tls`

gdi/opentelemetry/collector-common-config.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Common configuration options
1414

1515
Authentication settings <common-config/collector-common-config-auth.rst>
1616
gRCP settings <common-config/collector-common-config-grcp.rst>
17+
HTTP settings <common-config/collector-common-config-http.rst>
1718
Network settings <common-config/collector-common-config-net.rst>
1819
TLS settings <common-config/collector-common-config-tls.rst>
1920

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ See the default settings and configuration options at:
3333
* :ref:`otel-linux-config`
3434
* By default, you'll obtain these :ref:`metrics <ootb-metrics-windows>`
3535

36+
.. include:: /_includes/gdi/collector-common-options.rst
37+
3638
To upgrade or uninstall, see:
3739

3840
* :ref:`otel-linux-upgrade`

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ See the default settings and configuration options at:
3434
* :ref:`otel-windows-config`
3535
* By default, you'll obtain these :ref:`metrics <ootb-metrics-windows>`
3636

37+
.. include:: /_includes/gdi/collector-common-options.rst
38+
3739
To upgrade or uninstall, see:
3840

3941
* :ref:`otel-windows-upgrade`
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
.. _collector-common-config-http:
2+
3+
*********************************************************************************
4+
Configure HTTP
5+
*********************************************************************************
6+
7+
Crypto TLS exposes a variety of settings you can adjust within individual receivers or exporters of the Collector.
8+
9+
10+
11+
Configure TLS / mTLS
12+
=============================================================================================
13+
14+
15+
16+
Required settings
17+
---------------------------------
18+
19+
20+
Additional settings
21+
---------------------------------
22+
23+
Certificate authority
24+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
25+
26+
27+
28+
Learn more
29+
=============================================================================================
30+
31+
For more details on the available settings refer to :new-page:`HTTP Configuration Settings <https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp>` in OTel's GitHub repo.

gdi/opentelemetry/components/oauth2client-extension.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ The following settings are required to configure the extension:
7777

7878
* If void, there is no timeout on the client.
7979

80-
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.
80+
For more information on the client side TLS settings, see :ref:`collector-common-config-tls`.
8181

8282
.. _oauth2client-extension-example:
8383

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ To allow the receiver to work with client extensions, add the following in the C
8989
* :new-page:`OIDC Authentication <https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/oidcauthextension>`
9090
* :new-page:`OAuth 2 client <https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/oauth2clientauthextension>`
9191

92-
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>`.
92+
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`.
9393

9494
Settings
9595
======================

gdi/opentelemetry/install-the-collector.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ Use these configurations to change the default settings in each Collector packag
117117
* :ref:`otel-linux-config`
118118
* :ref:`otel-windows-config`
119119

120+
.. include:: /_includes/gdi/collector-common-options.rst
121+
120122
.. raw:: html
121123

122124
<embed>

0 commit comments

Comments
 (0)