Skip to content

Commit

Permalink
[8.x](backport #42292) fix setting namespace for non beat receivers (#…
Browse files Browse the repository at this point in the history
…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 <[email protected]>

---------

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
(cherry picked from commit 27adc68)

* fix merge conflict from previous

---------

Co-authored-by: Lee E Hinman <[email protected]>
Co-authored-by: Lee E. Hinman <[email protected]>
  • Loading branch information
3 people authored Jan 22, 2025
1 parent fb9c684 commit fa78c02
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
3 changes: 0 additions & 3 deletions catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1154,8 +1154,6 @@ spec:
apiVersion: backstage.io/v1alpha1
kind: Resource
metadata:
<<<<<<< HEAD
=======
name: beats-macos-tests
description: 'Runs of Beats macOS tests'
links:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions libbeat/cmd/instance/beat.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fa78c02

Please sign in to comment.