Skip to content

Commit

Permalink
Change kibana api paths used in container command (#253)
Browse files Browse the repository at this point in the history
  • Loading branch information
michel-laterman committed Mar 28, 2022
1 parent d39e41f commit 64dae05
Show file tree
Hide file tree
Showing 2 changed files with 4 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 @@ -99,6 +99,7 @@
- Move `context cancelled` error from fleet gateway into debug level. {pull}187[187]
- Update library containerd to 1.5.10. {pull}186[186]
- Add fleet-server to output of elastic-agent inspect output command (and diagnostic bundle). {pull}243[243]
- Update API calls that the agent makes to Kibana when running the container command. {pull}253[253]

==== New features

Expand Down
6 changes: 3 additions & 3 deletions internal/pkg/agent/cmd/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ func ensureServiceToken(streams *cli.IOStreams, cfg *setupConfig) error {
if err != nil {
return err
}
code, r, err := client.Connection.Request("POST", "/api/fleet/service-tokens", nil, nil, nil)
code, r, err := client.Connection.Request("POST", "/api/fleet/service_tokens", nil, nil, nil)
if err != nil {
return fmt.Errorf("request to get security token from Kibana failed: %w", err)
}
Expand Down Expand Up @@ -503,7 +503,7 @@ func kibanaFetchPolicy(cfg setupConfig, client *kibana.Client, streams *cli.IOSt

func kibanaFetchToken(cfg setupConfig, client *kibana.Client, policy *kibanaPolicy, streams *cli.IOStreams, tokenName string) (string, error) {
var keys kibanaAPIKeys
err := performGET(cfg, client, "/api/fleet/enrollment-api-keys", &keys, streams.Err, "Kibana fetch token")
err := performGET(cfg, client, "/api/fleet/enrollment_api_keys", &keys, streams.Err, "Kibana fetch token")
if err != nil {
return "", err
}
Expand All @@ -512,7 +512,7 @@ func kibanaFetchToken(cfg setupConfig, client *kibana.Client, policy *kibanaPoli
return "", err
}
var keyDetail kibanaAPIKeyDetail
err = performGET(cfg, client, fmt.Sprintf("/api/fleet/enrollment-api-keys/%s", key.ID), &keyDetail, streams.Err, "Kibana fetch token detail")
err = performGET(cfg, client, fmt.Sprintf("/api/fleet/enrollment_api_keys/%s", key.ID), &keyDetail, streams.Err, "Kibana fetch token detail")
if err != nil {
return "", err
}
Expand Down

0 comments on commit 64dae05

Please sign in to comment.