diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 69006a5be57..63098cbc2c7 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -95,8 +95,8 @@ https://github.com/elastic/beats/compare/v6.5.0...6.x[Check the HEAD diff] - Added `detect_null_bytes` selector to detect null bytes from a io.reader. {pull}9210[9210] - Added `syslog_host` variable to HAProxy module to allow syslog listener to bind to configured host. {pull}9366[9366] - Added support on Traefik for Common Log Format and Combined Log Format mixed which is the default Traefik format {issue}8015[8015] {issue}6111[6111] {pull}8768[8768]. - - Allow to force CRI format parsing for better performance {pull}8424[8424] +- Add event.dataset to module events. {pull}9457[9457] *Heartbeat* diff --git a/filebeat/_meta/fields.common.yml b/filebeat/_meta/fields.common.yml index 121a5442a7f..cfb5361d47b 100644 --- a/filebeat/_meta/fields.common.yml +++ b/filebeat/_meta/fields.common.yml @@ -56,6 +56,10 @@ description: > The Filebeat fileset that generated this event. + - name: event.dataset + description: > + The Filebeat dataset that generated this event. + - name: syslog.facility type: long required: false diff --git a/filebeat/channel/factory.go b/filebeat/channel/factory.go index 86db045c84f..0f9963511fd 100644 --- a/filebeat/channel/factory.go +++ b/filebeat/channel/factory.go @@ -107,6 +107,9 @@ func (f *OutletFactory) Create(p beat.Pipeline, cfg *common.Config, dynFields *c if len(fields) > 0 { fields = common.MapStr{ "fileset": fields, + "event": common.MapStr{ + "dataset": config.Module + "." + config.Fileset, + }, } } if config.Type != "" { diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc index 9752acf6c20..10d2587c99d 100644 --- a/filebeat/docs/fields.asciidoc +++ b/filebeat/docs/fields.asciidoc @@ -3006,6 +3006,14 @@ The Filebeat module that generated this event. The Filebeat fileset that generated this event. +-- + +*`event.dataset`*:: ++ +-- +The Filebeat dataset that generated this event. + + -- *`syslog.facility`*:: diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go index 3ab067c08de..28e1808d565 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 83f1ab65c29..0d114e8e943 100644 --- a/filebeat/module/apache2/access/test/test.log-expected.json +++ b/filebeat/module/apache2/access/test/test.log-expected.json @@ -8,6 +8,7 @@ "apache2.access.response_code": "404", "apache2.access.url": "/favicon.ico", "apache2.access.user_name": "-", + "event.dataset": "apache2.access", "fileset.module": "apache2", "fileset.name": "access", "input.type": "log", @@ -33,6 +34,7 @@ "apache2.access.user_agent.os_minor": "12", "apache2.access.user_agent.os_name": "Mac OS X", "apache2.access.user_name": "-", + "event.dataset": "apache2.access", "fileset.module": "apache2", "fileset.name": "access", "input.type": "log", @@ -44,6 +46,7 @@ "apache2.access.remote_ip": "::1", "apache2.access.response_code": "408", "apache2.access.user_name": "-", + "event.dataset": "apache2.access", "fileset.module": "apache2", "fileset.name": "access", "input.type": "log", @@ -68,6 +71,7 @@ "apache2.access.user_agent.os_name": "Windows 7", "apache2.access.user_agent.patch": "a2", "apache2.access.user_name": "-", + "event.dataset": "apache2.access", "fileset.module": "apache2", "fileset.name": "access", "input.type": "log", diff --git a/filebeat/module/apache2/error/test/test.log-expected.json b/filebeat/module/apache2/error/test/test.log-expected.json index 96d61106465..1b82f07f351 100644 --- a/filebeat/module/apache2/error/test/test.log-expected.json +++ b/filebeat/module/apache2/error/test/test.log-expected.json @@ -4,6 +4,7 @@ "apache2.error.client": "192.168.33.1", "apache2.error.level": "error", "apache2.error.message": "File does not exist: /var/www/favicon.ico", + "event.dataset": "apache2.error", "fileset.module": "apache2", "fileset.name": "error", "input.type": "log", @@ -16,6 +17,7 @@ "apache2.error.message": "AH00094: Command line: '/usr/local/Cellar/httpd24/2.4.23_2/bin/httpd'", "apache2.error.module": "core", "apache2.error.pid": "11379", + "event.dataset": "apache2.error", "fileset.module": "apache2", "fileset.name": "error", "input.type": "log", @@ -30,6 +32,7 @@ "apache2.error.module": "core", "apache2.error.pid": "35708", "apache2.error.tid": "4328636416", + "event.dataset": "apache2.error", "fileset.module": "apache2", "fileset.name": "error", "input.type": "log", diff --git a/filebeat/module/auditd/log/test/test.log-expected.json b/filebeat/module/auditd/log/test/test.log-expected.json index 4b63b828497..35e2f1b443a 100644 --- a/filebeat/module/auditd/log/test/test.log-expected.json +++ b/filebeat/module/auditd/log/test/test.log-expected.json @@ -11,6 +11,7 @@ "auditd.log.ses": "4294967295", "auditd.log.src": "192.168.2.0", "auditd.log.src_prefixlen": "24", + "event.dataset": "auditd.log", "fileset.module": "auditd", "fileset.name": "log", "input.type": "log", @@ -45,6 +46,7 @@ "auditd.log.syscall": "44", "auditd.log.tty": "(none)", "auditd.log.uid": "0", + "event.dataset": "auditd.log", "fileset.module": "auditd", "fileset.name": "log", "input.type": "log", diff --git a/filebeat/module/elasticsearch/audit/test/test.log-expected.json b/filebeat/module/elasticsearch/audit/test/test.log-expected.json index 77948ecc89f..dea44171f3a 100644 --- a/filebeat/module/elasticsearch/audit/test/test.log-expected.json +++ b/filebeat/module/elasticsearch/audit/test/test.log-expected.json @@ -6,6 +6,7 @@ "elasticsearch.audit.origin_address": "147.107.128.77", "elasticsearch.audit.principal": "i030648", "elasticsearch.audit.uri": "/_xpack/security/_authenticate", + "event.dataset": "elasticsearch.audit", "fileset.module": "elasticsearch", "fileset.name": "audit", "input.type": "log", @@ -22,6 +23,7 @@ "elasticsearch.audit.principal": "rado", "elasticsearch.audit.uri": "/_xpack/security/_authenticate", "elasticsearch.node.name": "v_VJhjV", + "event.dataset": "elasticsearch.audit", "fileset.module": "elasticsearch", "fileset.name": "audit", "input.type": "log", @@ -39,6 +41,7 @@ "elasticsearch.audit.origin_type": "local_node", "elasticsearch.audit.principal": "_xpack_security", "elasticsearch.audit.request": "ClearScrollRequest", + "event.dataset": "elasticsearch.audit", "fileset.module": "elasticsearch", "fileset.name": "audit", "input.type": "log", @@ -54,6 +57,7 @@ "elasticsearch.audit.origin_address": "172.22.0.3", "elasticsearch.audit.uri": "/_xpack/security/_authenticate", "elasticsearch.node.name": "v_VJhjV", + "event.dataset": "elasticsearch.audit", "fileset.module": "elasticsearch", "fileset.name": "audit", "input.type": "log", @@ -69,6 +73,7 @@ "elasticsearch.audit.origin_address": "147.107.128.77", "elasticsearch.audit.principal": "N078801", "elasticsearch.audit.uri": "/_xpack/security/_authenticate", + "event.dataset": "elasticsearch.audit", "fileset.module": "elasticsearch", "fileset.name": "audit", "input.type": "log", @@ -86,6 +91,7 @@ "elasticsearch.audit.origin_type": "rest", "elasticsearch.audit.principal": "_anonymous", "elasticsearch.audit.request": "MainRequest", + "event.dataset": "elasticsearch.audit", "fileset.module": "elasticsearch", "fileset.name": "audit", "input.type": "log", @@ -103,6 +109,7 @@ "elasticsearch.audit.request_body": "body", "elasticsearch.audit.uri": "/_nodes?filter_path=nodes.*.version%2Cnodes.*.http.publish_address%2Cnodes.*.ip", "elasticsearch.node.name": "v_VJhjV", + "event.dataset": "elasticsearch.audit", "fileset.module": "elasticsearch", "fileset.name": "audit", "input.type": "log", diff --git a/filebeat/module/elasticsearch/gc/test/test.log-expected.json b/filebeat/module/elasticsearch/gc/test/test.log-expected.json index c9d0621afc9..3de5997c4e6 100644 --- a/filebeat/module/elasticsearch/gc/test/test.log-expected.json +++ b/filebeat/module/elasticsearch/gc/test/test.log-expected.json @@ -11,6 +11,7 @@ "elasticsearch.gc.phase.cpu_time.user_sec": "0.01", "elasticsearch.gc.phase.duration_sec": "0.0021716", "elasticsearch.gc.phase.name": "CMS Initial Mark", + "event.dataset": "elasticsearch.gc", "fileset.module": "elasticsearch", "fileset.name": "gc", "input.type": "log", @@ -24,6 +25,7 @@ "elasticsearch.gc.jvm_runtime_sec": "1396138.752", "elasticsearch.gc.stopping_threads_time_sec": "0.0000702", "elasticsearch.gc.threads_total_stop_time_sec": "0.0083760", + "event.dataset": "elasticsearch.gc", "fileset.module": "elasticsearch", "fileset.name": "gc", "input.type": "log", @@ -51,6 +53,7 @@ "elasticsearch.gc.phase.weak_refs_processing_time_sec": "0.0003647", "elasticsearch.gc.young_gen.size_kb": "157248", "elasticsearch.gc.young_gen.used_kb": "113198", + "event.dataset": "elasticsearch.gc", "fileset.module": "elasticsearch", "fileset.name": "gc", "input.type": "log", diff --git a/filebeat/module/elasticsearch/server/test/test.log-expected.json b/filebeat/module/elasticsearch/server/test/test.log-expected.json index f53a28cf9fb..4f6ce04064a 100644 --- a/filebeat/module/elasticsearch/server/test/test.log-expected.json +++ b/filebeat/module/elasticsearch/server/test/test.log-expected.json @@ -4,6 +4,7 @@ "elasticsearch.index.name": "test-filebeat-modules", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.c.m.MetaDataCreateIndexService", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -17,6 +18,7 @@ "@timestamp": "2018-05-17T08:19:35,939", "elasticsearch.node.name": "", "elasticsearch.server.component": "o.e.n.Node", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -30,6 +32,7 @@ "@timestamp": "2018-05-17T08:19:36,089", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.e.NodeEnvironment", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -43,6 +46,7 @@ "@timestamp": "2018-05-17T08:19:36,090", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.e.NodeEnvironment", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -55,6 +59,7 @@ { "@timestamp": "2018-05-17T08:19:36,116", "elasticsearch.server.component": "o.e.n.Node", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -68,6 +73,7 @@ "@timestamp": "2018-05-17T08:23:48,941", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.c.r.a.DiskThresholdMonitor", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -82,6 +88,7 @@ "elasticsearch.index.name": "filebeat-test-input", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.c.m.MetaDataCreateIndexService", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -97,6 +104,7 @@ "elasticsearch.index.name": "filebeat-test-input", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.c.m.MetaDataMappingService", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -112,6 +120,7 @@ "elasticsearch.index.name": ".kibana", "elasticsearch.node.name": "QGY1F5P", "elasticsearch.server.component": "o.e.c.m.MetaDataMappingService", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -125,6 +134,7 @@ "@timestamp": "2018-05-17T08:29:25,598", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.n.Node", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -138,6 +148,7 @@ "@timestamp": "2018-05-17T08:29:25,612", "elasticsearch.node.name": "vWNJsZ3", "elasticsearch.server.component": "o.e.n.Node", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -151,6 +162,7 @@ "@timestamp": "2018-07-03T11:45:48,548", "elasticsearch.node.name": "srvmulpvlsk252_md", "elasticsearch.server.component": "o.e.d.z.ZenDiscovery", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -164,6 +176,7 @@ "@timestamp": "2018-07-03T11:45:48,548", "elasticsearch.node.name": "srvmulpvlsk252_md", "elasticsearch.server.component": "o.e.d.z.ZenDiscovery", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -179,6 +192,7 @@ { "@timestamp": "2018-07-03T11:45:52,666", "elasticsearch.server.component": "r.suppressed", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -194,6 +208,7 @@ { "@timestamp": "2018-07-03T11:48:02,552", "elasticsearch.server.component": "r.suppressed", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -212,6 +227,7 @@ "elasticsearch.server.component": "o.e.m.j.JvmGcMonitorService", "elasticsearch.server.gc.young.one": "3449979", "elasticsearch.server.gc.young.two": "986594", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -229,6 +245,7 @@ "elasticsearch.node.name": "srvmulpvlsk252_md", "elasticsearch.server.component": "o.e.m.j.JvmGcMonitorService", "elasticsearch.server.gc_overhead": "3449992", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -242,6 +259,7 @@ "@timestamp": "2018-07-03T11:48:02,541", "elasticsearch.node.name": "srvmulpvlsk252_md", "elasticsearch.server.component": "o.e.a.b.TransportShardBulkAction", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", @@ -255,6 +273,7 @@ "@timestamp": "2018-07-03T20:10:07,376", "elasticsearch.node.name": "srvmulpvlsk252_md", "elasticsearch.server.component": "o.e.x.m.MonitoringService", + "event.dataset": "elasticsearch.server", "fileset.module": "elasticsearch", "fileset.name": "server", "input.type": "log", diff --git a/filebeat/module/elasticsearch/slowlog/test/test.log-expected.json b/filebeat/module/elasticsearch/slowlog/test/test.log-expected.json index c2a6ba28634..1dca186bbb1 100644 --- a/filebeat/module/elasticsearch/slowlog/test/test.log-expected.json +++ b/filebeat/module/elasticsearch/slowlog/test/test.log-expected.json @@ -13,6 +13,7 @@ "elasticsearch.slowlog.total_hits": 19435, "elasticsearch.slowlog.total_shards": 1, "elasticsearch.slowlog.types": "", + "event.dataset": "elasticsearch.slowlog", "fileset.module": "elasticsearch", "fileset.name": "slowlog", "input.type": "log", @@ -36,6 +37,7 @@ "elasticsearch.slowlog.total_hits": 19435, "elasticsearch.slowlog.total_shards": 1, "elasticsearch.slowlog.types": "", + "event.dataset": "elasticsearch.slowlog", "fileset.module": "elasticsearch", "fileset.name": "slowlog", "input.type": "log", @@ -59,6 +61,7 @@ "elasticsearch.slowlog.total_hits": 0, "elasticsearch.slowlog.total_shards": 1, "elasticsearch.slowlog.types": "", + "event.dataset": "elasticsearch.slowlog", "fileset.module": "elasticsearch", "fileset.name": "slowlog", "input.type": "log", @@ -82,6 +85,7 @@ "elasticsearch.slowlog.total_hits": 0, "elasticsearch.slowlog.total_shards": 1, "elasticsearch.slowlog.types": "", + "event.dataset": "elasticsearch.slowlog", "fileset.module": "elasticsearch", "fileset.name": "slowlog", "input.type": "log", @@ -103,6 +107,7 @@ "elasticsearch.slowlog.took": "1.4ms", "elasticsearch.slowlog.took_millis": 1, "elasticsearch.slowlog.type": "doc", + "event.dataset": "elasticsearch.slowlog", "fileset.module": "elasticsearch", "fileset.name": "slowlog", "input.type": "log", @@ -124,6 +129,7 @@ "elasticsearch.slowlog.took": "1.7ms", "elasticsearch.slowlog.took_millis": 1, "elasticsearch.slowlog.type": "doc", + "event.dataset": "elasticsearch.slowlog", "fileset.module": "elasticsearch", "fileset.name": "slowlog", "input.type": "log", diff --git a/filebeat/module/haproxy/log/test/default.log-expected.json b/filebeat/module/haproxy/log/test/default.log-expected.json index e5fcd3fea90..0ee6f23b074 100644 --- a/filebeat/module/haproxy/log/test/default.log-expected.json +++ b/filebeat/module/haproxy/log/test/default.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2018-09-20T15:42:59.000Z", + "event.dataset": "haproxy.log", "fileset.module": "haproxy", "fileset.name": "log", "haproxy.client.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 de4f3ffeff3..96d6630de4e 100644 --- a/filebeat/module/haproxy/log/test/haproxy.log-expected.json +++ b/filebeat/module/haproxy/log/test/haproxy.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2018-07-30T09:03:52.726Z", + "event.dataset": "haproxy.log", "fileset.module": "haproxy", "fileset.name": "log", "haproxy.backend_name": "docs_microservice", diff --git a/filebeat/module/haproxy/log/test/tcplog.log-expected.json b/filebeat/module/haproxy/log/test/tcplog.log-expected.json index 28b0cea58bd..b0a2ff08d92 100644 --- a/filebeat/module/haproxy/log/test/tcplog.log-expected.json +++ b/filebeat/module/haproxy/log/test/tcplog.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2018-09-20T15:44:23.285Z", + "event.dataset": "haproxy.log", "fileset.module": "haproxy", "fileset.name": "log", "haproxy.backend_name": "app", diff --git a/filebeat/module/icinga/debug/test/test.log-expected.json b/filebeat/module/icinga/debug/test/test.log-expected.json index 2a8ec5dbb7d..c05d2db0b9d 100644 --- a/filebeat/module/icinga/debug/test/test.log-expected.json +++ b/filebeat/module/icinga/debug/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2017-04-04T11:43:09.000Z", + "event.dataset": "icinga.debug", "fileset.module": "icinga", "fileset.name": "debug", "icinga.debug.facility": "GraphiteWriter", @@ -12,6 +13,7 @@ }, { "@timestamp": "2017-04-04T11:43:09.000Z", + "event.dataset": "icinga.debug", "fileset.module": "icinga", "fileset.name": "debug", "icinga.debug.facility": "IdoMysqlConnection", @@ -23,6 +25,7 @@ }, { "@timestamp": "2017-04-04T11:43:11.000Z", + "event.dataset": "icinga.debug", "fileset.module": "icinga", "fileset.name": "debug", "icinga.debug.facility": "Process", diff --git a/filebeat/module/icinga/main/test/test.log-expected.json b/filebeat/module/icinga/main/test/test.log-expected.json index 59d4822ce5d..adafdebe4ab 100644 --- a/filebeat/module/icinga/main/test/test.log-expected.json +++ b/filebeat/module/icinga/main/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2017-04-04T09:16:34.000Z", + "event.dataset": "icinga.main", "fileset.module": "icinga", "fileset.name": "main", "icinga.main.facility": "Notification", @@ -12,6 +13,7 @@ }, { "@timestamp": "2017-04-04T09:16:34.000Z", + "event.dataset": "icinga.main", "fileset.module": "icinga", "fileset.name": "main", "icinga.main.facility": "PluginNotificationTask", @@ -26,6 +28,7 @@ }, { "@timestamp": "2017-04-04T09:16:48.000Z", + "event.dataset": "icinga.main", "fileset.module": "icinga", "fileset.name": "main", "icinga.main.facility": "IdoMysqlConnection", diff --git a/filebeat/module/icinga/startup/test/test.log-expected.json b/filebeat/module/icinga/startup/test/test.log-expected.json index 8222a7c1b96..ee4dfc13993 100644 --- a/filebeat/module/icinga/startup/test/test.log-expected.json +++ b/filebeat/module/icinga/startup/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { - "@timestamp": "2018-07-24T21:15:27.590Z", + "@timestamp": "2018-12-11T08:08:07.894Z", + "event.dataset": "icinga.startup", "fileset.module": "icinga", "fileset.name": "startup", "icinga.startup.facility": "cli", @@ -11,7 +12,8 @@ "prospector.type": "log" }, { - "@timestamp": "2018-07-24T21:15:27.590Z", + "@timestamp": "2018-12-11T08:08:07.894Z", + "event.dataset": "icinga.startup", "fileset.module": "icinga", "fileset.name": "startup", "icinga.startup.facility": "cli", diff --git a/filebeat/module/iis/access/test/test.log-expected.json b/filebeat/module/iis/access/test/test.log-expected.json index 6ee8518bf83..9c65c42eb48 100644 --- a/filebeat/module/iis/access/test/test.log-expected.json +++ b/filebeat/module/iis/access/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2018-01-01T08:09:10.000Z", + "event.dataset": "iis.access", "fileset.module": "iis", "fileset.name": "access", "iis.access.geoip.city_name": "Berlin", @@ -35,6 +36,7 @@ }, { "@timestamp": "2018-01-01T09:10:11.000Z", + "event.dataset": "iis.access", "fileset.module": "iis", "fileset.name": "access", "iis.access.body_received.bytes": "456", @@ -66,6 +68,7 @@ }, { "@timestamp": "2018-01-01T10:11:12.000Z", + "event.dataset": "iis.access", "fileset.module": "iis", "fileset.name": "access", "iis.access.body_received.bytes": "456", diff --git a/filebeat/module/iis/error/test/test.log-expected.json b/filebeat/module/iis/error/test/test.log-expected.json index ad14babac55..e14dde732c7 100644 --- a/filebeat/module/iis/error/test/test.log-expected.json +++ b/filebeat/module/iis/error/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2018-01-01T08:09:10.000Z", + "event.dataset": "iis.error", "fileset.module": "iis", "fileset.name": "error", "iis.error.http_version": "1.1", @@ -19,6 +20,7 @@ }, { "@timestamp": "2018-01-01T09:10:11.000Z", + "event.dataset": "iis.error", "fileset.module": "iis", "fileset.name": "error", "iis.error.geoip.city_name": "Berlin", @@ -44,6 +46,7 @@ }, { "@timestamp": "2018-01-01T10:11:12.000Z", + "event.dataset": "iis.error", "fileset.module": "iis", "fileset.name": "error", "iis.error.geoip.city_name": "Berlin", @@ -69,6 +72,7 @@ }, { "@timestamp": "2018-01-01T11:12:13.000Z", + "event.dataset": "iis.error", "fileset.module": "iis", "fileset.name": "error", "iis.error.geoip.city_name": "Berlin", diff --git a/filebeat/module/kafka/log/test/controller.log-expected.json b/filebeat/module/kafka/log/test/controller.log-expected.json index 698fde1e230..96b3ac0b5e5 100644 --- a/filebeat/module/kafka/log/test/controller.log-expected.json +++ b/filebeat/module/kafka/log/test/controller.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2017-08-04T10:48:21.048Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -14,6 +15,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.063Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -27,6 +29,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.064Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -40,6 +43,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.082Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -53,6 +57,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.085Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -66,6 +71,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.154Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -79,6 +85,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.156Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -92,6 +99,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.157Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -105,6 +113,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.165Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -118,6 +127,7 @@ }, { "@timestamp": "2017-08-04T11:44:22.588Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -131,6 +141,7 @@ }, { "@timestamp": "2017-08-04T11:44:25.094Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -144,6 +155,7 @@ }, { "@timestamp": "2017-08-04T11:44:25.095Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -157,6 +169,7 @@ }, { "@timestamp": "2017-08-04T11:44:25.097Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -170,6 +183,7 @@ }, { "@timestamp": "2017-08-04T11:44:25.099Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -183,6 +197,7 @@ }, { "@timestamp": "2017-08-04T11:44:25.100Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -196,6 +211,7 @@ }, { "@timestamp": "2017-08-04T11:44:25.105Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -209,6 +225,7 @@ }, { "@timestamp": "2017-08-04T11:44:25.111Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -222,6 +239,7 @@ }, { "@timestamp": "2017-08-04T11:44:25.112Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -235,6 +253,7 @@ }, { "@timestamp": "2017-08-04T11:44:25.112Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -248,6 +267,7 @@ }, { "@timestamp": "2017-08-04T11:44:25.113Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", diff --git a/filebeat/module/kafka/log/test/server.log-expected.json b/filebeat/module/kafka/log/test/server.log-expected.json index 15b904ad343..427c24b966b 100644 --- a/filebeat/module/kafka/log/test/server.log-expected.json +++ b/filebeat/module/kafka/log/test/server.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2017-08-04T10:48:20.377Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -14,6 +15,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.379Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -27,6 +29,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.400Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -40,6 +43,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.400Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -53,6 +57,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.401Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -66,6 +71,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.413Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -79,6 +85,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.415Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -92,6 +99,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.420Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -105,6 +113,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.457Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -118,6 +127,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.458Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -131,6 +141,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.748Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -144,6 +155,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.800Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -157,6 +169,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.866Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -170,6 +183,7 @@ }, { "@timestamp": "2017-08-04T10:48:20.873Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -183,6 +197,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.062Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -196,6 +211,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.063Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -209,6 +225,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.095Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -222,6 +239,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.127Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -235,6 +253,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.162Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", @@ -248,6 +267,7 @@ }, { "@timestamp": "2017-08-04T10:48:21.167Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", 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 be011b17d23..2d2540cdbcf 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,6 +1,7 @@ [ { "@timestamp": "2018-07-16T10:17:06.489Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", 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 3cfb112c20e..ed18e51d904 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,6 +1,7 @@ [ { "@timestamp": "2018-10-31T15:09:30.451Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", 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 f6c4112aa1a..863647de37d 100644 --- a/filebeat/module/kafka/log/test/state-change.log-expected.json +++ b/filebeat/module/kafka/log/test/state-change.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2017-08-04T10:48:21.428Z", + "event.dataset": "kafka.log", "fileset.module": "kafka", "fileset.name": "log", "input.type": "log", diff --git a/filebeat/module/kibana/log/test/test.log-expected.json b/filebeat/module/kibana/log/test/test.log-expected.json index 61401461022..7768daeb19b 100644 --- a/filebeat/module/kibana/log/test/test.log-expected.json +++ b/filebeat/module/kibana/log/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2018-05-09T10:57:55.000Z", + "event.dataset": "kibana.log", "fileset.module": "kibana", "fileset.name": "log", "http.request.method": "get", @@ -36,6 +37,7 @@ }, { "@timestamp": "2018-05-09T10:59:12.000Z", + "event.dataset": "kibana.log", "fileset.module": "kibana", "fileset.name": "log", "input.type": "log", @@ -55,6 +57,7 @@ }, { "@timestamp": "2018-05-09T10:59:12.000Z", + "event.dataset": "kibana.log", "fileset.module": "kibana", "fileset.name": "log", "input.type": "log", 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 c14a53e54e1..da81b4c8708 100644 --- a/filebeat/module/logstash/log/test/logstash-plain.log-expected.json +++ b/filebeat/module/logstash/log/test/logstash-plain.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2017-10-23T14:20:12,046", + "event.dataset": "logstash.log", "fileset.module": "logstash", "fileset.name": "log", "input.type": "log", @@ -12,6 +13,7 @@ }, { "@timestamp": "2017-11-20T03:55:00,318", + "event.dataset": "logstash.log", "fileset.module": "logstash", "fileset.name": "log", "input.type": "log", 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 835106bf975..a184b2ae1d7 100644 --- a/filebeat/module/logstash/slowlog/test/slowlog-plain.log-expected.json +++ b/filebeat/module/logstash/slowlog/test/slowlog-plain.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2017-10-30T09:57:58,243", + "event.dataset": "logstash.slowlog", "fileset.module": "logstash", "fileset.name": "slowlog", "input.type": "log", 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 f0cd77888db..3b3fc9e5920 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,6 +1,7 @@ [ { "@timestamp": "2018-02-05T12:44:56.657Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -13,6 +14,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -25,6 +27,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -37,6 +40,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.677Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -49,6 +53,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.724Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -61,6 +66,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.724Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -73,6 +79,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.744Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -85,6 +92,7 @@ }, { "@timestamp": "2018-02-05T12:50:55.170Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -97,6 +105,7 @@ }, { "@timestamp": "2018-02-05T12:50:55.487Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -109,6 +118,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -121,6 +131,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -133,6 +144,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -145,6 +157,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -157,6 +170,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -169,6 +183,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.688Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -181,6 +196,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -193,6 +209,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -205,6 +222,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -217,6 +235,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -229,6 +248,7 @@ }, { "@timestamp": "2018-02-05T12:50:55.170Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -241,6 +261,7 @@ }, { "@timestamp": "2018-02-05T12:50:56.180Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -253,6 +274,7 @@ }, { "@timestamp": "2018-02-05T13:15:42.095Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -265,6 +287,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -277,6 +300,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -289,6 +313,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.688Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -301,6 +326,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -313,6 +339,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -325,6 +352,7 @@ }, { "@timestamp": "2018-02-05T12:44:56.657Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -337,6 +365,7 @@ }, { "@timestamp": "2018-02-05T12:50:55.487Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -349,6 +378,7 @@ }, { "@timestamp": "2018-02-05T12:50:56.180Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -361,6 +391,7 @@ }, { "@timestamp": "2018-02-05T13:11:41.401Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -373,6 +404,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.605Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -385,6 +417,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.605Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", @@ -397,6 +430,7 @@ }, { "@timestamp": "2018-02-05T13:49:45.606Z", + "event.dataset": "mongodb.log", "fileset.module": "mongodb", "fileset.name": "log", "input.type": "log", diff --git a/filebeat/module/nginx/access/test/test.log-expected.json b/filebeat/module/nginx/access/test/test.log-expected.json index 174509327cf..92ee5e66e4b 100644 --- a/filebeat/module/nginx/access/test/test.log-expected.json +++ b/filebeat/module/nginx/access/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2016-12-07T10:05:07.000Z", + "event.dataset": "nginx.access", "fileset.module": "nginx", "fileset.name": "access", "input.type": "log", @@ -31,6 +32,7 @@ }, { "@timestamp": "2017-05-29T19:02:48.000Z", + "event.dataset": "nginx.access", "fileset.module": "nginx", "fileset.name": "access", "input.type": "log", @@ -58,6 +60,7 @@ }, { "@timestamp": "2016-12-07T10:05:07.000Z", + "event.dataset": "nginx.access", "fileset.module": "nginx", "fileset.name": "access", "input.type": "log", @@ -95,6 +98,7 @@ }, { "@timestamp": "2016-12-07T10:05:07.000Z", + "event.dataset": "nginx.access", "fileset.module": "nginx", "fileset.name": "access", "input.type": "log", @@ -130,6 +134,7 @@ }, { "@timestamp": "2016-01-22T13:18:29.000Z", + "event.dataset": "nginx.access", "fileset.module": "nginx", "fileset.name": "access", "input.type": "log", @@ -164,6 +169,7 @@ }, { "@timestamp": "2016-12-30T06:47:09.000Z", + "event.dataset": "nginx.access", "fileset.module": "nginx", "fileset.name": "access", "input.type": "log", @@ -196,6 +202,7 @@ }, { "@timestamp": "2018-04-12T07:48:40.000Z", + "event.dataset": "nginx.access", "fileset.module": "nginx", "fileset.name": "access", "input.type": "log", diff --git a/filebeat/module/osquery/result/test/test.log-expected.json b/filebeat/module/osquery/result/test/test.log-expected.json index 64901ccec60..b4a504c4ae4 100644 --- a/filebeat/module/osquery/result/test/test.log-expected.json +++ b/filebeat/module/osquery/result/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2017-12-28T14:40:08.000Z", + "event.dataset": "osquery.result", "fileset.module": "osquery", "fileset.name": "result", "input.type": "log", 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 b17481ca76b..7bf96f39544 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,6 +1,7 @@ [ { "@timestamp": "2017-07-31T13:36:42.585Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -15,6 +16,7 @@ }, { "@timestamp": "2017-07-31T13:36:42.605Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -29,6 +31,7 @@ }, { "@timestamp": "2017-07-31T13:36:42.615Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -43,6 +46,7 @@ }, { "@timestamp": "2017-07-31T13:36:42.616Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -57,6 +61,7 @@ }, { "@timestamp": "2017-07-31T13:36:42.956Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -73,6 +78,7 @@ }, { "@timestamp": "2017-07-31T13:36:43.557Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -93,6 +99,7 @@ }, { "@timestamp": "2017-07-31T13:36:44.104Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -113,6 +120,7 @@ }, { "@timestamp": "2017-07-31T13:36:44.642Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -133,6 +141,7 @@ }, { "@timestamp": "2017-07-31T13:39:16.249Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -149,6 +158,7 @@ }, { "@timestamp": "2017-07-31T13:39:17.945Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -165,6 +175,7 @@ }, { "@timestamp": "2017-07-31T13:39:21.025Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -185,6 +196,7 @@ }, { "@timestamp": "2017-07-31T13:39:31.619Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -202,6 +214,7 @@ }, { "@timestamp": "2017-07-31T13:39:40.147Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -219,6 +232,7 @@ }, { "@timestamp": "2017-07-31T13:40:54.310Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -239,6 +253,7 @@ }, { "@timestamp": "2017-07-31T13:43:22.645Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -256,6 +271,7 @@ }, { "@timestamp": "2017-07-31T13:46:02.670Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -273,6 +289,7 @@ }, { "@timestamp": "2017-07-31T13:46:23.016Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", @@ -290,6 +307,7 @@ }, { "@timestamp": "2017-07-31T13:46:55.637Z", + "event.dataset": "postgresql.log", "fileset.module": "postgresql", "fileset.name": "log", "input.type": "log", diff --git a/filebeat/module/redis/log/test/test.log-expected.json b/filebeat/module/redis/log/test/test.log-expected.json index 3fd7f8f3454..649114bbf6e 100644 --- a/filebeat/module/redis/log/test/test.log-expected.json +++ b/filebeat/module/redis/log/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2018-05-30T12:23:52.442Z", + "event.dataset": "redis.log", "fileset.module": "redis", "fileset.name": "log", "input.type": "log", @@ -13,6 +14,7 @@ }, { "@timestamp": "2018-05-30T10:05:20.000Z", + "event.dataset": "redis.log", "fileset.module": "redis", "fileset.name": "log", "input.type": "log", @@ -23,6 +25,7 @@ }, { "@timestamp": "2018-05-31T04:32:08.000Z", + "event.dataset": "redis.log", "fileset.module": "redis", "fileset.name": "log", "input.type": "log", @@ -33,6 +36,7 @@ }, { "@timestamp": "2017-05-30T10:57:24.000Z", + "event.dataset": "redis.log", "fileset.module": "redis", "fileset.name": "log", "input.type": "log", diff --git a/filebeat/module/system/auth/test/test.log-expected.json b/filebeat/module/system/auth/test/test.log-expected.json index c99cbeb2fa3..83018d65dbe 100644 --- a/filebeat/module/system/auth/test/test.log-expected.json +++ b/filebeat/module/system/auth/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2018-02-21T21:54:44.000Z", + "event.dataset": "system.auth", "fileset.module": "system", "fileset.name": "auth", "input.type": "log", @@ -18,6 +19,7 @@ }, { "@timestamp": "2018-02-23T00:13:35.000Z", + "event.dataset": "system.auth", "fileset.module": "system", "fileset.name": "auth", "input.type": "log", @@ -34,6 +36,7 @@ }, { "@timestamp": "2018-02-21T21:56:12.000Z", + "event.dataset": "system.auth", "fileset.module": "system", "fileset.name": "auth", "input.type": "log", @@ -48,6 +51,7 @@ }, { "@timestamp": "2018-02-20T08:35:22.000Z", + "event.dataset": "system.auth", "fileset.module": "system", "fileset.name": "auth", "input.type": "log", @@ -70,6 +74,7 @@ }, { "@timestamp": "2018-02-21T23:35:33.000Z", + "event.dataset": "system.auth", "fileset.module": "system", "fileset.name": "auth", "input.type": "log", @@ -85,6 +90,7 @@ }, { "@timestamp": "2018-02-19T15:30:04.000Z", + "event.dataset": "system.auth", "fileset.module": "system", "fileset.name": "auth", "input.type": "log", @@ -97,6 +103,7 @@ }, { "@timestamp": "2018-02-23T00:08:48.000Z", + "event.dataset": "system.auth", "fileset.module": "system", "fileset.name": "auth", "input.type": "log", @@ -112,6 +119,7 @@ }, { "@timestamp": "2018-02-24T00:13:02.000Z", + "event.dataset": "system.auth", "fileset.module": "system", "fileset.name": "auth", "input.type": "log", @@ -128,6 +136,7 @@ }, { "@timestamp": "2018-02-22T11:47:05.000Z", + "event.dataset": "system.auth", "fileset.module": "system", "fileset.name": "auth", "input.type": "log", @@ -141,6 +150,7 @@ }, { "@timestamp": "2018-02-22T11:47:05.000Z", + "event.dataset": "system.auth", "fileset.module": "system", "fileset.name": "auth", "input.type": "log", 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 4d667d28a17..a17409df62b 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,6 +1,7 @@ [ { "@timestamp": "2018-12-13T11:35:28.000Z", + "event.dataset": "system.syslog", "fileset.module": "system", "fileset.name": "syslog", "input.type": "log", @@ -17,6 +18,7 @@ }, { "@timestamp": "2018-12-13T11:35:28.000Z", + "event.dataset": "system.syslog", "fileset.module": "system", "fileset.name": "syslog", "input.type": "log", @@ -30,6 +32,7 @@ }, { "@timestamp": "2018-04-04T03:39:57.000Z", + "event.dataset": "system.syslog", "fileset.module": "system", "fileset.name": "syslog", "input.type": "log", diff --git a/filebeat/module/traefik/access/test/test.log-expected.json b/filebeat/module/traefik/access/test/test.log-expected.json index 64db2480cf2..44077e310b4 100644 --- a/filebeat/module/traefik/access/test/test.log-expected.json +++ b/filebeat/module/traefik/access/test/test.log-expected.json @@ -1,6 +1,7 @@ [ { "@timestamp": "2017-10-02T20:22:07.000Z", + "event.dataset": "traefik.access", "fileset.module": "traefik", "fileset.name": "access", "input.type": "log", @@ -30,6 +31,7 @@ }, { "@timestamp": "2017-10-02T20:22:08.000Z", + "event.dataset": "traefik.access", "fileset.module": "traefik", "fileset.name": "access", "input.type": "log", @@ -66,6 +68,7 @@ }, { "@timestamp": "2018-02-28T17:30:33.000Z", + "event.dataset": "traefik.access", "fileset.module": "traefik", "fileset.name": "access", "input.type": "log", @@ -102,6 +105,7 @@ }, { "@timestamp": "2018-11-29T15:03:51.000Z", + "event.dataset": "traefik.access", "fileset.module": "traefik", "fileset.name": "access", "input.type": "log", @@ -131,6 +135,7 @@ }, { "@timestamp": "2018-01-19T10:01:02.000Z", + "event.dataset": "traefik.access", "fileset.module": "traefik", "fileset.name": "access", "input.type": "log", @@ -163,6 +168,7 @@ }, { "@timestamp": "2018-01-19T10:01:02.000Z", + "event.dataset": "traefik.access", "fileset.module": "traefik", "fileset.name": "access", "input.type": "log", @@ -195,6 +201,7 @@ }, { "@timestamp": "2000-10-10T20:55:36.000Z", + "event.dataset": "traefik.access", "fileset.module": "traefik", "fileset.name": "access", "input.type": "log", 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 921c222eb14..8acaec245b6 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,6 +10,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -54,7 +55,7 @@ "tags": [ "suricata" ], - "url.hostname": "example.net", + "url.hostname": "example.net", "user_agent.device": "Other", "user_agent.major": "7", "user_agent.minor": "58", @@ -74,6 +75,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -118,7 +120,7 @@ "tags": [ "suricata" ], - "url.hostname": "example.net", + "url.hostname": "example.net", "user_agent.device": "Other", "user_agent.major": "7", "user_agent.minor": "58", @@ -138,6 +140,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -182,7 +185,7 @@ "tags": [ "suricata" ], - "url.hostname": "example.net", + "url.hostname": "example.net", "user_agent.device": "Other", "user_agent.major": "7", "user_agent.minor": "58", @@ -202,6 +205,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -246,7 +250,7 @@ "tags": [ "suricata" ], - "url.hostname": "example.org", + "url.hostname": "example.org", "user_agent.device": "Other", "user_agent.major": "7", "user_agent.minor": "58", @@ -266,6 +270,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -310,7 +315,7 @@ "tags": [ "suricata" ], - "url.hostname": "example.org", + "url.hostname": "example.org", "user_agent.device": "Other", "user_agent.major": "7", "user_agent.minor": "58", @@ -330,6 +335,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "93.184.216.34", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -374,7 +380,7 @@ "tags": [ "suricata" ], - "url.hostname": "example.org", + "url.hostname": "example.org", "user_agent.device": "Other", "user_agent.major": "7", "user_agent.minor": "58", @@ -394,6 +400,7 @@ "destination.geo.region_name": "England", "destination.ip": "91.189.88.152", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -437,7 +444,7 @@ "tags": [ "suricata" ], - "url.hostname": "security.ubuntu.com", + "url.hostname": "security.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -456,6 +463,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -499,7 +507,7 @@ "tags": [ "suricata" ], - "url.hostname": "archive.ubuntu.com", + "url.hostname": "archive.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -518,6 +526,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -561,7 +570,7 @@ "tags": [ "suricata" ], - "url.hostname": "archive.ubuntu.com", + "url.hostname": "archive.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -580,6 +589,7 @@ "destination.geo.region_name": "England", "destination.ip": "91.189.88.152", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -623,7 +633,7 @@ "tags": [ "suricata" ], - "url.hostname": "security.ubuntu.com", + "url.hostname": "security.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -642,6 +652,7 @@ "destination.geo.region_name": "England", "destination.ip": "91.189.88.152", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -685,7 +696,7 @@ "tags": [ "suricata" ], - "url.hostname": "security.ubuntu.com", + "url.hostname": "security.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -704,6 +715,7 @@ "destination.geo.region_name": "England", "destination.ip": "91.189.88.152", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -747,7 +759,7 @@ "tags": [ "suricata" ], - "url.hostname": "security.ubuntu.com", + "url.hostname": "security.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -766,6 +778,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -809,7 +822,7 @@ "tags": [ "suricata" ], - "url.hostname": "archive.ubuntu.com", + "url.hostname": "archive.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -828,6 +841,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -871,7 +885,7 @@ "tags": [ "suricata" ], - "url.hostname": "archive.ubuntu.com", + "url.hostname": "archive.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -890,6 +904,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -933,7 +948,7 @@ "tags": [ "suricata" ], - "url.hostname": "archive.ubuntu.com", + "url.hostname": "archive.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -952,6 +967,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -995,7 +1011,7 @@ "tags": [ "suricata" ], - "url.hostname": "archive.ubuntu.com", + "url.hostname": "archive.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -1014,6 +1030,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -1057,7 +1074,7 @@ "tags": [ "suricata" ], - "url.hostname": "archive.ubuntu.com", + "url.hostname": "archive.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -1076,6 +1093,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -1119,7 +1137,7 @@ "tags": [ "suricata" ], - "url.hostname": "archive.ubuntu.com", + "url.hostname": "archive.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -1138,6 +1156,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -1179,7 +1198,7 @@ "tags": [ "suricata" ], - "url.hostname": "archive.ubuntu.com", + "url.hostname": "archive.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -1198,6 +1217,7 @@ "destination.geo.region_name": "Massachusetts", "destination.ip": "91.189.91.23", "destination.port": 80, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -1239,7 +1259,7 @@ "tags": [ "suricata" ], - "url.hostname": "archive.ubuntu.com", + "url.hostname": "archive.ubuntu.com", "user_agent.device": "Other", "user_agent.major": "1", "user_agent.minor": "3", @@ -1247,4 +1267,4 @@ "user_agent.os.full_name": "Debian", "user_agent.os.name": "Debian" } -] +] \ No newline at end of file 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 bab25ca9303..ffa2ce7f0f4 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,6 +3,7 @@ "@timestamp": "2018-07-05T19:01:09.820Z", "destination.ip": "192.168.253.112", "destination.port": 22, + "event.dataset": "suricata.eve", "event.type": "ssh", "fileset.module": "suricata", "fileset.name": "eve", @@ -32,6 +33,7 @@ "@timestamp": "2018-07-05T19:07:20.910Z", "destination.ip": "192.168.156.70", "destination.port": 443, + "event.dataset": "suricata.eve", "event.type": "alert", "fileset.module": "suricata", "fileset.name": "eve", @@ -74,6 +76,7 @@ "@timestamp": "2018-07-05T19:43:47.690Z", "destination.ip": "192.168.86.28", "destination.port": 63963, + "event.dataset": "suricata.eve", "event.type": "http", "fileset.module": "suricata", "fileset.name": "eve", @@ -105,7 +108,7 @@ "tags": [ "suricata" ], - "url.hostname": "192.168.86.28", + "url.hostname": "192.168.86.28", "user_agent.device": "Other", "user_agent.major": "67", "user_agent.minor": "0", @@ -120,6 +123,7 @@ "@timestamp": "2018-07-05T19:44:33.222Z", "destination.ip": "192.168.86.85", "destination.port": 56118, + "event.dataset": "suricata.eve", "event.type": "fileinfo", "file.path": "/ssdp/device-desc.xml", "file.size": 1071, @@ -162,7 +166,7 @@ "tags": [ "suricata" ], - "url.hostname": "192.168.86.28", + "url.hostname": "192.168.86.28", "user_agent.device": "Other", "user_agent.major": "67", "user_agent.minor": "0", @@ -177,6 +181,7 @@ "@timestamp": "2018-07-05T19:51:20.213Z", "destination.ip": "192.168.86.85", "destination.port": 39464, + "event.dataset": "suricata.eve", "event.type": "dns", "fileset.module": "suricata", "fileset.name": "eve", @@ -207,6 +212,7 @@ }, { "@timestamp": "2018-07-05T19:51:23.009Z", + "event.dataset": "suricata.eve", "event.type": "stats", "fileset.module": "suricata", "fileset.name": "eve", @@ -343,6 +349,7 @@ "destination.geo.location.lon": -97.822, "destination.ip": "17.142.164.13", "destination.port": 443, + "event.dataset": "suricata.eve", "event.type": "tls", "fileset.module": "suricata", "fileset.name": "eve", @@ -376,6 +383,7 @@ "@timestamp": "2018-07-05T19:51:54.001Z", "destination.ip": "ff02:0000:0000:0000:0000:0000:0001:0002", "destination.port": 547, + "event.dataset": "suricata.eve", "event.type": "flow", "fileset.module": "suricata", "fileset.name": "eve", @@ -407,4 +415,4 @@ "suricata" ] } -] +] \ No newline at end of file