From dbb76b722941b5a2ed76fb0eadc15142e8eebe08 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 16 Mar 2021 16:51:55 +0100 Subject: [PATCH 1/2] Fix default scope in add_nomad_metadata (#24559) Fix default scope in add_nomad_metadata. It is set to local, but it should be node. Fix also error message that showed that local is a valid value. (cherry picked from commit ab2b4784d057d6ab4d5fa19493dc8e527484fc41) --- CHANGELOG.next.asciidoc | 2 ++ x-pack/libbeat/autodiscover/providers/nomad/config.go | 2 +- x-pack/libbeat/processors/add_nomad_metadata/config.go | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index ecf58cbbffc8..41b98d17e7d9 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -253,6 +253,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Zoom module pipeline failed to ingest some chat_channel events. {pull}23904[23904] - Fix Netlow module issue with missing `internal_networks` config parameter. {issue}24094[24094] {pull}24110[24110] - in httpjson input using encode_as "application/x-www-form-urlencoded" now sets Content-Type correctly {issue}24331[24331] {pull}24336[24336] +- Fix netflow module ignoring detect_sequence_reset flag. {issue}24268[24268] {pull}24270[24270] +- Fix default `scope` in `add_nomad_metadata`. {issue}24559[24559] *Heartbeat* diff --git a/x-pack/libbeat/autodiscover/providers/nomad/config.go b/x-pack/libbeat/autodiscover/providers/nomad/config.go index 7108bf879434..1a611aceee35 100644 --- a/x-pack/libbeat/autodiscover/providers/nomad/config.go +++ b/x-pack/libbeat/autodiscover/providers/nomad/config.go @@ -64,7 +64,7 @@ func (c *Config) Validate() error { case ScopeNode: case ScopeCluster: default: - return fmt.Errorf("invalid value for `scope`, select `%s` or `%s`", ScopeNode, ScopeCluster) + return fmt.Errorf("invalid value for `scope`: %s, select `%s` or `%s`", c.Scope, ScopeNode, ScopeCluster) } return nil } diff --git a/x-pack/libbeat/processors/add_nomad_metadata/config.go b/x-pack/libbeat/processors/add_nomad_metadata/config.go index 6425f05550c2..daeeccc6513d 100644 --- a/x-pack/libbeat/processors/add_nomad_metadata/config.go +++ b/x-pack/libbeat/processors/add_nomad_metadata/config.go @@ -40,7 +40,7 @@ func (c *nomadAnnotatorConfig) Validate() error { case ScopeNode: case ScopeCluster: default: - return fmt.Errorf("invalid value for `scope`, select `local` or `global`") + return fmt.Errorf("invalid value for `scope`: %s, select `%s` or `%s`", c.Scope, ScopeNode, ScopeCluster) } return nil } @@ -57,7 +57,7 @@ func defaultNomadAnnotatorConfig() nomadAnnotatorConfig { Region: "", Namespace: "", SecretID: "", - Scope: "local", + Scope: ScopeNode, syncPeriod: 5 * time.Second, CleanupTimeout: 60 * time.Second, DefaultMatchers: Enabled{true}, From 11d2244ca2d8d2506dbc4b3af9efdfb01e65c7d7 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 16 Mar 2021 16:54:01 +0100 Subject: [PATCH 2/2] Fix changelog --- CHANGELOG.next.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 41b98d17e7d9..8784ec53eb85 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -253,7 +253,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Zoom module pipeline failed to ingest some chat_channel events. {pull}23904[23904] - Fix Netlow module issue with missing `internal_networks` config parameter. {issue}24094[24094] {pull}24110[24110] - in httpjson input using encode_as "application/x-www-form-urlencoded" now sets Content-Type correctly {issue}24331[24331] {pull}24336[24336] -- Fix netflow module ignoring detect_sequence_reset flag. {issue}24268[24268] {pull}24270[24270] - Fix default `scope` in `add_nomad_metadata`. {issue}24559[24559] *Heartbeat*