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

[Elastic Agent] Fixed status reporting #25584

Merged
merged 5 commits into from
May 12, 2021
Merged

[Elastic Agent] Fixed status reporting #25584

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1562d0
fixed
michalpristas May 6, 2021
018e487
unit test
michalpristas May 6, 2021
c874251
Merge branch 'master' of github.com:elastic/beats into status-code
michalpristas May 10, 2021
fa2ec7a
Merge branch 'master' of github.com:elastic/beats into status-code
michalpristas May 11, 2021
01c2499
Merge branch 'master' of github.com:elastic/beats into status-code
michalpristas May 12, 2021
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
9 changes: 9 additions & 0 deletions x-pack/elastic-agent/pkg/agent/cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,15 @@ func reexecPath() (string, error) {
}

func getOverwrites(rawConfig *config.Config) error {
cfg, err := configuration.NewFromConfig(rawConfig)
if err != nil {
return err
}

if !cfg.Fleet.Enabled {
// overrides should apply only for fleet mode
return nil
}
path := paths.AgentConfigFile()

store := storage.NewDiskStore(path)
Expand Down
4 changes: 2 additions & 2 deletions x-pack/elastic-agent/pkg/core/monitoring/server/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ type apiHandler struct {
func (h *apiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
err := h.innerFn(w, r)
if err != nil {
writeResponse(w, unexpectedErrorWithReason(err.Error()))

switch e := err.(type) {
case apiError:
w.WriteHeader(e.Status())
default:
w.WriteHeader(http.StatusInternalServerError)

}

writeResponse(w, unexpectedErrorWithReason(err.Error()))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible to add a unit test for this code path? Having a unit test would have been an easy way to catch this.

}
}

Expand Down