From c652828a01f120caac9257a3783a4953748a4502 Mon Sep 17 00:00:00 2001 From: Hyunuk Lim Date: Thu, 30 Sep 2021 18:28:11 -0700 Subject: [PATCH 1/3] fix: remove squash on configtls.TLSClientSetting for observiqexporter --- exporter/observiqexporter/config.go | 2 +- exporter/observiqexporter/testdata/config.yaml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/exporter/observiqexporter/config.go b/exporter/observiqexporter/config.go index 41c33176856a..4adad489cbac 100644 --- a/exporter/observiqexporter/config.go +++ b/exporter/observiqexporter/config.go @@ -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) diff --git a/exporter/observiqexporter/testdata/config.yaml b/exporter/observiqexporter/testdata/config.yaml index 74cf930eff30..7f4472bb7475 100644 --- a/exporter/observiqexporter/testdata/config.yaml +++ b/exporter/observiqexporter/testdata/config.yaml @@ -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 From aca4fbfc8a344c40f7135ff846d94d3e90e3053e Mon Sep 17 00:00:00 2001 From: Hyunuk Lim Date: Thu, 30 Sep 2021 18:34:54 -0700 Subject: [PATCH 2/3] chore: add CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4aff9b825b6..6aa2f119126d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ## 🛑 Breaking changes 🛑 +- Remove squash on configtls.TLSClientSetting for observiqexporter (#5540) - Move `k8sprocessor` to `k8sattributesprocessor`. - Rename `k8s_tagger` configuration `k8sattributes`. - filelog receiver: use empty value for `SeverityText` field instead of `"Undefined"` (#5423) From d69f895bc6b901f133408ab2f5c590e3c5448031 Mon Sep 17 00:00:00 2001 From: Hyunuk Lim Date: Fri, 1 Oct 2021 20:44:45 -0700 Subject: [PATCH 3/3] fix: update readme file --- exporter/observiqexporter/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/exporter/observiqexporter/README.md b/exporter/observiqexporter/README.md index 97a3ba7f2d61..3905698fb7b8 100644 --- a/exporter/observiqexporter/README.md +++ b/exporter/observiqexporter/README.md @@ -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