From ff7579d1e887f52261a1f3f13017eea689331cc3 Mon Sep 17 00:00:00 2001 From: "Lee E. Hinman" Date: Fri, 13 Oct 2023 10:30:48 -0500 Subject: [PATCH 1/4] Add support for idle_connection_timeout to elasticsearch output --- CHANGELOG.next.asciidoc | 1 + auditbeat/auditbeat.reference.yml | 5 +++++ filebeat/filebeat.reference.yml | 5 +++++ heartbeat/heartbeat.reference.yml | 5 +++++ .../_meta/config/output-elasticsearch.reference.yml.tmpl | 5 +++++ libbeat/outputs/elasticsearch/client.go | 1 + libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc | 6 ++++++ libbeat/outputs/elasticsearch/elasticsearch.go | 5 ++++- metricbeat/metricbeat.reference.yml | 5 +++++ packetbeat/packetbeat.reference.yml | 5 +++++ winlogbeat/winlogbeat.reference.yml | 5 +++++ x-pack/auditbeat/auditbeat.reference.yml | 5 +++++ x-pack/filebeat/filebeat.reference.yml | 5 +++++ x-pack/functionbeat/functionbeat.reference.yml | 5 +++++ x-pack/heartbeat/heartbeat.reference.yml | 5 +++++ x-pack/metricbeat/metricbeat.reference.yml | 5 +++++ x-pack/osquerybeat/osquerybeat.reference.yml | 5 +++++ x-pack/packetbeat/packetbeat.reference.yml | 5 +++++ x-pack/winlogbeat/winlogbeat.reference.yml | 5 +++++ 19 files changed, 87 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 4e9a5f0128e2..b0f12c83bc33 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -173,6 +173,7 @@ is collected by it. - allow `queue` configuration settings to be set under the output. {issue}35615[35615] {pull}36788[36788] - Beats will now connect to older Elasticsearch instances by default {pull}36884[36884] - Raise up logging level to warning when attempting to configure beats with unknown fields from autodiscovered events/environments +- elasticsearch output now supports `idle_connection_timeout`. {issue}35616[35615] {pull}99999[99999] *Auditbeat* diff --git a/auditbeat/auditbeat.reference.yml b/auditbeat/auditbeat.reference.yml index d4214eaf604b..adec530faed9 100644 --- a/auditbeat/auditbeat.reference.yml +++ b/auditbeat/auditbeat.reference.yml @@ -522,6 +522,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml index 45aff60ce236..1e222d2981ba 100644 --- a/filebeat/filebeat.reference.yml +++ b/filebeat/filebeat.reference.yml @@ -1618,6 +1618,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/heartbeat/heartbeat.reference.yml b/heartbeat/heartbeat.reference.yml index e8b74f8c075e..854f177cd09c 100644 --- a/heartbeat/heartbeat.reference.yml +++ b/heartbeat/heartbeat.reference.yml @@ -614,6 +614,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl b/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl index 4acd341da01e..cb317a62a8a4 100644 --- a/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl +++ b/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl @@ -81,6 +81,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/libbeat/outputs/elasticsearch/client.go b/libbeat/outputs/elasticsearch/client.go index c80e95ebc907..b485807776e7 100644 --- a/libbeat/outputs/elasticsearch/client.go +++ b/libbeat/outputs/elasticsearch/client.go @@ -102,6 +102,7 @@ func NewClient( CompressionLevel: s.CompressionLevel, EscapeHTML: s.EscapeHTML, Transport: s.Transport, + IdleConnTimeout: s.IdleConnTimeout, }) if err != nil { return nil, err diff --git a/libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc b/libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc index 7e3e64b6cc5c..6af56ac42db8 100644 --- a/libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc +++ b/libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc @@ -689,6 +689,12 @@ default is `1s`. The maximum number of seconds to wait before attempting to connect to Elasticsearch after a network error. The default is `60s`. +===== `idle_connection_timeout` + +The maximum amount of time an idle connection will remain idle before closing itself. +Zero means no limit. The format is a Go language duration (example 60s is 60 seconds). +The default is 0. + ===== `timeout` The http request timeout in seconds for the Elasticsearch request. The default is 90. diff --git a/libbeat/outputs/elasticsearch/elasticsearch.go b/libbeat/outputs/elasticsearch/elasticsearch.go index f7e388539243..145b5b65c2ea 100644 --- a/libbeat/outputs/elasticsearch/elasticsearch.go +++ b/libbeat/outputs/elasticsearch/elasticsearch.go @@ -41,7 +41,9 @@ func makeES( ) (outputs.Group, error) { log := logp.NewLogger(logSelector) if !cfg.HasField("bulk_max_size") { - _ = cfg.SetInt("bulk_max_size", -1, defaultBulkSize) + if err := cfg.SetInt("bulk_max_size", -1, defaultBulkSize); err != nil { + return outputs.Fail(err) + } } index, pipeline, err := buildSelectors(im, beat, cfg) @@ -105,6 +107,7 @@ func makeES( Observer: observer, EscapeHTML: esConfig.EscapeHTML, Transport: esConfig.Transport, + IdleConnTimeout: esConfig.Transport.IdleConnTimeout, }, Index: index, Pipeline: pipeline, diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index fc79ddb514c9..76ee34676767 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -1357,6 +1357,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/packetbeat/packetbeat.reference.yml b/packetbeat/packetbeat.reference.yml index cc05f7b52128..19e0fbc0ae09 100644 --- a/packetbeat/packetbeat.reference.yml +++ b/packetbeat/packetbeat.reference.yml @@ -988,6 +988,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/winlogbeat/winlogbeat.reference.yml b/winlogbeat/winlogbeat.reference.yml index 110370957cf7..2e0d22007b64 100644 --- a/winlogbeat/winlogbeat.reference.yml +++ b/winlogbeat/winlogbeat.reference.yml @@ -404,6 +404,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/auditbeat/auditbeat.reference.yml b/x-pack/auditbeat/auditbeat.reference.yml index 6d9a71ca99cc..be2e1de979f2 100644 --- a/x-pack/auditbeat/auditbeat.reference.yml +++ b/x-pack/auditbeat/auditbeat.reference.yml @@ -578,6 +578,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/filebeat/filebeat.reference.yml b/x-pack/filebeat/filebeat.reference.yml index bff96ef19973..630c16e6b22d 100644 --- a/x-pack/filebeat/filebeat.reference.yml +++ b/x-pack/filebeat/filebeat.reference.yml @@ -3988,6 +3988,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/functionbeat/functionbeat.reference.yml b/x-pack/functionbeat/functionbeat.reference.yml index d3a2231a43ef..d6eaf262341e 100644 --- a/x-pack/functionbeat/functionbeat.reference.yml +++ b/x-pack/functionbeat/functionbeat.reference.yml @@ -646,6 +646,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/heartbeat/heartbeat.reference.yml b/x-pack/heartbeat/heartbeat.reference.yml index e8b74f8c075e..854f177cd09c 100644 --- a/x-pack/heartbeat/heartbeat.reference.yml +++ b/x-pack/heartbeat/heartbeat.reference.yml @@ -614,6 +614,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index 436693bdfbc7..37dd4f57e775 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -1918,6 +1918,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/osquerybeat/osquerybeat.reference.yml b/x-pack/osquerybeat/osquerybeat.reference.yml index f17d16e28b8a..62e898ea7d8b 100644 --- a/x-pack/osquerybeat/osquerybeat.reference.yml +++ b/x-pack/osquerybeat/osquerybeat.reference.yml @@ -365,6 +365,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/packetbeat/packetbeat.reference.yml b/x-pack/packetbeat/packetbeat.reference.yml index cc05f7b52128..19e0fbc0ae09 100644 --- a/x-pack/packetbeat/packetbeat.reference.yml +++ b/x-pack/packetbeat/packetbeat.reference.yml @@ -988,6 +988,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/winlogbeat/winlogbeat.reference.yml b/x-pack/winlogbeat/winlogbeat.reference.yml index eec0bca80779..b7807297bbb0 100644 --- a/x-pack/winlogbeat/winlogbeat.reference.yml +++ b/x-pack/winlogbeat/winlogbeat.reference.yml @@ -406,6 +406,11 @@ output.elasticsearch: # Elasticsearch after a network error. The default is 60s. #backoff.max: 60s + # The maximum amount of time an idle connection will remain idle + # before closing itself. Zero means no limit. The format is a Go + # language duration (example 60s is 60 seconds). The default is 0. + #idle_connection_timeout: 0 + # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 From 092661a070997ea1854fe5fc25e025236097a258 Mon Sep 17 00:00:00 2001 From: "Lee E. Hinman" Date: Fri, 20 Oct 2023 10:53:31 -0500 Subject: [PATCH 2/4] correct doc for default idle_connection_timeout --- auditbeat/auditbeat.reference.yml | 4 ++-- filebeat/filebeat.reference.yml | 4 ++-- heartbeat/heartbeat.reference.yml | 4 ++-- libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl | 4 ++-- metricbeat/metricbeat.reference.yml | 4 ++-- packetbeat/packetbeat.reference.yml | 4 ++-- winlogbeat/winlogbeat.reference.yml | 4 ++-- x-pack/auditbeat/auditbeat.reference.yml | 4 ++-- x-pack/filebeat/filebeat.reference.yml | 4 ++-- x-pack/functionbeat/functionbeat.reference.yml | 4 ++-- x-pack/heartbeat/heartbeat.reference.yml | 4 ++-- x-pack/metricbeat/metricbeat.reference.yml | 4 ++-- x-pack/osquerybeat/osquerybeat.reference.yml | 4 ++-- x-pack/packetbeat/packetbeat.reference.yml | 4 ++-- x-pack/winlogbeat/winlogbeat.reference.yml | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/auditbeat/auditbeat.reference.yml b/auditbeat/auditbeat.reference.yml index adec530faed9..746cfd7fed6a 100644 --- a/auditbeat/auditbeat.reference.yml +++ b/auditbeat/auditbeat.reference.yml @@ -524,8 +524,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml index 1e222d2981ba..f4cf4b2a6d4a 100644 --- a/filebeat/filebeat.reference.yml +++ b/filebeat/filebeat.reference.yml @@ -1620,8 +1620,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/heartbeat/heartbeat.reference.yml b/heartbeat/heartbeat.reference.yml index 854f177cd09c..464aa7749c62 100644 --- a/heartbeat/heartbeat.reference.yml +++ b/heartbeat/heartbeat.reference.yml @@ -616,8 +616,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl b/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl index cb317a62a8a4..9af56df86f3c 100644 --- a/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl +++ b/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl @@ -83,8 +83,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 76ee34676767..0d58b26fe752 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -1359,8 +1359,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/packetbeat/packetbeat.reference.yml b/packetbeat/packetbeat.reference.yml index 19e0fbc0ae09..13403122a334 100644 --- a/packetbeat/packetbeat.reference.yml +++ b/packetbeat/packetbeat.reference.yml @@ -990,8 +990,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/winlogbeat/winlogbeat.reference.yml b/winlogbeat/winlogbeat.reference.yml index 2e0d22007b64..892c2e5dd349 100644 --- a/winlogbeat/winlogbeat.reference.yml +++ b/winlogbeat/winlogbeat.reference.yml @@ -406,8 +406,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/auditbeat/auditbeat.reference.yml b/x-pack/auditbeat/auditbeat.reference.yml index be2e1de979f2..6cc38c8a03c6 100644 --- a/x-pack/auditbeat/auditbeat.reference.yml +++ b/x-pack/auditbeat/auditbeat.reference.yml @@ -580,8 +580,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/filebeat/filebeat.reference.yml b/x-pack/filebeat/filebeat.reference.yml index 630c16e6b22d..c1214abaf067 100644 --- a/x-pack/filebeat/filebeat.reference.yml +++ b/x-pack/filebeat/filebeat.reference.yml @@ -3990,8 +3990,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/functionbeat/functionbeat.reference.yml b/x-pack/functionbeat/functionbeat.reference.yml index d6eaf262341e..1c7dfd44dc20 100644 --- a/x-pack/functionbeat/functionbeat.reference.yml +++ b/x-pack/functionbeat/functionbeat.reference.yml @@ -648,8 +648,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/heartbeat/heartbeat.reference.yml b/x-pack/heartbeat/heartbeat.reference.yml index 854f177cd09c..464aa7749c62 100644 --- a/x-pack/heartbeat/heartbeat.reference.yml +++ b/x-pack/heartbeat/heartbeat.reference.yml @@ -616,8 +616,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index 37dd4f57e775..d67a6e94e76c 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -1920,8 +1920,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/osquerybeat/osquerybeat.reference.yml b/x-pack/osquerybeat/osquerybeat.reference.yml index 62e898ea7d8b..274a61c97716 100644 --- a/x-pack/osquerybeat/osquerybeat.reference.yml +++ b/x-pack/osquerybeat/osquerybeat.reference.yml @@ -367,8 +367,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/packetbeat/packetbeat.reference.yml b/x-pack/packetbeat/packetbeat.reference.yml index 19e0fbc0ae09..13403122a334 100644 --- a/x-pack/packetbeat/packetbeat.reference.yml +++ b/x-pack/packetbeat/packetbeat.reference.yml @@ -990,8 +990,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/winlogbeat/winlogbeat.reference.yml b/x-pack/winlogbeat/winlogbeat.reference.yml index b7807297bbb0..def212ce9d01 100644 --- a/x-pack/winlogbeat/winlogbeat.reference.yml +++ b/x-pack/winlogbeat/winlogbeat.reference.yml @@ -408,8 +408,8 @@ output.elasticsearch: # The maximum amount of time an idle connection will remain idle # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 0. - #idle_connection_timeout: 0 + # language duration (example 60s is 60 seconds). The default is 60s. + #idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 From b99cef71597f7b3994e476014f2ff6079370a1bb Mon Sep 17 00:00:00 2001 From: "Lee E. Hinman" Date: Mon, 23 Oct 2023 09:19:16 -0500 Subject: [PATCH 3/4] fix changelog pr number --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index b0f12c83bc33..a59b65297c28 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -173,7 +173,7 @@ is collected by it. - allow `queue` configuration settings to be set under the output. {issue}35615[35615] {pull}36788[36788] - Beats will now connect to older Elasticsearch instances by default {pull}36884[36884] - Raise up logging level to warning when attempting to configure beats with unknown fields from autodiscovered events/environments -- elasticsearch output now supports `idle_connection_timeout`. {issue}35616[35615] {pull}99999[99999] +- elasticsearch output now supports `idle_connection_timeout`. {issue}35616[35615] {pull}36843[36843] *Auditbeat* From 3659527e2450307323ae7110ac2bac679f240003 Mon Sep 17 00:00:00 2001 From: "Lee E. Hinman" Date: Mon, 23 Oct 2023 12:31:53 -0500 Subject: [PATCH 4/4] fix docs one more time --- auditbeat/auditbeat.reference.yml | 6 +++--- filebeat/filebeat.reference.yml | 6 +++--- heartbeat/heartbeat.reference.yml | 6 +++--- .../_meta/config/output-elasticsearch.reference.yml.tmpl | 6 +++--- metricbeat/metricbeat.reference.yml | 6 +++--- packetbeat/packetbeat.reference.yml | 6 +++--- winlogbeat/winlogbeat.reference.yml | 6 +++--- x-pack/auditbeat/auditbeat.reference.yml | 6 +++--- x-pack/filebeat/filebeat.reference.yml | 6 +++--- x-pack/functionbeat/functionbeat.reference.yml | 6 +++--- x-pack/heartbeat/heartbeat.reference.yml | 6 +++--- x-pack/metricbeat/metricbeat.reference.yml | 6 +++--- x-pack/osquerybeat/osquerybeat.reference.yml | 6 +++--- x-pack/packetbeat/packetbeat.reference.yml | 6 +++--- x-pack/winlogbeat/winlogbeat.reference.yml | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/auditbeat/auditbeat.reference.yml b/auditbeat/auditbeat.reference.yml index 746cfd7fed6a..a3a36dde753f 100644 --- a/auditbeat/auditbeat.reference.yml +++ b/auditbeat/auditbeat.reference.yml @@ -523,9 +523,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml index f4cf4b2a6d4a..f49390485aca 100644 --- a/filebeat/filebeat.reference.yml +++ b/filebeat/filebeat.reference.yml @@ -1619,9 +1619,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/heartbeat/heartbeat.reference.yml b/heartbeat/heartbeat.reference.yml index 464aa7749c62..fe6a72cd4746 100644 --- a/heartbeat/heartbeat.reference.yml +++ b/heartbeat/heartbeat.reference.yml @@ -615,9 +615,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl b/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl index 9af56df86f3c..d6ebe03ada5d 100644 --- a/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl +++ b/libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl @@ -82,9 +82,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 0d58b26fe752..8508d7d6a700 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -1358,9 +1358,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/packetbeat/packetbeat.reference.yml b/packetbeat/packetbeat.reference.yml index 13403122a334..d31a7b901d9d 100644 --- a/packetbeat/packetbeat.reference.yml +++ b/packetbeat/packetbeat.reference.yml @@ -989,9 +989,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/winlogbeat/winlogbeat.reference.yml b/winlogbeat/winlogbeat.reference.yml index 892c2e5dd349..bdc366d09024 100644 --- a/winlogbeat/winlogbeat.reference.yml +++ b/winlogbeat/winlogbeat.reference.yml @@ -405,9 +405,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/auditbeat/auditbeat.reference.yml b/x-pack/auditbeat/auditbeat.reference.yml index 6cc38c8a03c6..09b343d8fe28 100644 --- a/x-pack/auditbeat/auditbeat.reference.yml +++ b/x-pack/auditbeat/auditbeat.reference.yml @@ -579,9 +579,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/filebeat/filebeat.reference.yml b/x-pack/filebeat/filebeat.reference.yml index c1214abaf067..90cbc52d8c22 100644 --- a/x-pack/filebeat/filebeat.reference.yml +++ b/x-pack/filebeat/filebeat.reference.yml @@ -3989,9 +3989,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/functionbeat/functionbeat.reference.yml b/x-pack/functionbeat/functionbeat.reference.yml index 1c7dfd44dc20..b7b075f26120 100644 --- a/x-pack/functionbeat/functionbeat.reference.yml +++ b/x-pack/functionbeat/functionbeat.reference.yml @@ -647,9 +647,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/heartbeat/heartbeat.reference.yml b/x-pack/heartbeat/heartbeat.reference.yml index 464aa7749c62..fe6a72cd4746 100644 --- a/x-pack/heartbeat/heartbeat.reference.yml +++ b/x-pack/heartbeat/heartbeat.reference.yml @@ -615,9 +615,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index d67a6e94e76c..bfb13acc660f 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -1919,9 +1919,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/osquerybeat/osquerybeat.reference.yml b/x-pack/osquerybeat/osquerybeat.reference.yml index 274a61c97716..6103f48c4280 100644 --- a/x-pack/osquerybeat/osquerybeat.reference.yml +++ b/x-pack/osquerybeat/osquerybeat.reference.yml @@ -366,9 +366,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/packetbeat/packetbeat.reference.yml b/x-pack/packetbeat/packetbeat.reference.yml index 13403122a334..d31a7b901d9d 100644 --- a/x-pack/packetbeat/packetbeat.reference.yml +++ b/x-pack/packetbeat/packetbeat.reference.yml @@ -989,9 +989,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90 diff --git a/x-pack/winlogbeat/winlogbeat.reference.yml b/x-pack/winlogbeat/winlogbeat.reference.yml index def212ce9d01..f3ff654bca24 100644 --- a/x-pack/winlogbeat/winlogbeat.reference.yml +++ b/x-pack/winlogbeat/winlogbeat.reference.yml @@ -407,9 +407,9 @@ output.elasticsearch: #backoff.max: 60s # The maximum amount of time an idle connection will remain idle - # before closing itself. Zero means no limit. The format is a Go - # language duration (example 60s is 60 seconds). The default is 60s. - #idle_connection_timeout: 60s + # before closing itself. Zero means use the default of 60s. The + # format is a Go language duration (example 60s is 60 seconds). + # idle_connection_timeout: 60s # Configure HTTP request timeout before failing a request to Elasticsearch. #timeout: 90