Skip to content
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

V2: Provide fleet configuration to APM server #1745

Merged
merged 1 commit into from
Nov 17, 2022
Merged

V2: Provide fleet configuration to APM server #1745

Show file tree
Hide file tree
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
31 changes: 31 additions & 0 deletions changelog/fragments/1668645651-apm-fleet-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Kind can be one of:
# - breaking-change: a change to previously-documented behavior
# - deprecation: functionality that is being removed in a later release
# - bug-fix: fixes a problem in a previous version
# - enhancement: extends functionality but does not break or fix existing behavior
# - feature: new functionality
# - known-issue: problems that we are aware of in a given version
# - security: impacts on the security of a product or a user’s deployment.
# - upgrade: important information for someone upgrading from a prior version
# - other: does not fit into any of the other categories
kind: bug-fix

# Change summary; a 80ish characters long description of the change.
summary: V2 Provide fleet configuration to APM server

# Long description; in case the summary is not enough to describe the change
# this field accommodate a description without length limits.
#description:

# Affected component; a word indicating the component this changeset affects.
component:

# PR number; optional; the PR number that added the changeset.
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
# pr: 1234

# Issue number; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
issue: 1737
2 changes: 1 addition & 1 deletion internal/pkg/agent/application/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func New(

composableManaged = true
compModifiers = append(compModifiers, FleetServerComponentModifier(cfg.Fleet.Server),
EndpointComponentModifier(cfg.Fleet))
InjectFleetConfigComponentModifier(cfg.Fleet))

managed, err = newManagedConfigManager(log, agentInfo, cfg, store, runtime)
if err != nil {
Expand Down
12 changes: 6 additions & 6 deletions internal/pkg/agent/application/fleet_server_bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const (
elasticsearch = "elasticsearch"
fleetServer = "fleet-server"
endpoint = "endpoint"
apmServer = "apm"
)

// injectFleetServerInput is the base configuration that is used plus the FleetServerComponentModifier that adjusts
Expand Down Expand Up @@ -83,15 +84,14 @@ func FleetServerComponentModifier(serverCfg *configuration.FleetServerConfig) co
}
}

// EndpointComponentModifier the modifier for the Endpoint configuration.
// The Endpoint expects the fleet configuration passed to it by the Agent
// because it needs to be able to connect to the fleet server directly.
func EndpointComponentModifier(fleetCfg *configuration.FleetAgentConfig) coordinator.ComponentsModifier {
// InjectFleetConfigComponentModifier The modifier that injects the fleet configuration for the components
// that need to be able to connect to fleet server.
func InjectFleetConfigComponentModifier(fleetCfg *configuration.FleetAgentConfig) coordinator.ComponentsModifier {
return func(comps []component.Component, cfg map[string]interface{}) ([]component.Component, error) {
for i, comp := range comps {
if comp.InputSpec != nil && comp.InputSpec.InputType == endpoint {
if comp.InputSpec != nil && (comp.InputSpec.InputType == endpoint || comp.InputSpec.InputType == apmServer) {
for j, unit := range comp.Units {
if unit.Type == client.UnitTypeInput && unit.Config.Type == endpoint {
if unit.Type == client.UnitTypeInput && (unit.Config.Type == endpoint || unit.Config.Type == apmServer) {
unitCfgMap, err := toMapStr(unit.Config.Source.AsMap(), map[string]interface{}{"fleet": fleetCfg})
if err != nil {
return nil, err
Expand Down