diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 709122ac3546..5c0bef66541c 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -150,6 +150,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Configurable line terminator. {pull}11015[11015] - Add Filebeat envoyproxy module. {pull}11700[11700] - Add apache2(httpd) log path (`/var/log/httpd`) to make apache2 module work out of the box on Redhat-family OSes. {issue}11887[11887] {pull}11888[11888] +- Add support to new MongoDB additional diagnostic information {pull}11952[11952] *Heartbeat* diff --git a/filebeat/module/mongodb/log/ingest/pipeline.json b/filebeat/module/mongodb/log/ingest/pipeline.json index 86db2fea118b..7af8a8aeb0ad 100755 --- a/filebeat/module/mongodb/log/ingest/pipeline.json +++ b/filebeat/module/mongodb/log/ingest/pipeline.json @@ -4,7 +4,7 @@ "grok": { "field": "message", "patterns":[ - "%{TIMESTAMP_ISO8601:mongodb.log.timestamp} %{WORD:log.level} %{WORD:mongodb.log.component} \\s*\\[%{WORD:mongodb.log.context}\\] %{GREEDYDATA:message}" + "%{TIMESTAMP_ISO8601:mongodb.log.timestamp}%{SPACE}%{MONGO3_SEVERITY:log.level}%{SPACE}%{MONGO3_COMPONENT:mongodb.log.component}%{SPACE}(?:\\[%{DATA:mongodb.log.context}\\])?%{SPACE}%{GREEDYDATA:message}" ], "ignore_missing": true } diff --git a/filebeat/module/mongodb/log/test/mongodb-debian-3.2.11.log b/filebeat/module/mongodb/log/test/mongodb-debian-3.2.11.log index a3cb5d563a47..0960db32921b 100644 --- a/filebeat/module/mongodb/log/test/mongodb-debian-3.2.11.log +++ b/filebeat/module/mongodb/log/test/mongodb-debian-3.2.11.log @@ -32,3 +32,4 @@ 2018-02-05T14:49:45.605+0100 I CONTROL [signalProcessingThread] got signal 15 (Terminated), will terminate after current cmd ends 2018-02-05T14:49:45.605+0100 I FTDC [signalProcessingThread] Shutting down full-time diagnostic data capture 2018-02-05T14:49:45.606+0100 I NETWORK [signalProcessingThread] closing listening socket: 6 +2019-03-07T15:10:26.960+0000 I ASIO [NetworkInterfaceASIO-Replication-0] Successfully connected to dbbox7:27017, took 10ms (1 connections now open to dbbox7:27017) 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 24c4ae1c51b8..f14c8b1375c5 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 @@ -246,7 +246,7 @@ "input.type": "log", "log.level": "I", "log.offset": 1947, - "message": " distarch: x86_64", + "message": "distarch: x86_64", "mongodb.log.component": "CONTROL", "mongodb.log.context": "initandlisten", "service.type": "mongodb" @@ -386,7 +386,7 @@ "input.type": "log", "log.level": "I", "log.offset": 3199, - "message": " target_arch: x86_64", + "message": "target_arch: x86_64", "mongodb.log.component": "CONTROL", "mongodb.log.context": "initandlisten", "service.type": "mongodb" @@ -474,5 +474,19 @@ "mongodb.log.component": "NETWORK", "mongodb.log.context": "signalProcessingThread", "service.type": "mongodb" + }, + { + "@timestamp": "2019-03-07T15:10:26.960Z", + "ecs.version": "1.0.0", + "event.dataset": "mongodb.log", + "event.module": "mongodb", + "fileset.name": "log", + "input.type": "log", + "log.level": "I", + "log.offset": 3968, + "message": "Successfully connected to dbbox7:27017, took 10ms (1 connections now open to dbbox7:27017)", + "mongodb.log.component": "ASIO", + "mongodb.log.context": "NetworkInterfaceASIO-Replication-0", + "service.type": "mongodb" } ] \ No newline at end of file