diff --git a/auditbeat/docs/fields.asciidoc b/auditbeat/docs/fields.asciidoc index 28443c5102a..c11aa32565f 100644 --- a/auditbeat/docs/fields.asciidoc +++ b/auditbeat/docs/fields.asciidoc @@ -6368,7 +6368,6 @@ The operating system's kernel version. -- [float] -<<<<<<< HEAD == package fields `package` contains information about an installed or removed package. @@ -6464,8 +6463,6 @@ Package URL. -- [float] -======= ->>>>>>> Config and docs. == user fields `user` contains information about the users on a system. diff --git a/x-pack/auditbeat/docs/modules/system.asciidoc b/x-pack/auditbeat/docs/modules/system.asciidoc index bce9ee9335b..d6f902d07df 100644 --- a/x-pack/auditbeat/docs/modules/system.asciidoc +++ b/x-pack/auditbeat/docs/modules/system.asciidoc @@ -51,6 +51,7 @@ sample suggested configuration. - module: system datasets: - host + - login - package - process - socket @@ -163,3 +164,4 @@ include::system/process.asciidoc[] include::system/socket.asciidoc[] include::system/user.asciidoc[] +