Skip to content

Commit d073e11

Browse files
committed
Update configs+readmes to reflect de-squash of tls
1 parent 1f91c27 commit d073e11

File tree

8 files changed

+30
-18
lines changed

8 files changed

+30
-18
lines changed

examples/demo/otel-collector-config.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ exporters:
1717

1818
jaeger:
1919
endpoint: jaeger-all-in-one:14250
20-
insecure: true
20+
tls:
21+
insecure: true
2122

2223
processors:
2324
batch:

exporter/elasticexporter/README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ exporters:
5454
exporters:
5555
otlp/elastic:
5656
endpoint: "localhost:8200"
57-
insecure: true
57+
tls:
58+
insecure: true
5859
```
5960

6061
## Migration
@@ -121,6 +122,7 @@ Complete documentation is available on [Elastic.co](https://www.elastic.co/guide
121122
- `apm_server_url` (required): Elastic APM Server URL.
122123
- `api_key` (optional): credential for API Key authorization, if enabled in Elastic APM Server.
123124
- `secret_token` (optional): credential for Secret Token authorization, if enabled in Elastic APM Server.
125+
#### The below options all belong beneath the `tls` header
124126
- `ca_file` (optional): root Certificate Authority (CA) certificate, for verifying the server's identity, if TLS is enabled.
125127
- `cert_file` (optional): client TLS certificate.
126128
- `key_file` (optional): client TLS key.

exporter/jaegerexporter/README.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The following settings are required:
1313
using the gRPC protocol. The valid syntax is described
1414
[here](https://github.com/grpc/grpc/blob/master/doc/naming.md)
1515

16-
By default, TLS is enabled:
16+
By default, TLS is enabled and must be configured under `tls`:
1717

1818
- `insecure` (default = `false`): whether to enable client transport security for
1919
the exporter's connection.
@@ -31,11 +31,13 @@ Example:
3131
exporters:
3232
jaeger:
3333
endpoint: jaeger-all-in-one:14250
34-
cert_file: file.cert
35-
key_file: file.key
34+
tls:
35+
cert_file: file.cert
36+
key_file: file.key
3637
jaeger/2:
3738
endpoint: jaeger-all-in-one:14250
38-
insecure: true
39+
tls:
40+
insecure: true
3941
```
4042
4143
## Advanced Configuration

exporter/loadbalancingexporter/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ exporters:
9696
protocol:
9797
otlp:
9898
timeout: 1s
99-
insecure: true
99+
tls:
100+
insecure: true
100101
resolver:
101102
static:
102103
hostnames:

exporter/loadbalancingexporter/example/otel-agent-config.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ exporters:
1212
protocol:
1313
otlp:
1414
timeout: 1s
15-
insecure: true
15+
tls:
16+
insecure: true
1617
resolver:
1718
static:
1819
hostnames:

exporter/opencensusexporter/README.md

+7-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The following settings are required:
1313
using the gRPC protocol. The valid syntax is described
1414
[here](https://github.com/grpc/grpc/blob/master/doc/naming.md)
1515

16-
By default, TLS is enabled:
16+
By default, TLS is enabled and must be configured under `tls`:
1717

1818
- `insecure` (default = `false`): whether to enable client transport security for
1919
the exporter's connection.
@@ -31,11 +31,13 @@ Example:
3131
exporters:
3232
opencensus:
3333
endpoint: opencensus2:55678
34-
cert_file: file.cert
35-
key_file: file.key
36-
otlp/2:
34+
tls:
35+
cert_file: file.cert
36+
key_file: file.key
37+
opencensus/2:
3738
endpoint: opencensus2:55678
38-
insecure: true
39+
tls:
40+
insecure: true
3941
```
4042
4143
## Advanced Configuration

exporter/zipkinexporter/README.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The following settings are required:
1212
- `endpoint` (no default): URL to which the exporter is going to send Zipkin trace data.
1313
- `format` (default = `JSON`): The format to sent events in. Can be set to `JSON` or `proto`.
1414

15-
By default, TLS is enabled:
15+
By default, TLS is enabled and must be configured under `tls`:
1616

1717
- `insecure` (default = `false`): whether to enable client transport security for
1818
the exporter's connection.
@@ -35,11 +35,13 @@ Example:
3535
exporters:
3636
zipkin:
3737
endpoint: "http://some.url:9411/api/v2/spans"
38-
cert_file: file.cert
39-
key_file: file.key
38+
tls:
39+
cert_file: file.cert
40+
key_file: file.key
4041
zipkin/2:
4142
endpoint: "http://some.url:9411/api/v2/spans"
42-
insecure: true
43+
tls:
44+
insecure: true
4345
```
4446
4547
## Advanced Configuration

receiver/jaegerreceiver/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ receivers:
7878
grpc:
7979
remote_sampling:
8080
endpoint: "jaeger-collector:14250"
81-
insecure: true
81+
tls:
82+
insecure: true
8283
```
8384

8485
Remote sampling can also be directly served by the collector by providing a

0 commit comments

Comments
 (0)