From b14b6842a766399e91b60e3c21e0895b82ffe3d0 Mon Sep 17 00:00:00 2001 From: Katarzyna Kujawa Date: Fri, 23 Feb 2024 14:36:36 +0100 Subject: [PATCH] chore: remove clear_logs_timestamp from otelcol configuration related pull request: https://github.com/SumoLogic/sumologic-otel-collector/pull/1455 --- .changelog/3574.changed.txt | 1 + deploy/helm/sumologic/conf/events/otelcol/config.yaml | 2 -- deploy/helm/sumologic/conf/logs/otelcol/config.yaml | 2 -- tests/helm/testdata/goldenfile/events_otc/basic.output.yaml | 1 - tests/helm/testdata/goldenfile/events_otc/options.output.yaml | 1 - .../testdata/goldenfile/events_otc/sumologic-mock.output.yaml | 2 -- .../testdata/goldenfile/metadata_logs_otc/debug.output.yaml | 1 - .../metadata_logs_otc/debug_with_sumologic_mock.output.yaml | 2 -- .../helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml | 1 - .../testdata/goldenfile/metadata_logs_otc/templates.output.yaml | 1 - 10 files changed, 1 insertion(+), 13 deletions(-) create mode 100644 .changelog/3574.changed.txt diff --git a/.changelog/3574.changed.txt b/.changelog/3574.changed.txt new file mode 100644 index 0000000000..9e0bd02ed1 --- /dev/null +++ b/.changelog/3574.changed.txt @@ -0,0 +1 @@ +chore: remove clear_logs_timestamp from otelcol configuration \ No newline at end of file diff --git a/deploy/helm/sumologic/conf/events/otelcol/config.yaml b/deploy/helm/sumologic/conf/events/otelcol/config.yaml index f1d6151198..add20be366 100644 --- a/deploy/helm/sumologic/conf/events/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/events/otelcol/config.yaml @@ -3,7 +3,6 @@ exporters: client: {{ include "sumologic.sumo_client" . }} endpoint: {{ include "sumologic.events.exporter.endpoint" . }} log_format: {{ include "sumologic.events.exporter.format" . }} - clear_logs_timestamp: false # this only affects the otlp format sending_queue: enabled: true {{- if .Values.sumologic.events.persistence.enabled }} @@ -20,7 +19,6 @@ exporters: client: {{ include "sumologic.sumo_client" . }} endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} log_format: {{ include "sumologic.events.exporter.format" . }} - clear_logs_timestamp: false # this only affects the otlp format sending_queue: enabled: true {{- end }} diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml index 3efc4b8ee4..5dd3361a5b 100644 --- a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml @@ -72,7 +72,6 @@ exporters: client: {{ include "sumologic.sumo_client" . }} endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp - clear_logs_timestamp: false sending_queue: enabled: true num_consumers: 10 @@ -86,7 +85,6 @@ exporters: client: {{ include "sumologic.sumo_client" . }} endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} log_format: otlp - clear_logs_timestamp: false sending_queue: enabled: true num_consumers: 10 diff --git a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml index 48e4b46b61..c525496be3 100644 --- a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml @@ -14,7 +14,6 @@ data: config.yaml: | exporters: sumologic: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE} log_format: otlp diff --git a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml index 019a4bf863..8f6340a5a3 100644 --- a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml @@ -14,7 +14,6 @@ data: config.yaml: | exporters: sumologic: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE} log_format: otlp diff --git a/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml index c59021ed6b..0ab3764ddd 100644 --- a/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml @@ -16,7 +16,6 @@ data: debug: verbosity: detailed sumologic: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE} log_format: otlp @@ -24,7 +23,6 @@ data: enabled: true storage: file_storage sumologic/sumologic-mock: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: http://RELEASE-NAME-sumologic-mock.sumologic:3000/receiver log_format: otlp diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml index 6a49073c75..29ee4ce9c0 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml @@ -16,7 +16,6 @@ data: debug: verbosity: detailed sumologic: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml index a6b4ea9b1a..d3d0688109 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml @@ -16,7 +16,6 @@ data: debug: verbosity: detailed sumologic: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp @@ -26,7 +25,6 @@ data: queue_size: 10000 storage: file_storage sumologic/sumologic-mock: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: http://RELEASE-NAME-sumologic-mock.sumologic:3000/receiver log_format: otlp diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml index 9cf160b5f7..85069245d6 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml @@ -14,7 +14,6 @@ data: config.yaml: | exporters: sumologic: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml index 7049fe2cfb..445589416a 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml @@ -14,7 +14,6 @@ data: config.yaml: | exporters: sumologic: - clear_logs_timestamp: false client: k8s_%CURRENT_CHART_VERSION% endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp