Skip to content

Commit

Permalink
fix: remove squash on configtls.TLSClientSetting for observiqexporter (
Browse files Browse the repository at this point in the history
…#5540)

This PR removes squash on`configtls.TLSClientSetting` and update corresponding yaml file for observiqexporter.
See history [here](#5454)

**Link to tracking Issue:**
#5433
  • Loading branch information
Hyunuk Lim authored Oct 4, 2021
1 parent 9d6efde commit 79d95af
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

## 🛑 Breaking changes 🛑

- Remove squash on configtls.TLSClientSetting for observiqexporter (#5540)
- Remove squash on configtls.TLSClientSetting for AWS components (#5454)
- Move `k8sprocessor` to `k8sattributesprocessor`.
- Rename `k8s_tagger` configuration `k8sattributes`.
Expand Down
9 changes: 5 additions & 4 deletions exporter/observiqexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ The following configuration options can also be configured:
- `agent_id` (default: uuid generated from os.Hostname): ID for identifying the collector deployment. Ideally, this is a unique uuid, for uniquely identifying specific deployments of the agent. By default, this will be a uuid generated from the hostname. If the hostname cannot be determined, it will be `00000000-0000-0000-0000-000000000000`
- `agent_name` (default: os.Hostname): Name for identifying the collector deployment. This is the friendly name of the deployment. Defaults to the hostname; If the hostname cannot be determined, `otel collector` will be used as a fallback.
- `timeout` (default: `10s`): Http timeout when sending data.
- `insecure_skip_verify` (default: `false`): Whether to skip checking the certificate of the endpoint when sending data over HTTPS.
- `ca_file` (no default) Path to the CA cert to verify the server being connected to.
- `cert_file` (no default) Path to the TLS cert to use for client connections when TLS client auth is required.
- `key_file` (no default) Path to the TLS key to use for TLS required connections.
- `tls`:
- `insecure_skip_verify` (default: `false`): Whether to skip checking the certificate of the endpoint when sending data over HTTPS.
- `ca_file` (no default) Path to the CA cert to verify the server being connected to.
- `cert_file` (no default) Path to the TLS cert to use for client connections when TLS client auth is required.
- `key_file` (no default) Path to the TLS key to use for TLS required connections.

In addition, this exporter offers queued retry which is enabled by default.
Information about queued retry configuration parameters can be found
Expand Down
2 changes: 1 addition & 1 deletion exporter/observiqexporter/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type Config struct {
exporterhelper.QueueSettings `mapstructure:"sending_queue"`
exporterhelper.RetrySettings `mapstructure:"retry_on_failure"`
// TLS Settings for http client to use when sending logs to endpoint
TLSSetting configtls.TLSClientSetting `mapstructure:",squash"`
TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"`
// API key for authenticating with ingestion endpoint (required if no SecretKey)
APIKey string `mapstructure:"api_key"`
// Secret key for authenticating with the ingestion endpoint (required if no APIKey)
Expand Down
7 changes: 4 additions & 3 deletions exporter/observiqexporter/testdata/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ exporters:
timeout: 10s
agent_id: "08e097a6-8580-43f6-b4f5-9d3b4eb2d962"
agent_name: "otel-collector-1"
ca_file: ""
cert_file: ""
key_file: ""
tls:
ca_file: ""
cert_file: ""
key_file: ""
sending_queue:
enabled: true
num_consumers: 2
Expand Down

0 comments on commit 79d95af

Please sign in to comment.