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

Make user.id a string in system/users, in line with ECS #19019

Merged
merged 3 commits into from
Jun 10, 2020
Merged

Make user.id a string in system/users, in line with ECS #19019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f27f2e
user.id must be a string
fearful-symmetry Jun 5, 2020
7550f39
changelog entry
fearful-symmetry Jun 5, 2020
f5b704a
make it a breaking change
fearful-symmetry Jun 8, 2020
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 @@ -58,6 +58,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Make use of secure port when accessing Kubelet API {pull}16063[16063]
- Add Tomcat overview dashboard {pull}14026[14026]
- Move service config under metrics and simplify metric types. {pull}18691[18691]
- Fix ECS compliance of user.id field in system/users metricset {pull}19019[19019]

*Packetbeat*

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/system/users/_meta/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}
},
"user": {
"id": 1000,
"id": "1000",
"name": "alexk"
}
}
3 changes: 2 additions & 1 deletion metricbeat/module/system/users/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ package users

import (
"net"
"strconv"

"github.com/godbus/dbus"
"github.com/pkg/errors"
Expand Down Expand Up @@ -107,7 +108,7 @@ func eventMapping(conn *dbus.Conn, sessions []loginSession, report mb.ReporterV2
},
"user": common.MapStr{
"name": session.User,
"id": session.UID,
"id": strconv.Itoa(int(session.UID)),
},
}

Expand Down