Skip to content

[9.0] (backport #17872) fix: do not try to create apm-serve registry if it exists #17874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[9.0] (backport #17872) fix: do not try to create apm-serve registry if it exists #17874

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions internal/beater/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,22 @@

// recordAPMServerConfig records dynamic APM Server config properties for telemetry.
// This should be called once each time runServer is called.
<<<<<<< HEAD

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / lint 

expected declaration, found '<<'

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test-fips 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test-fips 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test-fips 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (windows-2025) 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (windows-2025) 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (macos-latest) 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / system-test 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / system-test 

syntax error: non-declaration statement outside function body

Check failure on line 47 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / system-test 

syntax error: non-declaration statement outside function body
func recordAPMServerConfig(cfg *config.Config) {
configMonitors.rumEnabled.Set(cfg.RumConfig.Enabled)
configMonitors.apiKeysEnabled.Set(cfg.AgentAuth.APIKey.Enabled)
configMonitors.kibanaEnabled.Set(cfg.Kibana.Enabled)
configMonitors.sslEnabled.Set(cfg.TLS.IsEnabled())
configMonitors.tailSamplingEnabled.Set(cfg.Sampling.Tail.Enabled)
configMonitors.tailSamplingPolicies.Set(int64(len(cfg.Sampling.Tail.Policies)))
=======

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test-fips 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test-fips 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test-fips 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (windows-2025) 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (windows-2025) 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (macos-latest) 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / system-test 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / system-test 

syntax error: unexpected ==, expected }

Check failure on line 55 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / system-test 

syntax error: unexpected ==, expected }
func recordAPMServerConfig(cfg *config.Config, stateRegistry *monitoring.Registry) {
apmRegistry := stateRegistry.GetOrCreateRegistry("apm-server")
monitoring.NewBool(apmRegistry, "rum.enabled").Set(cfg.RumConfig.Enabled)
monitoring.NewBool(apmRegistry, "api_key.enabled").Set(cfg.AgentAuth.APIKey.Enabled)
monitoring.NewBool(apmRegistry, "kibana.enabled").Set(cfg.Kibana.Enabled)
monitoring.NewBool(apmRegistry, "ssl.enabled").Set(cfg.TLS.IsEnabled())
monitoring.NewBool(apmRegistry, "sampling.tail.enabled").Set(cfg.Sampling.Tail.Enabled)
monitoring.NewInt(apmRegistry, "sampling.tail.policies").Set(int64(len(cfg.Sampling.Tail.Policies)))
>>>>>>> b17e61d6 (fix: do not try to create apm-serve registry if it exists (#17872))

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / lint 

illegal character U+0023 '#'

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test-fips 

invalid character U+0023 '#'

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test-fips 

syntax error: unexpected >>, expected }

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test-fips 

invalid character U+0023 '#'

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test-fips 

syntax error: unexpected >>, expected }

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

invalid character U+0023 '#'

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

syntax error: unexpected >>, expected }

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

invalid character U+0023 '#'

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

syntax error: unexpected >>, expected }

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (windows-2025) 

invalid character U+0023 '#'

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (windows-2025) 

syntax error: unexpected >>, expected }

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (windows-2025) 

invalid character U+0023 '#'

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (windows-2025) 

syntax error: unexpected >>, expected }

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (macos-latest) 

invalid character U+0023 '#'

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / test (macos-latest) 

syntax error: unexpected >>, expected }

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / system-test 

invalid character U+0023 '#'

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / system-test 

syntax error: unexpected >>, expected }

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / system-test 

invalid character U+0023 '#'

Check failure on line 64 in internal/beater/telemetry.go

View workflow job for this annotation

GitHub Actions / system-test 

syntax error: unexpected >>, expected }
}
Loading