From 1dab1a007e0d553aacb4a661f0caae086d0be2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Wed, 13 Sep 2023 12:46:37 +0200 Subject: [PATCH 1/3] fix(logs): disable keep-alives for internal traffic --- .../sumologic/conf/logs/collector/otelcloudwatch/config.yaml | 2 ++ deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml | 2 ++ tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml | 1 + tests/helm/testdata/goldenfile/logs_otc/options.output.yaml | 1 + .../logs_otc_daemonset/multiple_multiline.output.yaml | 1 + 5 files changed, 7 insertions(+) diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml index d4afb343bd..6c2a61db3a 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml @@ -3,6 +3,8 @@ exporters: endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: queue_size: 10 + # this improves load balancing at the cost of more network traffic + disable_keep_alives: true extensions: {{ if .Values.sumologic.logs.collector.otelcloudwatch.persistence.enabled }} diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml index f234a1cdc8..ed3163e8bb 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml @@ -3,6 +3,8 @@ exporters: endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: queue_size: 10 + # this improves load balancing at the cost of more network traffic + disable_keep_alives: true extensions: file_storage: diff --git a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml index 747281a25c..8c17984d39 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml @@ -14,6 +14,7 @@ data: config.yaml: | exporters: otlphttp: + disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: queue_size: 10 diff --git a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml index bed359ccb0..1952b2adaf 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml @@ -14,6 +14,7 @@ data: config.yaml: | exporters: otlphttp: + disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: queue_size: 10 diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml index f1cd25a909..4dc1900f28 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml @@ -14,6 +14,7 @@ data: config.yaml: | exporters: otlphttp: + disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: queue_size: 10 From 92679a3c0b35b025a636c597d6b6686be91a509b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Wed, 13 Sep 2023 12:49:01 +0200 Subject: [PATCH 2/3] fix(metrics): disable keep-alives for internal traffic --- .../helm/sumologic/conf/metrics/collector/otelcol/config.yaml | 2 ++ .../testdata/goldenfile/metrics_collector_otc/basic.output.yaml | 2 ++ .../goldenfile/metrics_collector_otc/custom.output.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml index 71db7f3bdf..3c2eb3738a 100644 --- a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml @@ -7,6 +7,8 @@ exporters: queue_size: 10000 num_consumers: 10 storage: file_storage + # this improves load balancing at the cost of more network traffic + disable_keep_alives: true extensions: health_check: {} diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml index f55131046c..bcebf2c2ad 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml @@ -71,6 +71,8 @@ spec: queue_size: 10000 num_consumers: 10 storage: file_storage + # this improves load balancing at the cost of more network traffic + disable_keep_alives: true extensions: health_check: {} diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml index ea63d44cb0..8e060ba16d 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml @@ -90,6 +90,8 @@ spec: queue_size: 10000 num_consumers: 10 storage: file_storage + # this improves load balancing at the cost of more network traffic + disable_keep_alives: true extensions: health_check: {} From fb2a98c976a833f7b2463f3c07c6b6b5a89b8a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Wed, 13 Sep 2023 12:49:58 +0200 Subject: [PATCH 3/3] chore: update changelog --- .changelog/3267.fixed.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 .changelog/3267.fixed.txt diff --git a/.changelog/3267.fixed.txt b/.changelog/3267.fixed.txt new file mode 100644 index 0000000000..b1f390cb54 --- /dev/null +++ b/.changelog/3267.fixed.txt @@ -0,0 +1 @@ +fix: disable keep-alives for internal traffic \ No newline at end of file