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

x-pack/filebeat/input/entityanalytics - Fix log format #38990

Merged
merged 4 commits into from
Apr 17, 2024
Merged

x-pack/filebeat/input/entityanalytics - Fix log format #38990

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10ff202
x-pack/filebeat/input/entityanalytics - Fix log fmt
andrewkroh Apr 16, 2024
ea33834
Fix links to group-get and device-get
andrewkroh Apr 16, 2024
878e57f
Adjust changelog msg
andrewkroh Apr 16, 2024
005e5ec
Merge branch 'main' into bugfix/fb/entity-analytics-log-fmt
andrewkroh Apr 17, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Fix filestream's registry GC: registry entries are now removed from the in-memory and disk store when they're older than the set TTL {issue}36761[36761] {pull}38488[38488]
- [threatintel] MISP splitting fix for empty responses {issue}38739[38739] {pull}38917[38917]
- Prevent GCP Pub/Sub input blockage by increasing default value of `max_outstanding_messages` {issue}35029[35029] {pull}38985[38985]
- entity-analytics input: Fix format of some log messages. {pull}38990[38990]
andrewkroh marked this conversation as resolved.
Show resolved Hide resolved
andrewkroh marked this conversation as resolved.
Show resolved Hide resolved

*Heartbeat*

Expand Down
4 changes: 2 additions & 2 deletions x-pack/filebeat/docs/inputs/input-entity-analytics.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,13 +498,13 @@ This is a list of optional query parameters. The default is `["accountEnabled",
[float]
===== `select.groups`

Override the default https://learn.microsoft.com/en-us/graph/api/user-get?view=graph-rest-1.0&tabs=http#optional-query-parameters[group query selections].
Override the default https://learn.microsoft.com/en-us/graph/api/group-get?view=graph-rest-1.0&tabs=http#optional-query-parameters[group query selections].
This is a list of optional query parameters. The default is `["displayName", "members"]`.

[float]
===== `select.devices`

Override the default https://learn.microsoft.com/en-us/graph/api/user-get?view=graph-rest-1.0&tabs=http#optional-query-parameters[device query selections].
Override the default https://learn.microsoft.com/en-us/graph/api/device-get?view=graph-rest-1.0&tabs=http#optional-query-parameters[device query selections].
This is a list of optional query parameters. The default is `["accountEnabled", "deviceId",
"displayName", "operatingSystem", "operatingSystemVersion", "physicalIds", "extensionAttributes",
"alternativeSecurityIds"]`.
Expand Down
6 changes: 3 additions & 3 deletions x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ func (f *graph) Users(ctx context.Context, deltaLink string) ([]*fetcher.User, s
for _, v := range response.Users {
user, err := newUserFromAPI(v)
if err != nil {
f.logger.Errorf("Unable to parse user from API: %w", err)
f.logger.Errorw("Unable to parse user from API", "error", err)
continue
}
f.logger.Debugf("Got user %q from API", user.ID)
Expand Down Expand Up @@ -258,7 +258,7 @@ func (f *graph) Devices(ctx context.Context, deltaLink string) ([]*fetcher.Devic
for _, v := range response.Devices {
device, err := newDeviceFromAPI(v)
if err != nil {
f.logger.Errorf("Unable to parse device from API: %w", err)
f.logger.Errorw("Unable to parse device from API", "error", err)
continue
}
f.logger.Debugf("Got device %q from API", device.ID)
Expand Down Expand Up @@ -290,7 +290,7 @@ func (f *graph) addRegistered(ctx context.Context, device *fetcher.Device, typ s
switch {
case err == nil, errors.Is(err, nextLinkLoopError{"users"}), errors.Is(err, missingLinkError{"users"}):
default:
f.logger.Errorf("Failed to obtain some registered user data: %w", err)
f.logger.Errorw("Failed to obtain some registered user data", "error", err)
}
for _, u := range users {
set.Add(u.ID)
Expand Down
Loading