From 7410521508ad253e18cfce1258530409b1b898a2 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 13 May 2019 10:35:22 -0700 Subject: [PATCH 1/3] Reset beat ID in registries in case loaded from meta file --- libbeat/cmd/instance/beat.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libbeat/cmd/instance/beat.go b/libbeat/cmd/instance/beat.go index 77436a6cfc9e..14250de310e1 100644 --- a/libbeat/cmd/instance/beat.go +++ b/libbeat/cmd/instance/beat.go @@ -368,6 +368,15 @@ func (b *Beat) launch(settings Settings, bt beat.Creator) error { return err } + // Reset Beat ID in registry vars, in case it was loaded from meta file + infoRegistry := monitoring.GetNamespace("info").GetRegistry() + infoUUID := infoRegistry.Get("uuid").(*monitoring.String) + infoUUID.Set(b.Info.ID.String()) + + serviceRegistry := monitoring.GetNamespace("state").GetRegistry().GetRegistry("service") + serviceID := serviceRegistry.Get("id").(*monitoring.String) + serviceID.Set(b.Info.ID.String()) + svc.BeforeRun() defer svc.Cleanup() From 5057753f3d69ca4af0abcbc993b563a1eec20bd8 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 13 May 2019 11:04:46 -0700 Subject: [PATCH 2/3] Set, not reset --- libbeat/cmd/instance/beat.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libbeat/cmd/instance/beat.go b/libbeat/cmd/instance/beat.go index 14250de310e1..737de0d12de5 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,14 +366,12 @@ func (b *Beat) launch(settings Settings, bt beat.Creator) error { return err } - // Reset Beat ID in registry vars, in case it was loaded from meta file + // Set Beat ID in registry vars, in case it was loaded from meta file infoRegistry := monitoring.GetNamespace("info").GetRegistry() - infoUUID := infoRegistry.Get("uuid").(*monitoring.String) - infoUUID.Set(b.Info.ID.String()) + monitoring.NewString(infoRegistry, "uuid").Set(b.Info.ID.String()) serviceRegistry := monitoring.GetNamespace("state").GetRegistry().GetRegistry("service") - serviceID := serviceRegistry.Get("id").(*monitoring.String) - serviceID.Set(b.Info.ID.String()) + monitoring.NewString(serviceRegistry, "id").Set(b.Info.ID.String()) svc.BeforeRun() defer svc.Cleanup() From 3858bf725250296ea4d225970d99126e24c895c5 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 20 May 2019 06:52:46 -0700 Subject: [PATCH 3/3] Adding CHANGELOG entry --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index fb2be810c8d6..ae45eb775430 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -72,6 +72,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - 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*