Skip to content

Commit

Permalink
mage update
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoph Wurm committed Jan 29, 2019
1 parent b1f70fb commit fe229c7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 0 additions & 3 deletions auditbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6368,7 +6368,6 @@ The operating system's kernel version.
--
[float]
<<<<<<< HEAD
== package fields
`package` contains information about an installed or removed package.
Expand Down Expand Up @@ -6464,8 +6463,6 @@ Package URL.
--
[float]
=======
>>>>>>> Config and docs.
== user fields
`user` contains information about the users on a system.
Expand Down
2 changes: 2 additions & 0 deletions x-pack/auditbeat/docs/modules/system.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sample suggested configuration.
- module: system
datasets:
- host
- login
- package
- process
- socket
Expand Down Expand Up @@ -163,3 +164,4 @@ include::system/process.asciidoc[]
include::system/socket.asciidoc[]

include::system/user.asciidoc[]

0 comments on commit fe229c7

Please sign in to comment.