From 8361abb9b731e974bbb594ccace3f792abb28ecc Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 20 May 2020 14:45:49 -0400 Subject: [PATCH 1/2] Make error message actionable --- libbeat/cmd/instance/locker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbeat/cmd/instance/locker.go b/libbeat/cmd/instance/locker.go index 9e7f929ef49..d8a24a02423 100644 --- a/libbeat/cmd/instance/locker.go +++ b/libbeat/cmd/instance/locker.go @@ -30,7 +30,7 @@ var ( // ErrAlreadyLocked is returned when a lock on the data path is attempted but // unsuccessful because another Beat instance already has the lock on the same // data path. - ErrAlreadyLocked = errors.New("data path already locked by another beat") + ErrAlreadyLocked = errors.New("data path already locked by another beat. Please make sure that multiple beats are not sharing the same data path (path.data).") ) type locker struct { From 0e6b850d670170cc9137e7cdcfc6a501a2291d3f Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 20 May 2020 14:49:23 -0400 Subject: [PATCH 2/2] Adding CHANGELOG entry --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 868bd55596e..21c7054a20e 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -16,6 +16,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Remove `AddDockerMetadata` and `AddKubernetesMetadata` processors from the `script` processor. They can still be used as normal processors in the configuration. {issue}16349[16349] {pull}16514[16514] - Introduce APM libbeat instrumentation, active when running the beat with ELASTIC_APM_ACTIVE=true. {pull}17938[17938] - Remove the non-ECS `agent.hostname` field. Use the `agent.name` or `agent.id` fields for an identifier. {issue}16377[16377] {pull}18328[18328] +- Make error message about locked data path actionable. {pull}18667[18667] *Auditbeat*