Skip to content

Commit fa78c02

Browse files
[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 <mauri870@gmail.com> --------- Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com> (cherry picked from commit 27adc68) * fix merge conflict from previous --------- Co-authored-by: Lee E Hinman <57081003+leehinman@users.noreply.github.com> Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>
1 parent fb9c684 commit fa78c02

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

CHANGELOG.next.asciidoc

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
103103
- Prevent panic if libbeat processors are loaded more than once. {issue}41475[41475] {pull}41857[51857]
104104
- Allow network condition to handle field values that are arrays of IP addresses. {pull}41918[41918]
105105
- Fix a bug where log files are rotated on startup when interval is configured and rotateonstartup is disabled {issue}41894[41894] {pull}41895[41895]
106+
- Fix setting unique registry for non beat receivers {issue}42288[42288] {pull}42292[42292]
106107

107108
*Auditbeat*
108109

catalog-info.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -1154,8 +1154,6 @@ spec:
11541154
apiVersion: backstage.io/v1alpha1
11551155
kind: Resource
11561156
metadata:
1157-
<<<<<<< HEAD
1158-
=======
11591157
name: beats-macos-tests
11601158
description: 'Runs of Beats macOS tests'
11611159
links:
@@ -1199,7 +1197,6 @@ spec:
11991197
apiVersion: backstage.io/v1alpha1
12001198
kind: Resource
12011199
metadata:
1202-
>>>>>>> 47f15027a1 (Update catalog-info file with correct system property (#41618))
12031200
name: beats-pipeline-scheduler
12041201
description: 'Scheduled runs of various Beats pipelines per release branch'
12051202
links:

libbeat/cmd/instance/beat.go

+2
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,8 @@ func (b *Beat) configure(settings Settings) error {
11431143
debug.SetGCPercent(gcPercent)
11441144
}
11451145

1146+
b.Info.Monitoring.Namespace = monitoring.GetNamespace("dataset")
1147+
11461148
b.Beat.BeatConfig, err = b.BeatConfig()
11471149
if err != nil {
11481150
return err

0 commit comments

Comments
 (0)