From 2abb61161024422663d6b3aee10ab630c04e61cd Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 21 May 2019 08:55:50 -0400 Subject: [PATCH] Set beat ID in registries after loading meta file (#12180) * Reset beat ID in registries in case loaded from meta file * Set, not reset * Adding CHANGELOG entry --- CHANGELOG.next.asciidoc | 3 +++ libbeat/cmd/instance/beat.go | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 0413976eb086..3dcc8879374f 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -70,6 +70,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix initialization of the TCP input logger. {pull}11605[11605] - Fix flaky service_integration_windows_test test by introducing a confidence factor and enriching the error message with more service details. {issue}8880[8880] and {issue}7977[7977] - Replace wmi queries with win32 api calls as they were consuming CPU resources {issue}3249[3249] and {issue}11840[11840] +- Fix queue.spool.write.flush.events config type. {pull}12080[12080] +- Fixed a memory leak when using the add_process_metadata processor under Windows. {pull}12100[12100] +- Fixed Beat ID being reported by GET / API. {pull}12180[12180] *Auditbeat* diff --git a/libbeat/cmd/instance/beat.go b/libbeat/cmd/instance/beat.go index e8ac6270d640..32c588b8079f 100644 --- a/libbeat/cmd/instance/beat.go +++ b/libbeat/cmd/instance/beat.go @@ -168,7 +168,6 @@ func Run(settings Settings, bt beat.Creator) error { monitoring.NewString(registry, "version").Set(b.Info.Version) monitoring.NewString(registry, "beat").Set(b.Info.Beat) monitoring.NewString(registry, "name").Set(b.Info.Name) - monitoring.NewString(registry, "uuid").Set(b.Info.ID.String()) monitoring.NewString(registry, "hostname").Set(b.Info.Hostname) // Add additional info to state registry. This is also reported to monitoring @@ -176,7 +175,6 @@ func Run(settings Settings, bt beat.Creator) error { serviceRegistry := stateRegistry.NewRegistry("service") monitoring.NewString(serviceRegistry, "version").Set(b.Info.Version) monitoring.NewString(serviceRegistry, "name").Set(b.Info.Beat) - monitoring.NewString(serviceRegistry, "id").Set(b.Info.ID.String()) beatRegistry := stateRegistry.NewRegistry("beat") monitoring.NewString(beatRegistry, "name").Set(b.Info.Name) monitoring.NewFunc(stateRegistry, "host", host.ReportInfo, monitoring.Report) @@ -368,6 +366,13 @@ func (b *Beat) launch(settings Settings, bt beat.Creator) error { return err } + // Set Beat ID in registry vars, in case it was loaded from meta file + infoRegistry := monitoring.GetNamespace("info").GetRegistry() + monitoring.NewString(infoRegistry, "uuid").Set(b.Info.ID.String()) + + serviceRegistry := monitoring.GetNamespace("state").GetRegistry().GetRegistry("service") + monitoring.NewString(serviceRegistry, "id").Set(b.Info.ID.String()) + svc.BeforeRun() defer svc.Cleanup()