From 8db525573e5e4feaa0ea4c9cf2ce336926e7edbe Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Thu, 1 Nov 2018 11:22:34 +0100 Subject: [PATCH] Migrate fileset to ECS The following fields were migrated to ECS: * fileset.name -> event.dataset * fileset.module -> event.module Changes: * Update generated files * Update tests * Update changelog * Update migration file --- CHANGELOG.asciidoc | 2 + dev-tools/ecs-migration.yml | 18 ++- filebeat/_meta/fields.common.yml | 8 -- filebeat/channel/factory.go | 4 +- filebeat/docs/fields.asciidoc | 16 --- filebeat/include/fields.go | 2 +- .../access/test/test.log-expected.json | 16 +-- .../apache2/error/test/test.log-expected.json | 12 +- .../auditd/log/test/test.log-expected.json | 8 +- .../audit/test/test.log-expected.json | 28 ++-- .../gc/test/test.log-expected.json | 12 +- .../server/test/test.log-expected.json | 76 +++++----- .../slowlog/test/test.log-expected.json | 24 ++-- .../log/test/default.log-expected.json | 4 +- .../log/test/haproxy.log-expected.json | 4 +- .../haproxy/log/test/tcplog.log-expected.json | 4 +- .../icinga/debug/test/test.log-expected.json | 12 +- .../icinga/main/test/test.log-expected.json | 12 +- .../startup/test/test.log-expected.json | 12 +- .../iis/access/test/test.log-expected.json | 12 +- .../iis/error/test/test.log-expected.json | 16 +-- .../log/test/controller.log-expected.json | 80 +++++------ .../kafka/log/test/server.log-expected.json | 80 +++++------ .../test/state-change-1.1.0.log-expected.json | 4 +- .../test/state-change-2.0.0.log-expected.json | 4 +- .../log/test/state-change.log-expected.json | 4 +- .../kibana/log/test/test.log-expected.json | 12 +- .../log/test/logstash-plain.log-expected.json | 8 +- .../test/slowlog-plain.log-expected.json | 4 +- .../mongodb-debian-3.2.11.log-expected.json | 136 +++++++++--------- .../nginx/access/test/test.log-expected.json | 28 ++-- .../nginx/error/test/error.log-expected.json | 8 +- .../result/test/test.log-expected.json | 4 +- ...-9.6-debian-with-slowlog.log-expected.json | 72 +++++----- .../redis/log/test/test.log-expected.json | 16 +-- .../system/auth/test/test.log-expected.json | 40 +++--- .../darwin-syslog-sample.log-expected.json | 12 +- .../access/test/test.log-expected.json | 8 +- filebeat/tests/system/test_modules.py | 6 +- .../eve/test/eve-alerts.log-expected.json | 80 +++++------ .../eve/test/eve-small.log-expected.json | 32 ++--- 41 files changed, 464 insertions(+), 476 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index d386e4abdc8..9ebc41bb933 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -20,6 +20,8 @@ https://github.com/elastic/beats/compare/v6.4.0...master[Check the HEAD diff] - Use `initial_scan` action for new paths. {pull}7954[7954] *Filebeat* +- Rename `fileset.name` to `event.name`. +- Rename `fileset.module` to `event.module`. - Remove the deprecated `prospector(s)` option in the configuration use `input(s)` instead. {pull}8909[8909] - Rename `offset` to `log.offset`. diff --git a/dev-tools/ecs-migration.yml b/dev-tools/ecs-migration.yml index 96b8af0993f..10a2642bda4 100644 --- a/dev-tools/ecs-migration.yml +++ b/dev-tools/ecs-migration.yml @@ -11,7 +11,17 @@ # # Copy to is useful for fields where multiple fields map to the same ECS field # copy_to: true-if-field-should-be-copied-to-target-in-6x - - from: offset - to: log.offset - alias: true - copy_to: false +- from: offset + to: log.offset + alias: true + copy_to: false + +- from: fileset.name + to: event.dataset + alias: true + copy_to: false + +- from: fileset.module + to: event.module + alias: true + copy_to: false diff --git a/filebeat/_meta/fields.common.yml b/filebeat/_meta/fields.common.yml index 9aae73bce53..014fb16627c 100644 --- a/filebeat/_meta/fields.common.yml +++ b/filebeat/_meta/fields.common.yml @@ -41,14 +41,6 @@ the original `@timestamp` (representing the time when the log line was read) in this field. - - name: fileset.module - description: > - The Filebeat module that generated this event. - - - name: fileset.name - description: > - The Filebeat fileset that generated this event. - - name: syslog.facility type: long required: false diff --git a/filebeat/channel/factory.go b/filebeat/channel/factory.go index 5222ccba826..99399d20e0d 100644 --- a/filebeat/channel/factory.go +++ b/filebeat/channel/factory.go @@ -103,10 +103,10 @@ func (f *OutletFactory) Create(p beat.Pipeline, cfg *common.Config, dynFields *c fields := common.MapStr{} setMeta(fields, "module", config.Module) - setMeta(fields, "name", config.Fileset) + setMeta(fields, "dataset", config.Fileset) if len(fields) > 0 { fields = common.MapStr{ - "fileset": fields, + "event": fields, } } if config.Type != "" { diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc index 5e160063f06..7705c3128fa 100644 --- a/filebeat/docs/fields.asciidoc +++ b/filebeat/docs/fields.asciidoc @@ -4687,22 +4687,6 @@ The input type from which the event was generated. This field is set to the valu In case the ingest pipeline parses the timestamp from the log contents, it stores the original `@timestamp` (representing the time when the log line was read) in this field. --- - -*`fileset.module`*:: -+ --- -The Filebeat module that generated this event. - - --- - -*`fileset.name`*:: -+ --- -The Filebeat fileset that generated this event. - - -- *`syslog.facility`*:: diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go index c1d1bd9ca12..aae7d974d68 100644 --- a/filebeat/include/fields.go +++ b/filebeat/include/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "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" + return "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" } diff --git a/filebeat/module/apache2/access/test/test.log-expected.json b/filebeat/module/apache2/access/test/test.log-expected.json index ad39e1af00b..e9a306b0930 100644 --- a/filebeat/module/apache2/access/test/test.log-expected.json +++ b/filebeat/module/apache2/access/test/test.log-expected.json @@ -8,8 +8,8 @@ "apache2.access.response_code": "404", "apache2.access.url": "/favicon.ico", "apache2.access.user_name": "-", - "fileset.module": "apache2", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "apache2", "input.type": "log", "log.offset": 0 }, @@ -32,8 +32,8 @@ "apache2.access.user_agent.os_minor": "12", "apache2.access.user_agent.os_name": "Mac OS X", "apache2.access.user_name": "-", - "fileset.module": "apache2", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "apache2", "input.type": "log", "log.offset": 73 }, @@ -42,8 +42,8 @@ "apache2.access.remote_ip": "::1", "apache2.access.response_code": "408", "apache2.access.user_name": "-", - "fileset.module": "apache2", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "apache2", "input.type": "log", "log.offset": 238 }, @@ -65,8 +65,8 @@ "apache2.access.user_agent.os_name": "Windows 7", "apache2.access.user_agent.patch": "a2", "apache2.access.user_name": "-", - "fileset.module": "apache2", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "apache2", "input.type": "log", "log.offset": 285 } diff --git a/filebeat/module/apache2/error/test/test.log-expected.json b/filebeat/module/apache2/error/test/test.log-expected.json index 42cfe8441f9..3832540823f 100644 --- a/filebeat/module/apache2/error/test/test.log-expected.json +++ b/filebeat/module/apache2/error/test/test.log-expected.json @@ -4,8 +4,8 @@ "apache2.error.client": "192.168.33.1", "apache2.error.level": "error", "apache2.error.message": "File does not exist: /var/www/favicon.ico", - "fileset.module": "apache2", - "fileset.name": "error", + "event.dataset": "error", + "event.module": "apache2", "input.type": "log", "log.offset": 0 }, @@ -15,8 +15,8 @@ "apache2.error.message": "AH00094: Command line: '/usr/local/Cellar/httpd24/2.4.23_2/bin/httpd'", "apache2.error.module": "core", "apache2.error.pid": "11379", - "fileset.module": "apache2", - "fileset.name": "error", + "event.dataset": "error", + "event.module": "apache2", "input.type": "log", "log.offset": 99 }, @@ -28,8 +28,8 @@ "apache2.error.module": "core", "apache2.error.pid": "35708", "apache2.error.tid": "4328636416", - "fileset.module": "apache2", - "fileset.name": "error", + "event.dataset": "error", + "event.module": "apache2", "input.type": "log", "log.offset": 229 } diff --git a/filebeat/module/auditd/log/test/test.log-expected.json b/filebeat/module/auditd/log/test/test.log-expected.json index bb874d7b82a..952d4ed5cea 100644 --- a/filebeat/module/auditd/log/test/test.log-expected.json +++ b/filebeat/module/auditd/log/test/test.log-expected.json @@ -11,8 +11,8 @@ "auditd.log.ses": "4294967295", "auditd.log.src": "192.168.2.0", "auditd.log.src_prefixlen": "24", - "fileset.module": "auditd", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "auditd", "input.type": "log", "log.offset": 0 }, @@ -44,8 +44,8 @@ "auditd.log.syscall": "44", "auditd.log.tty": "(none)", "auditd.log.uid": "0", - "fileset.module": "auditd", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "auditd", "input.type": "log", "log.offset": 174 } diff --git a/filebeat/module/elasticsearch/audit/test/test.log-expected.json b/filebeat/module/elasticsearch/audit/test/test.log-expected.json index 4bfa83c31ea..4e239b6a7d7 100644 --- a/filebeat/module/elasticsearch/audit/test/test.log-expected.json +++ b/filebeat/module/elasticsearch/audit/test/test.log-expected.json @@ -6,8 +6,8 @@ "elasticsearch.audit.origin_address": "147.107.128.77", "elasticsearch.audit.principal": "i030648", "elasticsearch.audit.uri": "/_xpack/security/_authenticate", - "fileset.module": "elasticsearch", - "fileset.name": "audit", + "event.dataset": "audit", + "event.module": "elasticsearch", "input.type": "log", "log.offset": 0, "message": "[2018-06-19T05:16:15,549] [rest] [authentication_failed] origin_address=[147.107.128.77], principal=[i030648], uri=[/_xpack/security/_authenticate]", @@ -21,8 +21,8 @@ "elasticsearch.audit.principal": "rado", "elasticsearch.audit.uri": "/_xpack/security/_authenticate", "elasticsearch.node.name": "v_VJhjV", - "fileset.module": "elasticsearch", - "fileset.name": "audit", + "event.dataset": "audit", + "event.module": "elasticsearch", "input.type": "log", "log.offset": 155, "message": "[2018-06-19T05:07:52,304] [v_VJhjV] [rest] [authentication_failed]\torigin_address=[172.22.0.3], principal=[rado], uri=[/_xpack/security/_authenticate]", @@ -37,8 +37,8 @@ "elasticsearch.audit.origin_type": "local_node", "elasticsearch.audit.principal": "_xpack_security", "elasticsearch.audit.request": "ClearScrollRequest", - "fileset.module": "elasticsearch", - "fileset.name": "audit", + "event.dataset": "audit", + "event.module": "elasticsearch", "input.type": "log", "log.offset": 306, "message": "[2018-06-19T05:00:15,778] [transport] [access_granted] origin_type=[local_node], origin_address=[192.168.1.165], principal=[_xpack_security], action=[indices:data/read/scroll/clear], request=[ClearScrollRequest]", @@ -51,8 +51,8 @@ "elasticsearch.audit.origin_address": "172.22.0.3", "elasticsearch.audit.uri": "/_xpack/security/_authenticate", "elasticsearch.node.name": "v_VJhjV", - "fileset.module": "elasticsearch", - "fileset.name": "audit", + "event.dataset": "audit", + "event.module": "elasticsearch", "input.type": "log", "log.offset": 519, "message": "[2018-06-19T05:07:45,544] [v_VJhjV] [rest] [anonymous_access_denied]\torigin_address=[172.22.0.3], uri=[/_xpack/security/_authenticate]", @@ -65,8 +65,8 @@ "elasticsearch.audit.origin_address": "147.107.128.77", "elasticsearch.audit.principal": "N078801", "elasticsearch.audit.uri": "/_xpack/security/_authenticate", - "fileset.module": "elasticsearch", - "fileset.name": "audit", + "event.dataset": "audit", + "event.module": "elasticsearch", "input.type": "log", "log.offset": 654, "message": "[2018-06-19T05:26:27,268] [rest] [authentication_failed]\torigin_address=[147.107.128.77], principal=[N078801], uri=[/_xpack/security/_authenticate]", @@ -81,8 +81,8 @@ "elasticsearch.audit.origin_type": "rest", "elasticsearch.audit.principal": "_anonymous", "elasticsearch.audit.request": "MainRequest", - "fileset.module": "elasticsearch", - "fileset.name": "audit", + "event.dataset": "audit", + "event.module": "elasticsearch", "input.type": "log", "log.offset": 802, "message": "[2018-06-19T05:55:26,898] [transport] [access_denied]\torigin_type=[rest], origin_address=[147.107.128.77], principal=[_anonymous], action=[cluster:monitor/main], request=[MainRequest]", @@ -97,8 +97,8 @@ "elasticsearch.audit.request_body": "body", "elasticsearch.audit.uri": "/_nodes?filter_path=nodes.*.version%2Cnodes.*.http.publish_address%2Cnodes.*.ip", "elasticsearch.node.name": "v_VJhjV", - "fileset.module": "elasticsearch", - "fileset.name": "audit", + "event.dataset": "audit", + "event.module": "elasticsearch", "input.type": "log", "log.offset": 986, "message": "[2018-06-19T05:24:15,190] [v_VJhjV] [rest] [authentication_failed]\torigin_address=[172.18.0.3], principal=[elastic], uri=[/_nodes?filter_path=nodes.*.version%2Cnodes.*.http.publish_address%2Cnodes.*.ip], request_body=[body]", diff --git a/filebeat/module/elasticsearch/gc/test/test.log-expected.json b/filebeat/module/elasticsearch/gc/test/test.log-expected.json index beae001398a..87a1e80be98 100644 --- a/filebeat/module/elasticsearch/gc/test/test.log-expected.json +++ b/filebeat/module/elasticsearch/gc/test/test.log-expected.json @@ -11,8 +11,8 @@ "elasticsearch.gc.phase.cpu_time.user_sec": "0.01", "elasticsearch.gc.phase.duration_sec": "0.0021716", "elasticsearch.gc.phase.name": "CMS Initial Mark", - "fileset.module": "elasticsearch", - "fileset.name": "gc", + "event.dataset": "gc", + "event.module": "elasticsearch", "input.type": "log", "log.offset": 0, "message": "2018-03-03T19:37:06.157+0500: 14597.826: [GC (CMS Initial Mark) [1 CMS-initial-mark: 131804K(174784K)] 142444K(253440K), 0.0021716 secs] [Times: user=0.01 sys=0.00, real=0.00 secs]", @@ -23,8 +23,8 @@ "elasticsearch.gc.jvm_runtime_sec": "1396138.752", "elasticsearch.gc.stopping_threads_time_sec": "0.0000702", "elasticsearch.gc.threads_total_stop_time_sec": "0.0083760", - "fileset.module": "elasticsearch", - "fileset.name": "gc", + "event.dataset": "gc", + "event.module": "elasticsearch", "input.type": "log", "log.offset": 181, "message": "2018-06-11T01:53:11.382+0000: 1396138.752: Total time for which application threads were stopped: 0.0083760 seconds, Stopping threads took: 0.0000702 seconds", @@ -49,8 +49,8 @@ "elasticsearch.gc.phase.weak_refs_processing_time_sec": "0.0003647", "elasticsearch.gc.young_gen.size_kb": "157248", "elasticsearch.gc.young_gen.used_kb": "113198", - "fileset.module": "elasticsearch", - "fileset.name": "gc", + "event.dataset": "gc", + "event.module": "elasticsearch", "input.type": "log", "log.offset": 339, "message": "2018-06-30T16:35:26.632+0500: 224.671: [GC (CMS Final Remark) [YG occupancy: 113198 K (157248 K)]224.671: [Rescan (parallel) , 0.0148273 secs]224.686: [weak refs processing, 0.0003647 secs]224.687: [class unloading, 0.0188407 secs]224.705: [scrub symbol table, 0.0100207 secs]224.715: [scrub string table, 0.0005253 secs][1 CMS-remark: 277821K(349568K)] 391020K(506816K), 0.0457689 secs] [Times: user=0.12 sys=0.00, real=0.04 secs]", diff --git a/filebeat/module/elasticsearch/server/test/test.log-expected.json b/filebeat/module/elasticsearch/server/test/test.log-expected.json index 7eacc62cf02..60fbf0c1a2c 100644 --- a/filebeat/module/elasticsearch/server/test/test.log-expected.json +++ b/filebeat/module/elasticsearch/server/test/test.log-expected.json @@ -4,8 +4,8 @@ "elasticsearch.index.name": "test-filebeat-modules", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.c.m.MetaDataCreateIndexService", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 0, @@ -16,8 +16,8 @@ "@timestamp": "2018-05-17T08:19:35,939", "elasticsearch.node.name": "", "elasticsearch.server.component": "o.e.n.Node", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 209, @@ -28,8 +28,8 @@ "@timestamp": "2018-05-17T08:19:36,089", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.e.NodeEnvironment", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 289, @@ -40,8 +40,8 @@ "@timestamp": "2018-05-17T08:19:36,090", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.e.NodeEnvironment", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 477, @@ -51,8 +51,8 @@ { "@timestamp": "2018-05-17T08:19:36,116", "elasticsearch.server.component": "o.e.n.Node", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 611, @@ -63,8 +63,8 @@ "@timestamp": "2018-05-17T08:23:48,941", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.c.r.a.DiskThresholdMonitor", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 766, @@ -76,8 +76,8 @@ "elasticsearch.index.name": "filebeat-test-input", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.c.m.MetaDataCreateIndexService", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 1034, @@ -90,8 +90,8 @@ "elasticsearch.index.name": "filebeat-test-input", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.c.m.MetaDataMappingService", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 1239, @@ -104,8 +104,8 @@ "elasticsearch.index.name": ".kibana", "elasticsearch.node.name": "QGY1F5P", "elasticsearch.server.component": "o.e.c.m.MetaDataMappingService", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 1380, @@ -116,8 +116,8 @@ "@timestamp": "2018-05-17T08:29:25,598", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.n.Node", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 1509, @@ -128,8 +128,8 @@ "@timestamp": "2018-05-17T08:29:25,612", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.n.Node", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 1591, @@ -140,8 +140,8 @@ "@timestamp": "2018-07-03T11:45:48,548", "elasticsearch.node.name": "srvmulpvlsk252_md", "elasticsearch.server.component": "o.e.d.z.ZenDiscovery", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 1668, @@ -152,8 +152,8 @@ "@timestamp": "2018-07-03T11:45:48,548", "elasticsearch.node.name": "srvmulpvlsk252_md", "elasticsearch.server.component": "o.e.d.z.ZenDiscovery", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.flags": [ "multiline" @@ -166,8 +166,8 @@ { "@timestamp": "2018-07-03T11:45:52,666", "elasticsearch.server.component": "r.suppressed", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.flags": [ "multiline" @@ -180,8 +180,8 @@ { "@timestamp": "2018-07-03T11:48:02,552", "elasticsearch.server.component": "r.suppressed", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.flags": [ "multiline" @@ -197,8 +197,8 @@ "elasticsearch.server.component": "o.e.m.j.JvmGcMonitorService", "elasticsearch.server.gc.young.one": "3449979", "elasticsearch.server.gc.young.two": "986594", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.flags": [ "multiline" @@ -213,8 +213,8 @@ "elasticsearch.node.name": "srvmulpvlsk252_md", "elasticsearch.server.component": "o.e.m.j.JvmGcMonitorService", "elasticsearch.server.gc_overhead": "3449992", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "WARN", "log.offset": 10205, @@ -225,8 +225,8 @@ "@timestamp": "2018-07-03T11:48:02,541", "elasticsearch.node.name": "srvmulpvlsk252_md", "elasticsearch.server.component": "o.e.a.b.TransportShardBulkAction", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.level": "WARN", "log.offset": 10354, @@ -237,8 +237,8 @@ "@timestamp": "2018-07-03T20:10:07,376", "elasticsearch.node.name": "srvmulpvlsk252_md", "elasticsearch.server.component": "o.e.x.m.MonitoringService", - "fileset.module": "elasticsearch", - "fileset.name": "server", + "event.dataset": "server", + "event.module": "elasticsearch", "input.type": "log", "log.flags": [ "multiline" diff --git a/filebeat/module/elasticsearch/slowlog/test/test.log-expected.json b/filebeat/module/elasticsearch/slowlog/test/test.log-expected.json index fb2ebe22985..7710e282a80 100644 --- a/filebeat/module/elasticsearch/slowlog/test/test.log-expected.json +++ b/filebeat/module/elasticsearch/slowlog/test/test.log-expected.json @@ -13,8 +13,8 @@ "elasticsearch.slowlog.total_hits": 19435, "elasticsearch.slowlog.total_shards": 1, "elasticsearch.slowlog.types": "", - "fileset.module": "elasticsearch", - "fileset.name": "slowlog", + "event.dataset": "slowlog", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 0, @@ -35,8 +35,8 @@ "elasticsearch.slowlog.total_hits": 19435, "elasticsearch.slowlog.total_shards": 1, "elasticsearch.slowlog.types": "", - "fileset.module": "elasticsearch", - "fileset.name": "slowlog", + "event.dataset": "slowlog", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 265, @@ -57,8 +57,8 @@ "elasticsearch.slowlog.total_hits": 0, "elasticsearch.slowlog.total_shards": 1, "elasticsearch.slowlog.types": "", - "fileset.module": "elasticsearch", - "fileset.name": "slowlog", + "event.dataset": "slowlog", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 532, @@ -79,8 +79,8 @@ "elasticsearch.slowlog.total_hits": 0, "elasticsearch.slowlog.total_shards": 1, "elasticsearch.slowlog.types": "", - "fileset.module": "elasticsearch", - "fileset.name": "slowlog", + "event.dataset": "slowlog", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 1999, @@ -99,8 +99,8 @@ "elasticsearch.slowlog.took": "1.4ms", "elasticsearch.slowlog.took_millis": 1, "elasticsearch.slowlog.type": "doc", - "fileset.module": "elasticsearch", - "fileset.name": "slowlog", + "event.dataset": "slowlog", + "event.module": "elasticsearch", "input.type": "log", "log.level": "INFO", "log.offset": 3462, @@ -119,8 +119,8 @@ "elasticsearch.slowlog.took": "1.7ms", "elasticsearch.slowlog.took_millis": 1, "elasticsearch.slowlog.type": "doc", - "fileset.module": "elasticsearch", - "fileset.name": "slowlog", + "event.dataset": "slowlog", + "event.module": "elasticsearch", "input.type": "log", "log.flags": [ "multiline" diff --git a/filebeat/module/haproxy/log/test/default.log-expected.json b/filebeat/module/haproxy/log/test/default.log-expected.json index 32778aa494d..99a36d83793 100644 --- a/filebeat/module/haproxy/log/test/default.log-expected.json +++ b/filebeat/module/haproxy/log/test/default.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-09-20T15:42:59.000Z", - "fileset.module": "haproxy", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "haproxy", "haproxy.client.ip": "1.2.3.4", "haproxy.client.port": "40780", "haproxy.destination.ip": "1.2.3.4", diff --git a/filebeat/module/haproxy/log/test/haproxy.log-expected.json b/filebeat/module/haproxy/log/test/haproxy.log-expected.json index 7cdc78b77d9..13c503f8b0d 100644 --- a/filebeat/module/haproxy/log/test/haproxy.log-expected.json +++ b/filebeat/module/haproxy/log/test/haproxy.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-07-30T09:03:52.726Z", - "fileset.module": "haproxy", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "haproxy", "haproxy.backend_name": "docs_microservice", "haproxy.backend_queue": 0, "haproxy.bytes_read": 168, diff --git a/filebeat/module/haproxy/log/test/tcplog.log-expected.json b/filebeat/module/haproxy/log/test/tcplog.log-expected.json index c3a8ec971e7..f9ef4f67ece 100644 --- a/filebeat/module/haproxy/log/test/tcplog.log-expected.json +++ b/filebeat/module/haproxy/log/test/tcplog.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-09-20T15:44:23.285Z", - "fileset.module": "haproxy", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "haproxy", "haproxy.backend_name": "app", "haproxy.backend_queue": 0, "haproxy.bytes_read": 212, diff --git a/filebeat/module/icinga/debug/test/test.log-expected.json b/filebeat/module/icinga/debug/test/test.log-expected.json index e382d788f4a..d412a561741 100644 --- a/filebeat/module/icinga/debug/test/test.log-expected.json +++ b/filebeat/module/icinga/debug/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2017-04-04T11:43:09.000Z", - "fileset.module": "icinga", - "fileset.name": "debug", + "event.dataset": "debug", + "event.module": "icinga", "icinga.debug.facility": "GraphiteWriter", "icinga.debug.message": "Add to metric list:'icinga2.demo.services.procs.procs.perfdata.procs.warn 250 1491306189'.", "icinga.debug.severity": "debug", @@ -11,8 +11,8 @@ }, { "@timestamp": "2017-04-04T11:43:09.000Z", - "fileset.module": "icinga", - "fileset.name": "debug", + "event.dataset": "debug", + "event.module": "icinga", "icinga.debug.facility": "IdoMysqlConnection", "icinga.debug.message": "Query: UPDATE icinga_servicestatus SET acknowledgement_type = '0', active_checks_enabled = '1', check_command = 'mysql_health', check_source = 'demo', check_type = '0', current_check_attempt = '1', current_notification_number = '180', current_state = '2', endpoint_object_id = 242, event_handler = '', event_handler_enabled = '1', execution_time = '0.355594', flap_detection_enabled = '0', has_been_checked = '1', instance_id = 1, is_flapping = '0', is_reachable = '1', last_check = FROM_UNIXTIME(1491306189), last_hard_state = '2', last_hard_state_change = FROM_UNIXTIME(1491290599), last_notification = FROM_UNIXTIME(1491304989), last_state_change = FROM_UNIXTIME(1491290599), last_time_critical = FROM_UNIXTIME(1491306189), last_time_unknown = FROM_UNIXTIME(1491290589), latency = '0.001466', long_output = '', max_check_attempts = '5', next_check = FROM_UNIXTIME(1491306198), next_notification = FROM_UNIXTIME(1491306789), normal_check_interval = '0.166667', notifications_enabled = '1', original_attributes = 'null', output = 'CRITICAL - cannot connect to information_schema. Access denied for user \\'test1\\'@\\'blerims-mbp.int.netways.de\\' (using password: YES)', passive_checks_enabled = '1', percent_state_change = '0', perfdata = '', problem_has_been_acknowledged = '0', process_performance_data = '1', retry_check_interval = '0.166667', scheduled_downtime_depth = '0', service_object_id = 333, should_be_scheduled = '1', state_type = '1', status_update_time = FROM_UNIXTIME(1491306189) WHERE service_object_id = 333", "icinga.debug.severity": "debug", @@ -21,8 +21,8 @@ }, { "@timestamp": "2017-04-04T11:43:11.000Z", - "fileset.module": "icinga", - "fileset.name": "debug", + "event.dataset": "debug", + "event.module": "icinga", "icinga.debug.facility": "Process", "icinga.debug.message": "Running command '/usr/lib/nagios/plugins/check_ping' '-H' 'mysql.icinga.com' '-c' '5000,100%' '-w' '3000,80%': PID 8288", "icinga.debug.severity": "notice", diff --git a/filebeat/module/icinga/main/test/test.log-expected.json b/filebeat/module/icinga/main/test/test.log-expected.json index aaf30988997..cc324c7ec14 100644 --- a/filebeat/module/icinga/main/test/test.log-expected.json +++ b/filebeat/module/icinga/main/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2017-04-04T09:16:34.000Z", - "fileset.module": "icinga", - "fileset.name": "main", + "event.dataset": "main", + "event.module": "icinga", "icinga.main.facility": "Notification", "icinga.main.message": "Sending 'Recovery' notification 'demo!load!mail-icingaadmin for user 'on-call'", "icinga.main.severity": "information", @@ -11,8 +11,8 @@ }, { "@timestamp": "2017-04-04T09:16:34.000Z", - "fileset.module": "icinga", - "fileset.name": "main", + "event.dataset": "main", + "event.module": "icinga", "icinga.main.facility": "PluginNotificationTask", "icinga.main.message": "Notification command for object 'demo!load' (PID: 19401, arguments: '/etc/icinga2/scripts/mail-service-notification.sh') terminated with exit code 127, output: /etc/icinga2/scripts/mail-service-notification.sh: 20: /etc/icinga2/scripts/mail-service-notification.sh: mail: not found\n/usr/bin/printf: write error: Broken pipe\n", "icinga.main.severity": "warning", @@ -24,8 +24,8 @@ }, { "@timestamp": "2017-04-04T09:16:48.000Z", - "fileset.module": "icinga", - "fileset.name": "main", + "event.dataset": "main", + "event.module": "icinga", "icinga.main.facility": "IdoMysqlConnection", "icinga.main.message": "Query queue items: 0, query rate: 5.38333/s (323/min 1610/5min 4778/15min);", "icinga.main.severity": "information", diff --git a/filebeat/module/icinga/startup/test/test.log-expected.json b/filebeat/module/icinga/startup/test/test.log-expected.json index ef4d5df383f..6e6abbc601e 100644 --- a/filebeat/module/icinga/startup/test/test.log-expected.json +++ b/filebeat/module/icinga/startup/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { - "@timestamp": "2018-11-06T07:15:39.844Z", - "fileset.module": "icinga", - "fileset.name": "startup", + "@timestamp": "2018-11-06T08:49:49.239Z", + "event.dataset": "startup", + "event.module": "icinga", "icinga.startup.facility": "cli", "icinga.startup.message": "Icinga application loader (version: r2.6.3-1)", "icinga.startup.severity": "information", @@ -10,9 +10,9 @@ "log.offset": 0 }, { - "@timestamp": "2018-11-06T07:15:39.844Z", - "fileset.module": "icinga", - "fileset.name": "startup", + "@timestamp": "2018-11-06T08:49:49.239Z", + "event.dataset": "startup", + "event.module": "icinga", "icinga.startup.facility": "cli", "icinga.startup.message": "Loading configuration file(s).", "icinga.startup.severity": "information", diff --git a/filebeat/module/iis/access/test/test.log-expected.json b/filebeat/module/iis/access/test/test.log-expected.json index 44e88e68bc4..83f130f4783 100644 --- a/filebeat/module/iis/access/test/test.log-expected.json +++ b/filebeat/module/iis/access/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-01-01T08:09:10.000Z", - "fileset.module": "iis", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "iis", "iis.access.geoip.city_name": "Berlin", "iis.access.geoip.continent_name": "Europe", "iis.access.geoip.country_iso_code": "DE", @@ -34,8 +34,8 @@ }, { "@timestamp": "2018-01-01T09:10:11.000Z", - "fileset.module": "iis", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "iis", "iis.access.body_received.bytes": "456", "iis.access.body_sent.bytes": "123", "iis.access.cookie": "-", @@ -64,8 +64,8 @@ }, { "@timestamp": "2018-01-01T10:11:12.000Z", - "fileset.module": "iis", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "iis", "iis.access.body_received.bytes": "456", "iis.access.body_sent.bytes": "123", "iis.access.cookie": "-", diff --git a/filebeat/module/iis/error/test/test.log-expected.json b/filebeat/module/iis/error/test/test.log-expected.json index 80a1dc9c7c6..3e1e335b7fa 100644 --- a/filebeat/module/iis/error/test/test.log-expected.json +++ b/filebeat/module/iis/error/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-01-01T08:09:10.000Z", - "fileset.module": "iis", - "fileset.name": "error", + "event.dataset": "error", + "event.module": "iis", "iis.error.http_version": "1.1", "iis.error.method": "GET", "iis.error.queue_name": "-", @@ -18,8 +18,8 @@ }, { "@timestamp": "2018-01-01T09:10:11.000Z", - "fileset.module": "iis", - "fileset.name": "error", + "event.dataset": "error", + "event.module": "iis", "iis.error.geoip.city_name": "Berlin", "iis.error.geoip.continent_name": "Europe", "iis.error.geoip.country_iso_code": "DE", @@ -42,8 +42,8 @@ }, { "@timestamp": "2018-01-01T10:11:12.000Z", - "fileset.module": "iis", - "fileset.name": "error", + "event.dataset": "error", + "event.module": "iis", "iis.error.geoip.city_name": "Berlin", "iis.error.geoip.continent_name": "Europe", "iis.error.geoip.country_iso_code": "DE", @@ -66,8 +66,8 @@ }, { "@timestamp": "2018-01-01T11:12:13.000Z", - "fileset.module": "iis", - "fileset.name": "error", + "event.dataset": "error", + "event.module": "iis", "iis.error.geoip.city_name": "Berlin", "iis.error.geoip.continent_name": "Europe", "iis.error.geoip.country_iso_code": "DE", diff --git a/filebeat/module/kafka/log/test/controller.log-expected.json b/filebeat/module/kafka/log/test/controller.log-expected.json index f622e6ed0f7..2c8f20b4fe8 100644 --- a/filebeat/module/kafka/log/test/controller.log-expected.json +++ b/filebeat/module/kafka/log/test/controller.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2017-08-04T10:48:21.048Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.ControllerEventManager$ControllerEventThread", "kafka.log.component": "controller-event-thread", @@ -13,8 +13,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.063Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.KafkaController", "kafka.log.component": "Controller 0", @@ -25,8 +25,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.064Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.KafkaController", "kafka.log.component": "Controller 0", @@ -37,8 +37,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.082Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.KafkaController", "kafka.log.component": "Controller 0", @@ -49,8 +49,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.085Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.KafkaController", "kafka.log.component": "Controller 0", @@ -61,8 +61,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.154Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.ReplicaStateMachine", "kafka.log.component": "Replica state machine on controller 0", @@ -73,8 +73,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.156Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.PartitionStateMachine", "kafka.log.component": "Partition state machine on Controller 0", @@ -85,8 +85,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.157Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.KafkaController", "kafka.log.component": "Controller 0", @@ -97,8 +97,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.165Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.PartitionStateMachine", "kafka.log.component": "Partition state machine on Controller 0", @@ -109,8 +109,8 @@ }, { "@timestamp": "2017-08-04T11:44:22.588Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.KafkaController", "kafka.log.component": "Controller 0", @@ -121,8 +121,8 @@ }, { "@timestamp": "2017-08-04T11:44:25.094Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.ControllerEventManager$ControllerEventThread", "kafka.log.component": "controller-event-thread", @@ -133,8 +133,8 @@ }, { "@timestamp": "2017-08-04T11:44:25.095Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.ControllerEventManager$ControllerEventThread", "kafka.log.component": "controller-event-thread", @@ -145,8 +145,8 @@ }, { "@timestamp": "2017-08-04T11:44:25.097Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.ControllerEventManager$ControllerEventThread", "kafka.log.component": "controller-event-thread", @@ -157,8 +157,8 @@ }, { "@timestamp": "2017-08-04T11:44:25.099Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.KafkaController", "kafka.log.component": "Controller 0", @@ -169,8 +169,8 @@ }, { "@timestamp": "2017-08-04T11:44:25.100Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.KafkaController", "kafka.log.component": "Controller 0", @@ -181,8 +181,8 @@ }, { "@timestamp": "2017-08-04T11:44:25.105Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.PartitionStateMachine", "kafka.log.component": "Partition state machine on Controller 0", @@ -193,8 +193,8 @@ }, { "@timestamp": "2017-08-04T11:44:25.111Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.ReplicaStateMachine", "kafka.log.component": "Replica state machine on controller 0", @@ -205,8 +205,8 @@ }, { "@timestamp": "2017-08-04T11:44:25.112Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.RequestSendThread", "kafka.log.component": "Controller-0-to-broker-0-send-thread", @@ -217,8 +217,8 @@ }, { "@timestamp": "2017-08-04T11:44:25.112Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.RequestSendThread", "kafka.log.component": "Controller-0-to-broker-0-send-thread", @@ -229,8 +229,8 @@ }, { "@timestamp": "2017-08-04T11:44:25.113Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.controller.RequestSendThread", "kafka.log.component": "Controller-0-to-broker-0-send-thread", diff --git a/filebeat/module/kafka/log/test/server.log-expected.json b/filebeat/module/kafka/log/test/server.log-expected.json index 94e8544a4a4..973869080f3 100644 --- a/filebeat/module/kafka/log/test/server.log-expected.json +++ b/filebeat/module/kafka/log/test/server.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2017-08-04T10:48:20.377Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.server.KafkaServer", "kafka.log.component": "unknown", @@ -13,8 +13,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.379Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.server.KafkaServer", "kafka.log.component": "unknown", @@ -25,8 +25,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.400Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "org.apache.zookeeper.ZooKeeper", "kafka.log.component": "unknown", @@ -37,8 +37,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.400Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "org.apache.zookeeper.ZooKeeper", "kafka.log.component": "unknown", @@ -49,8 +49,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.401Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "org.apache.zookeeper.ZooKeeper", "kafka.log.component": "unknown", @@ -61,8 +61,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.413Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "org.I0Itec.zkclient.ZkClient", "kafka.log.component": "unknown", @@ -73,8 +73,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.415Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "org.apache.zookeeper.ClientCnxn", "kafka.log.component": "unknown", @@ -85,8 +85,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.420Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "org.apache.zookeeper.ClientCnxn", "kafka.log.component": "unknown", @@ -97,8 +97,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.457Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "org.apache.zookeeper.ClientCnxn", "kafka.log.component": "unknown", @@ -109,8 +109,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.458Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "org.I0Itec.zkclient.ZkClient", "kafka.log.component": "unknown", @@ -121,8 +121,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.748Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.server.BrokerMetadataCheckpoint", "kafka.log.component": "unknown", @@ -133,8 +133,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.800Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.server.ClientQuotaManager$ThrottledRequestReaper", "kafka.log.component": "ThrottledRequestReaper-Fetch", @@ -145,8 +145,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.866Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.log.LogManager", "kafka.log.component": "unknown", @@ -157,8 +157,8 @@ }, { "@timestamp": "2017-08-04T10:48:20.873Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.log.LogManager", "kafka.log.component": "unknown", @@ -169,8 +169,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.062Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.server.DelayedOperationPurgatory$ExpiredOperationReaper", "kafka.log.component": "ExpirationReaper-0-Heartbeat", @@ -181,8 +181,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.063Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.utils.ZKCheckedEphemeral", "kafka.log.component": "unknown", @@ -193,8 +193,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.095Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.coordinator.group.GroupMetadataManager", "kafka.log.component": "Group Metadata Manager on Broker 0", @@ -205,8 +205,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.127Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.coordinator.transaction.ProducerIdManager", "kafka.log.component": "ProducerId Manager 0", @@ -217,8 +217,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.162Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.coordinator.transaction.TransactionCoordinator", "kafka.log.component": "Transaction Coordinator 0", @@ -229,8 +229,8 @@ }, { "@timestamp": "2017-08-04T10:48:21.167Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "kafka.coordinator.transaction.TransactionMarkerChannelManager", "kafka.log.component": "Transaction Marker Channel Manager 0", diff --git a/filebeat/module/kafka/log/test/state-change-1.1.0.log-expected.json b/filebeat/module/kafka/log/test/state-change-1.1.0.log-expected.json index 71bdd6fd65b..3ca5d721555 100644 --- a/filebeat/module/kafka/log/test/state-change-1.1.0.log-expected.json +++ b/filebeat/module/kafka/log/test/state-change-1.1.0.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-07-16T10:17:06.489Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "state.change.logger", "kafka.log.component": "Broker id=30", diff --git a/filebeat/module/kafka/log/test/state-change-2.0.0.log-expected.json b/filebeat/module/kafka/log/test/state-change-2.0.0.log-expected.json index 3a73e53d546..dcb7a01e922 100644 --- a/filebeat/module/kafka/log/test/state-change-2.0.0.log-expected.json +++ b/filebeat/module/kafka/log/test/state-change-2.0.0.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-10-31T15:09:30.451Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "state.change.logger", "kafka.log.component": "Broker id=20", diff --git a/filebeat/module/kafka/log/test/state-change.log-expected.json b/filebeat/module/kafka/log/test/state-change.log-expected.json index 190201d4d2d..9cd3e1667ff 100644 --- a/filebeat/module/kafka/log/test/state-change.log-expected.json +++ b/filebeat/module/kafka/log/test/state-change.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2017-08-04T10:48:21.428Z", - "fileset.module": "kafka", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kafka", "input.type": "log", "kafka.log.class": "state.change.logger", "kafka.log.component": "unknown", diff --git a/filebeat/module/kibana/log/test/test.log-expected.json b/filebeat/module/kibana/log/test/test.log-expected.json index 7733cf68972..3f4041b7132 100644 --- a/filebeat/module/kibana/log/test/test.log-expected.json +++ b/filebeat/module/kibana/log/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-05-09T10:57:55.000Z", - "fileset.module": "kibana", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kibana", "http.request.method": "get", "http.response.content_length": 9, "http.response.elapsed_time": 26, @@ -35,8 +35,8 @@ }, { "@timestamp": "2018-05-09T10:59:12.000Z", - "fileset.module": "kibana", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kibana", "input.type": "log", "kibana.log.meta.type": "log", "kibana.log.tags": [ @@ -53,8 +53,8 @@ }, { "@timestamp": "2018-05-09T10:59:12.000Z", - "fileset.module": "kibana", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "kibana", "input.type": "log", "kibana.log.meta.type": "log", "kibana.log.tags": [ diff --git a/filebeat/module/logstash/log/test/logstash-plain.log-expected.json b/filebeat/module/logstash/log/test/logstash-plain.log-expected.json index e3b5b19b2c4..edc112e0b2c 100644 --- a/filebeat/module/logstash/log/test/logstash-plain.log-expected.json +++ b/filebeat/module/logstash/log/test/logstash-plain.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2017-10-23T14:20:12,046", - "fileset.module": "logstash", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "logstash", "input.type": "log", "log.offset": 0, "logstash.log.level": "INFO", @@ -11,8 +11,8 @@ }, { "@timestamp": "2017-11-20T03:55:00,318", - "fileset.module": "logstash", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "logstash", "input.type": "log", "log.flags": [ "multiline" diff --git a/filebeat/module/logstash/slowlog/test/slowlog-plain.log-expected.json b/filebeat/module/logstash/slowlog/test/slowlog-plain.log-expected.json index 25a47c8f63e..6f16bb168c4 100644 --- a/filebeat/module/logstash/slowlog/test/slowlog-plain.log-expected.json +++ b/filebeat/module/logstash/slowlog/test/slowlog-plain.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2017-10-30T09:57:58,243", - "fileset.module": "logstash", - "fileset.name": "slowlog", + "event.dataset": "slowlog", + "event.module": "logstash", "input.type": "log", "log.offset": 0, "logstash.slowlog.event": "\"{\\\"@version\\\":\\\"1\\\",\\\"@timestamp\\\":\\\"2017-10-30T13:57:55.130Z\\\",\\\"host\\\":\\\"sashimi\\\",\\\"sequence\\\":0,\\\"message\\\":\\\"Hello world!\\\"}\"", diff --git a/filebeat/module/mongodb/log/test/mongodb-debian-3.2.11.log-expected.json b/filebeat/module/mongodb/log/test/mongodb-debian-3.2.11.log-expected.json index 81c3f44c68e..62768dc7dec 100644 --- a/filebeat/module/mongodb/log/test/mongodb-debian-3.2.11.log-expected.json +++ b/filebeat/module/mongodb/log/test/mongodb-debian-3.2.11.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-02-05T12:44:56.657Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 0, "mongodb.log.component": "CONTROL", @@ -12,8 +12,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 110, "mongodb.log.component": "CONTROL", @@ -23,8 +23,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 180, "mongodb.log.component": "CONTROL", @@ -34,8 +34,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.677Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 281, "mongodb.log.component": "STORAGE", @@ -45,8 +45,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.724Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 621, "mongodb.log.component": "FTDC", @@ -56,8 +56,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.724Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 774, "mongodb.log.component": "NETWORK", @@ -67,8 +67,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.744Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 889, "mongodb.log.component": "NETWORK", @@ -78,8 +78,8 @@ }, { "@timestamp": "2018-02-05T12:50:55.170Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 983, "mongodb.log.component": "NETWORK", @@ -89,8 +89,8 @@ }, { "@timestamp": "2018-02-05T12:50:55.487Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 1087, "mongodb.log.component": "NETWORK", @@ -100,8 +100,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 1211, "mongodb.log.component": "CONTROL", @@ -111,8 +111,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 1288, "mongodb.log.component": "NETWORK", @@ -122,8 +122,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 1381, "mongodb.log.component": "NETWORK", @@ -133,8 +133,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 1500, "mongodb.log.component": "NETWORK", @@ -144,8 +144,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 1601, "mongodb.log.component": "NETWORK", @@ -155,8 +155,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.688Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 1702, "mongodb.log.component": "STORAGE", @@ -166,8 +166,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 1797, "mongodb.log.component": "CONTROL", @@ -177,8 +177,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 1872, "mongodb.log.component": "CONTROL", @@ -188,8 +188,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 1947, "mongodb.log.component": "CONTROL", @@ -199,8 +199,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 2024, "mongodb.log.component": "CONTROL", @@ -210,8 +210,8 @@ }, { "@timestamp": "2018-02-05T12:50:55.170Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 2361, "mongodb.log.component": "NETWORK", @@ -221,8 +221,8 @@ }, { "@timestamp": "2018-02-05T12:50:56.180Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 2485, "mongodb.log.component": "NETWORK", @@ -232,8 +232,8 @@ }, { "@timestamp": "2018-02-05T13:15:42.095Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 2589, "mongodb.log.component": "NETWORK", @@ -243,8 +243,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 2693, "mongodb.log.component": "NETWORK", @@ -254,8 +254,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 2804, "mongodb.log.component": "STORAGE", @@ -265,8 +265,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.688Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 2902, "mongodb.log.component": "CONTROL", @@ -276,8 +276,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 2982, "mongodb.log.component": "CONTROL", @@ -287,8 +287,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 3123, "mongodb.log.component": "CONTROL", @@ -298,8 +298,8 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 3199, "mongodb.log.component": "CONTROL", @@ -309,8 +309,8 @@ }, { "@timestamp": "2018-02-05T12:50:55.487Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 3279, "mongodb.log.component": "NETWORK", @@ -320,8 +320,8 @@ }, { "@timestamp": "2018-02-05T12:50:56.180Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 3383, "mongodb.log.component": "NETWORK", @@ -331,8 +331,8 @@ }, { "@timestamp": "2018-02-05T13:11:41.401Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 3507, "mongodb.log.component": "NETWORK", @@ -342,8 +342,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.605Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 3631, "mongodb.log.component": "CONTROL", @@ -353,8 +353,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.605Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 3762, "mongodb.log.component": "FTDC", @@ -364,8 +364,8 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", - "fileset.module": "mongodb", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "mongodb", "input.type": "log", "log.offset": 3875, "mongodb.log.component": "NETWORK", diff --git a/filebeat/module/nginx/access/test/test.log-expected.json b/filebeat/module/nginx/access/test/test.log-expected.json index 28a977e6ac0..97e9f2df1a0 100644 --- a/filebeat/module/nginx/access/test/test.log-expected.json +++ b/filebeat/module/nginx/access/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2016-12-07T10:05:07.000Z", - "fileset.module": "nginx", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "nginx", "input.type": "log", "log.offset": 0, "nginx.access.body_sent.bytes": "571", @@ -30,8 +30,8 @@ }, { "@timestamp": "2017-05-29T19:02:48.000Z", - "fileset.module": "nginx", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "nginx", "input.type": "log", "log.offset": 183, "nginx.access.body_sent.bytes": "612", @@ -56,8 +56,8 @@ }, { "@timestamp": "2016-12-07T10:05:07.000Z", - "fileset.module": "nginx", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "nginx", "input.type": "log", "log.offset": 341, "nginx.access.body_sent.bytes": "571", @@ -92,8 +92,8 @@ }, { "@timestamp": "2016-12-07T10:05:07.000Z", - "fileset.module": "nginx", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "nginx", "input.type": "log", "log.offset": 527, "nginx.access.body_sent.bytes": "571", @@ -126,8 +126,8 @@ }, { "@timestamp": "2016-01-22T13:18:29.000Z", - "fileset.module": "nginx", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "nginx", "input.type": "log", "log.offset": 693, "nginx.access.body_sent.bytes": "25507", @@ -159,8 +159,8 @@ }, { "@timestamp": "2016-12-30T06:47:09.000Z", - "fileset.module": "nginx", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "nginx", "input.type": "log", "log.offset": 845, "nginx.access.body_sent.bytes": "8571", @@ -190,8 +190,8 @@ }, { "@timestamp": "2018-04-12T07:48:40.000Z", - "fileset.module": "nginx", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "nginx", "input.type": "log", "log.offset": 1085, "nginx.access.body_sent.bytes": "0", diff --git a/filebeat/module/nginx/error/test/error.log-expected.json b/filebeat/module/nginx/error/test/error.log-expected.json index 8a1aa4f6ae8..b1d5e0fb6bd 100644 --- a/filebeat/module/nginx/error/test/error.log-expected.json +++ b/filebeat/module/nginx/error/test/error.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2016-10-25T14:49:34.000Z", - "fileset.module": "nginx", - "fileset.name": "error", + "event.dataset": "error", + "event.module": "nginx", "input.type": "log", "log.offset": 0, "nginx.error.connection_id": "1", @@ -13,8 +13,8 @@ }, { "@timestamp": "2016-10-25T14:50:44.000Z", - "fileset.module": "nginx", - "fileset.name": "error", + "event.dataset": "error", + "event.module": "nginx", "input.type": "log", "log.offset": 273, "nginx.error.connection_id": "3", diff --git a/filebeat/module/osquery/result/test/test.log-expected.json b/filebeat/module/osquery/result/test/test.log-expected.json index 4db8393768d..40ae0254856 100644 --- a/filebeat/module/osquery/result/test/test.log-expected.json +++ b/filebeat/module/osquery/result/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2017-12-28T14:40:08.000Z", - "fileset.module": "osquery", - "fileset.name": "result", + "event.dataset": "result", + "event.module": "osquery", "input.type": "log", "log.offset": 0, "osquery.result.action": "removed", diff --git a/filebeat/module/postgresql/log/test/postgresql-9.6-debian-with-slowlog.log-expected.json b/filebeat/module/postgresql/log/test/postgresql-9.6-debian-with-slowlog.log-expected.json index 0553bcc232c..4598f1e87b9 100644 --- a/filebeat/module/postgresql/log/test/postgresql-9.6-debian-with-slowlog.log-expected.json +++ b/filebeat/module/postgresql/log/test/postgresql-9.6-debian-with-slowlog.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2017-07-31T13:36:42.585Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 0, "message": "2017-07-31 13:36:42.585 CEST [4974] LOG: database system was shut down at 2017-06-17 16:58:04 CEST", @@ -14,8 +14,8 @@ }, { "@timestamp": "2017-07-31T13:36:42.605Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 100, "message": "2017-07-31 13:36:42.605 CEST [4974] LOG: MultiXact member wraparound protections are now enabled", @@ -27,8 +27,8 @@ }, { "@timestamp": "2017-07-31T13:36:42.615Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 198, "message": "2017-07-31 13:36:42.615 CEST [4978] LOG: autovacuum launcher started", @@ -40,8 +40,8 @@ }, { "@timestamp": "2017-07-31T13:36:42.616Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 268, "message": "2017-07-31 13:36:42.616 CEST [4973] LOG: database system is ready to accept connections", @@ -53,8 +53,8 @@ }, { "@timestamp": "2017-07-31T13:36:42.956Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 357, "message": "2017-07-31 13:36:42.956 CEST [4980] [unknown]@[unknown] LOG: incomplete startup packet", @@ -68,8 +68,8 @@ }, { "@timestamp": "2017-07-31T13:36:43.557Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.flags": [ "multiline" @@ -87,8 +87,8 @@ }, { "@timestamp": "2017-07-31T13:36:44.104Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.flags": [ "multiline" @@ -106,8 +106,8 @@ }, { "@timestamp": "2017-07-31T13:36:44.642Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.flags": [ "multiline" @@ -125,8 +125,8 @@ }, { "@timestamp": "2017-07-31T13:39:16.249Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 1727, "message": "2017-07-31 13:39:16.249 CEST [5407] postgres@users FATAL: database \"users\" does not exist", @@ -140,8 +140,8 @@ }, { "@timestamp": "2017-07-31T13:39:17.945Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 1818, "message": "2017-07-31 13:39:17.945 CEST [5500] postgres@user FATAL: database \"user\" does not exist", @@ -155,8 +155,8 @@ }, { "@timestamp": "2017-07-31T13:39:21.025Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.flags": [ "multiline" @@ -174,8 +174,8 @@ }, { "@timestamp": "2017-07-31T13:39:31.619Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 2620, "message": "2017-07-31 13:39:31.619 CEST [5502] postgres@clients LOG: duration: 9.482 ms statement: select * from clients;", @@ -190,8 +190,8 @@ }, { "@timestamp": "2017-07-31T13:39:40.147Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 2733, "message": "2017-07-31 13:39:40.147 CEST [5502] postgres@clients LOG: duration: 0.765 ms statement: select id from clients;", @@ -206,8 +206,8 @@ }, { "@timestamp": "2017-07-31T13:40:54.310Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.flags": [ "multiline" @@ -225,8 +225,8 @@ }, { "@timestamp": "2017-07-31T13:43:22.645Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 3559, "message": "2017-07-31 13:43:22.645 CEST [5502] postgres@clients LOG: duration: 36.162 ms statement: create table cats(name varchar(50) primary key, toy varchar (50) not null, born timestamp not null);", @@ -241,8 +241,8 @@ }, { "@timestamp": "2017-07-31T13:46:02.670Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 3751, "message": "2017-07-31 13:46:02.670 CEST [5502] postgres@c$lients LOG: duration: 10.540 ms statement: insert into cats(name, toy, born) values('kate', 'ball', now());", @@ -257,8 +257,8 @@ }, { "@timestamp": "2017-07-31T13:46:23.016Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 3908, "message": "2017-07-31 13:46:23.016 CEST [5502] postgres@_clients$db LOG: duration: 5.156 ms statement: insert into cats(name, toy, born) values('frida', 'horse', now());", @@ -273,8 +273,8 @@ }, { "@timestamp": "2017-07-31T13:46:55.637Z", - "fileset.module": "postgresql", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "postgresql", "input.type": "log", "log.offset": 4069, "message": "2017-07-31 13:46:55.637 CEST [5502] postgres@clients_db LOG: duration: 25.871 ms statement: create table dogs(name varchar(50) primary key, owner varchar (50) not null, born timestamp not null);", diff --git a/filebeat/module/redis/log/test/test.log-expected.json b/filebeat/module/redis/log/test/test.log-expected.json index a6eb7c0959c..514778dadfb 100644 --- a/filebeat/module/redis/log/test/test.log-expected.json +++ b/filebeat/module/redis/log/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-05-30T12:23:52.442Z", - "fileset.module": "redis", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "redis", "input.type": "log", "log.offset": 0, "redis.log.level": "notice", @@ -12,8 +12,8 @@ }, { "@timestamp": "2018-05-30T10:05:20.000Z", - "fileset.module": "redis", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "redis", "input.type": "log", "log.offset": 76, "redis.log.level": "debug", @@ -21,8 +21,8 @@ }, { "@timestamp": "2018-05-31T04:32:08.000Z", - "fileset.module": "redis", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "redis", "input.type": "log", "log.offset": 165, "redis.log.level": "notice", @@ -30,8 +30,8 @@ }, { "@timestamp": "2017-05-30T10:57:24.000Z", - "fileset.module": "redis", - "fileset.name": "log", + "event.dataset": "log", + "event.module": "redis", "input.type": "log", "log.offset": 250, "redis.log.message": "Received SIGINT scheduling shutdown...", diff --git a/filebeat/module/system/auth/test/test.log-expected.json b/filebeat/module/system/auth/test/test.log-expected.json index 2fc4a94c3be..1d56b19e1da 100644 --- a/filebeat/module/system/auth/test/test.log-expected.json +++ b/filebeat/module/system/auth/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-02-21T21:54:44.000Z", - "fileset.module": "system", - "fileset.name": "auth", + "event.dataset": "auth", + "event.module": "system", "input.type": "log", "log.offset": 0, "system.auth.hostname": "localhost", @@ -17,8 +17,8 @@ }, { "@timestamp": "2018-02-23T00:13:35.000Z", - "fileset.module": "system", - "fileset.name": "auth", + "event.dataset": "auth", + "event.module": "system", "input.type": "log", "log.offset": 152, "system.auth.hostname": "localhost", @@ -32,8 +32,8 @@ }, { "@timestamp": "2018-02-21T21:56:12.000Z", - "fileset.module": "system", - "fileset.name": "auth", + "event.dataset": "auth", + "event.module": "system", "input.type": "log", "log.offset": 254, "system.auth.hostname": "localhost", @@ -45,8 +45,8 @@ }, { "@timestamp": "2018-02-20T08:35:22.000Z", - "fileset.module": "system", - "fileset.name": "auth", + "event.dataset": "auth", + "event.module": "system", "input.type": "log", "log.offset": 324, "system.auth.hostname": "slave22", @@ -66,8 +66,8 @@ }, { "@timestamp": "2018-02-21T23:35:33.000Z", - "fileset.module": "system", - "fileset.name": "auth", + "event.dataset": "auth", + "event.module": "system", "input.type": "log", "log.offset": 420, "system.auth.hostname": "localhost", @@ -80,8 +80,8 @@ }, { "@timestamp": "2018-02-19T15:30:04.000Z", - "fileset.module": "system", - "fileset.name": "auth", + "event.dataset": "auth", + "event.module": "system", "input.type": "log", "log.offset": 522, "system.auth.hostname": "slave22", @@ -91,8 +91,8 @@ }, { "@timestamp": "2018-02-23T00:08:48.000Z", - "fileset.module": "system", - "fileset.name": "auth", + "event.dataset": "auth", + "event.module": "system", "input.type": "log", "log.offset": 617, "system.auth.hostname": "localhost", @@ -105,8 +105,8 @@ }, { "@timestamp": "2018-02-24T00:13:02.000Z", - "fileset.module": "system", - "fileset.name": "auth", + "event.dataset": "auth", + "event.module": "system", "input.type": "log", "log.offset": 736, "system.auth.hostname": "precise32", @@ -120,8 +120,8 @@ }, { "@timestamp": "2018-02-22T11:47:05.000Z", - "fileset.module": "system", - "fileset.name": "auth", + "event.dataset": "auth", + "event.module": "system", "input.type": "log", "log.offset": 861, "system.auth.groupadd.gid": "48", @@ -132,8 +132,8 @@ }, { "@timestamp": "2018-02-22T11:47:05.000Z", - "fileset.module": "system", - "fileset.name": "auth", + "event.dataset": "auth", + "event.module": "system", "input.type": "log", "log.offset": 934, "system.auth.hostname": "localhost", diff --git a/filebeat/module/system/syslog/test/darwin-syslog-sample.log-expected.json b/filebeat/module/system/syslog/test/darwin-syslog-sample.log-expected.json index efd5e61495b..b77691a5a29 100644 --- a/filebeat/module/system/syslog/test/darwin-syslog-sample.log-expected.json +++ b/filebeat/module/system/syslog/test/darwin-syslog-sample.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2018-12-13T11:35:28.000Z", - "fileset.module": "system", - "fileset.name": "syslog", + "event.dataset": "syslog", + "event.module": "system", "input.type": "log", "log.flags": [ "multiline" @@ -16,8 +16,8 @@ }, { "@timestamp": "2018-12-13T11:35:28.000Z", - "fileset.module": "system", - "fileset.name": "syslog", + "event.dataset": "syslog", + "event.module": "system", "input.type": "log", "log.offset": 907, "system.syslog.hostname": "a-mac-with-esc-key", @@ -28,8 +28,8 @@ }, { "@timestamp": "2018-04-04T03:39:57.000Z", - "fileset.module": "system", - "fileset.name": "syslog", + "event.dataset": "syslog", + "event.module": "system", "input.type": "log", "log.offset": 1176, "system.syslog.message": "--- last message repeated 1 time ---", diff --git a/filebeat/module/traefik/access/test/test.log-expected.json b/filebeat/module/traefik/access/test/test.log-expected.json index 98f3e4c8e24..2f95d4ad9b1 100644 --- a/filebeat/module/traefik/access/test/test.log-expected.json +++ b/filebeat/module/traefik/access/test/test.log-expected.json @@ -1,8 +1,8 @@ [ { "@timestamp": "2017-10-02T20:22:07.000Z", - "fileset.module": "traefik", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "traefik", "input.type": "log", "log.offset": 0, "traefik.access.body_sent.bytes": "0", @@ -24,8 +24,8 @@ }, { "@timestamp": "2017-10-02T20:22:08.000Z", - "fileset.module": "traefik", - "fileset.name": "access", + "event.dataset": "access", + "event.module": "traefik", "input.type": "log", "log.offset": 280, "traefik.access.body_sent.bytes": "0", diff --git a/filebeat/tests/system/test_modules.py b/filebeat/tests/system/test_modules.py index 7b55fe24e33..bdbd310780f 100644 --- a/filebeat/tests/system/test_modules.py +++ b/filebeat/tests/system/test_modules.py @@ -133,8 +133,8 @@ def run_on_file(self, module, fileset, test_file, cfgfile): objects = [o["_source"] for o in res["hits"]["hits"]] assert len(objects) > 0 for obj in objects: - assert obj["fileset"]["module"] == module, "expected fileset.module={} but got {}".format( - module, obj["fileset"]["module"]) + assert obj["event"]["module"] == module, "expected event.module={} but got {}".format( + module, obj["event"]["module"]) assert "error" not in obj, "not error expected but got: {}".format( obj) @@ -176,7 +176,7 @@ def _test_expected_events(self, test_file, objects): clean_keys(obj) # Remove timestamp for comparison where timestamp is not part of the log line - if obj["fileset.module"] == "icinga" and obj["fileset.name"] == "startup": + if obj["event.module"] == "icinga" and obj["event.dataset"] == "startup": delete_key(obj, "@timestamp") delete_key(ev, "@timestamp") diff --git a/x-pack/filebeat/module/suricata/eve/test/eve-alerts.log-expected.json b/x-pack/filebeat/module/suricata/eve/test/eve-alerts.log-expected.json index 2fdda9db589..faca8e538da 100644 --- a/x-pack/filebeat/module/suricata/eve/test/eve-alerts.log-expected.json +++ b/x-pack/filebeat/module/suricata/eve/test/eve-alerts.log-expected.json @@ -10,9 +10,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -73,9 +73,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -136,9 +136,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -199,9 +199,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -262,9 +262,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -325,9 +325,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -388,9 +388,9 @@ "destination.geo.region_name": "England", "destination.ip": "91.189.88.152", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -449,9 +449,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "304", "input.type": "log", @@ -510,9 +510,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -571,9 +571,9 @@ "destination.geo.region_name": "England", "destination.ip": "91.189.88.152", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -632,9 +632,9 @@ "destination.geo.region_name": "England", "destination.ip": "91.189.88.152", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -693,9 +693,9 @@ "destination.geo.region_name": "England", "destination.ip": "91.189.88.152", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -754,9 +754,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -815,9 +815,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -876,9 +876,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -937,9 +937,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -998,9 +998,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -1059,9 +1059,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -1120,9 +1120,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "input.type": "log", "log.offset": 14767, @@ -1179,9 +1179,9 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "input.type": "log", "log.offset": 15651, diff --git a/x-pack/filebeat/module/suricata/eve/test/eve-small.log-expected.json b/x-pack/filebeat/module/suricata/eve/test/eve-small.log-expected.json index 89a8c53cffc..fe378f89a9b 100644 --- a/x-pack/filebeat/module/suricata/eve/test/eve-small.log-expected.json +++ b/x-pack/filebeat/module/suricata/eve/test/eve-small.log-expected.json @@ -3,9 +3,9 @@ "@timestamp": "2018-07-05T19:01:09.820Z", "destination.ip": "192.168.253.112", "destination.port": 22, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "ssh", - "fileset.module": "suricata", - "fileset.name": "eve", "input.type": "log", "log.offset": 0, "source_ecs.ip": "192.168.86.85", @@ -31,9 +31,9 @@ "@timestamp": "2018-07-05T19:07:20.910Z", "destination.ip": "192.168.156.70", "destination.port": 443, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "alert", - "fileset.module": "suricata", - "fileset.name": "eve", "input.type": "log", "log.offset": 350, "source_ecs.ip": "192.168.86.85", @@ -72,9 +72,9 @@ "@timestamp": "2018-07-05T19:43:47.690Z", "destination.ip": "192.168.86.28", "destination.port": 63963, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "http", - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -117,11 +117,11 @@ "@timestamp": "2018-07-05T19:44:33.222Z", "destination.ip": "192.168.86.85", "destination.port": 56118, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "fileinfo", "file.path": "/ssdp/device-desc.xml", "file.size": 1071, - "fileset.module": "suricata", - "fileset.name": "eve", "http.request.method": "GET", "http.response.status_code": "200", "input.type": "log", @@ -173,9 +173,9 @@ "@timestamp": "2018-07-05T19:51:20.213Z", "destination.ip": "192.168.86.85", "destination.port": 39464, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "dns", - "fileset.module": "suricata", - "fileset.name": "eve", "input.type": "log", "log.offset": 2347, "source_ecs.ip": "192.168.86.1", @@ -202,9 +202,9 @@ }, { "@timestamp": "2018-07-05T19:51:23.009Z", + "event.dataset": "eve", + "event.module": "suricata", "event.type": "stats", - "fileset.module": "suricata", - "fileset.name": "eve", "input.type": "log", "log.offset": 2687, "suricata.eve.event_type": "stats", @@ -337,9 +337,9 @@ "destination.geo.location.lon": -97.822, "destination.ip": "17.142.164.13", "destination.port": 443, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "tls", - "fileset.module": "suricata", - "fileset.name": "eve", "input.type": "log", "log.offset": 4683, "source_ecs.ip": "192.168.86.85", @@ -369,9 +369,9 @@ "@timestamp": "2018-07-05T19:51:54.001Z", "destination.ip": "ff02:0000:0000:0000:0000:0000:0001:0002", "destination.port": 547, + "event.dataset": "eve", + "event.module": "suricata", "event.type": "flow", - "fileset.module": "suricata", - "fileset.name": "eve", "input.type": "log", "log.offset": 5308, "source_ecs.ip": "fe80:0000:0000:0000:fada:0cff:fedc:87f1",