From fa78c02593040ae32ed24a2c083f490e72178f8c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 20:57:59 +0000 Subject: [PATCH] [8.x](backport #42292) fix setting namespace for non beat receivers (#42399) * fix setting namespace for non beat receivers (#42292) * fix setting registry for non beat receivers * Update CHANGELOG.next.asciidoc Co-authored-by: Mauri de Souza Meneguzzo --------- Co-authored-by: Mauri de Souza Meneguzzo (cherry picked from commit 27adc68350051c939e403219c18a0bb3d6e585f8) * fix merge conflict from previous --------- Co-authored-by: Lee E Hinman <57081003+leehinman@users.noreply.github.com> Co-authored-by: Lee E. Hinman --- CHANGELOG.next.asciidoc | 1 + catalog-info.yaml | 3 --- libbeat/cmd/instance/beat.go | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index ccdf50996575..0de4b1eed689 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -103,6 +103,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Prevent panic if libbeat processors are loaded more than once. {issue}41475[41475] {pull}41857[51857] - Allow network condition to handle field values that are arrays of IP addresses. {pull}41918[41918] - Fix a bug where log files are rotated on startup when interval is configured and rotateonstartup is disabled {issue}41894[41894] {pull}41895[41895] +- Fix setting unique registry for non beat receivers {issue}42288[42288] {pull}42292[42292] *Auditbeat* diff --git a/catalog-info.yaml b/catalog-info.yaml index fac4705a1518..3d0d1958eb1b 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -1154,8 +1154,6 @@ spec: apiVersion: backstage.io/v1alpha1 kind: Resource metadata: -<<<<<<< HEAD -======= name: beats-macos-tests description: 'Runs of Beats macOS tests' links: @@ -1199,7 +1197,6 @@ spec: apiVersion: backstage.io/v1alpha1 kind: Resource metadata: ->>>>>>> 47f15027a1 (Update catalog-info file with correct system property (#41618)) name: beats-pipeline-scheduler description: 'Scheduled runs of various Beats pipelines per release branch' links: diff --git a/libbeat/cmd/instance/beat.go b/libbeat/cmd/instance/beat.go index eeadf06b836b..aea72414b5fb 100644 --- a/libbeat/cmd/instance/beat.go +++ b/libbeat/cmd/instance/beat.go @@ -1143,6 +1143,8 @@ func (b *Beat) configure(settings Settings) error { debug.SetGCPercent(gcPercent) } + b.Info.Monitoring.Namespace = monitoring.GetNamespace("dataset") + b.Beat.BeatConfig, err = b.BeatConfig() if err != nil { return err