Skip to content

Pre-fetch enrollment token for all agent deployers #3757

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

Draft
mrodm wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Pre-fetch enrollment token for all agent deployers #3757

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
19 changes: 7 additions & 12 deletions internal/agentdeployer/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,19 +287,14 @@ func (d *DockerComposeAgentDeployer) installDockerCompose(ctx context.Context, a
if err != nil {
return "", fmt.Errorf("failed to load config from profile: %w", err)
}
enrollmentToken := ""
if config.ElasticsearchAPIKey != "" {
// TODO: Review if this is the correct place to get the enrollment token.
kibanaClient, err := stack.NewKibanaClientFromProfile(d.profile)
if err != nil {
return "", fmt.Errorf("failed to create kibana client: %w", err)
}
enrollmentToken, err = kibanaClient.GetEnrollmentTokenForPolicyID(ctx, agentInfo.Policy.ID)
if err != nil {
return "", fmt.Errorf("failed to get enrollment token for policy %q: %w", agentInfo.Policy.Name, err)
}
kibanaClient, err := stack.NewKibanaClientFromProfile(d.profile)
if err != nil {
return "", fmt.Errorf("failed to create kibana client: %w", err)
}
enrollmentToken, err := kibanaClient.GetEnrollmentTokenForPolicyID(ctx, agentInfo.Policy.ID)
if err != nil {
return "", fmt.Errorf("failed to get enrollment token for policy %q: %w", agentInfo.Policy.Name, err)
}

// TODO: Include these settings more explicitly in `config`.
fleetURL := "https://fleet-server:8220"
kibanaHost := "https://kibana:5601"
Expand Down
19 changes: 7 additions & 12 deletions internal/agentdeployer/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,19 +199,14 @@ func getElasticAgentYAML(ctx context.Context, profile *profile.Profile, agentInf
stackVersion = version
}

enrollmentToken := ""
if config.ElasticsearchAPIKey != "" {
// TODO: Review if this is the correct place to get the enrollment token.
kibanaClient, err := stack.NewKibanaClientFromProfile(profile)
if err != nil {
return nil, fmt.Errorf("failed to create kibana client: %w", err)
}
enrollmentToken, err = kibanaClient.GetEnrollmentTokenForPolicyID(ctx, agentInfo.Policy.ID)
if err != nil {
return nil, fmt.Errorf("failed to get enrollment token for policy %q: %w", agentInfo.Policy.Name, err)
}
kibanaClient, err := stack.NewKibanaClientFromProfile(profile)
if err != nil {
return nil, fmt.Errorf("failed to create kibana client: %w", err)
}
enrollmentToken, err := kibanaClient.GetEnrollmentTokenForPolicyID(ctx, agentInfo.Policy.ID)
if err != nil {
return nil, fmt.Errorf("failed to get enrollment token for policy %q: %w", agentInfo.Policy.Name, err)
}

// default to stack version if no override is provided
agentVersion := stackVersion
if overrideAgentVersion != "" {
Expand Down