From be9a5668ede98bd44ea5e465ff3fc640079b0251 Mon Sep 17 00:00:00 2001 From: Mario Castro Date: Tue, 8 Jan 2019 11:12:15 +0100 Subject: [PATCH 1/2] Replace missing field names from status Metricset in MongoDB Dashboard (#9795) (cherry picked from commit fba068057f3f3dc57ef0177be817faee94956741) --- CHANGELOG.asciidoc | 65 +++++++++++++++++++ .../Metricbeat-mongodb-overview.json | 12 ++-- 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 65df8bae0e6..aea98a582da 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -31,6 +31,71 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff] - Fix issue preventing diskio metrics collection for idle disks. {issue}9124[9124] {pull}9125[9125] - Allow beats to blacklist certain part of the configuration while using Central Management. {pull}9099[9099] +- Fix MongoDB dashboard that had some incorrect field names from `status` Metricset {pull}9795[9795] {issue}9715[9715] + +*Packetbeat* + +- Adjust Packetbeat `http` fields to ECS Beta 2 {pull}9645[9645] + - `http.request.body` moves to `http.request.body.content` + - `http.response.body` moves to `http.response.body.content` + +*Winlogbeat* + +*Functionbeat* + +==== Bugfixes + +*Affecting all Beats* + +- Enforce validation for the Central Management access token. {issue}9621[9621] +- Allow to unenroll a Beat from the UI. {issue}9452[9452] + +*Auditbeat* + +*Filebeat* + +*Heartbeat* + +- Made monitors.d configuration part of the default config. {pull}9004[9004] + +*Journalbeat* + +*Metricbeat* + +*Packetbeat* + +*Winlogbeat* + +*Functionbeat* + +==== Added + +*Affecting all Beats* + +- Update field definitions for `http` to ECS Beta 2 {pull}9645[9645] +- Release Jolokia autodiscover as GA. {pull}9706[9706] + +*Auditbeat* + +- Add system module. {pull}9546[9546] + +*Filebeat* + +- Added module for parsing Google Santa logs. {pull}9540[9540] +- Added netflow input type that supports NetFlow v1, v5, v6, v7, v8, v9 and IPFIX. {issue}9399[9399] +- Add option to modules.yml file to indicate that a module has been moved {pull}9432[9432]. + +*Heartbeat* + +- Fixed rare issue where TLS connections to endpoints with x509 certificates missing either notBefore or notAfter would cause the check to fail with a stacktrace. {pull}9566[9566] + + +*Journalbeat* + +*Metricbeat* + +- Add `key` metricset to the Redis module. {issue}9582[9582] {pull}9657[9657] {pull}9746[9746] +- Add `socket_summary` metricset to system defaults, removing experimental tag and supporting Windows {pull}9709[9709] *Packetbeat* diff --git a/metricbeat/module/mongodb/_meta/kibana/6/dashboard/Metricbeat-mongodb-overview.json b/metricbeat/module/mongodb/_meta/kibana/6/dashboard/Metricbeat-mongodb-overview.json index 0f671ffc303..3916d588c72 100644 --- a/metricbeat/module/mongodb/_meta/kibana/6/dashboard/Metricbeat-mongodb-overview.json +++ b/metricbeat/module/mongodb/_meta/kibana/6/dashboard/Metricbeat-mongodb-overview.json @@ -180,7 +180,7 @@ "id": "1", "params": { "customLabel": "command", - "field": "mongodb.status.opcounters.command" + "field": "mongodb.status.ops.counters.command" }, "schema": "metric", "type": "avg" @@ -203,7 +203,7 @@ "id": "3", "params": { "customLabel": "delete", - "field": "mongodb.status.opcounters.delete" + "field": "mongodb.status.ops.counters.delete" }, "schema": "metric", "type": "avg" @@ -213,7 +213,7 @@ "id": "4", "params": { "customLabel": "getmore", - "field": "mongodb.status.opcounters.getmore" + "field": "mongodb.status.ops.counters.getmore" }, "schema": "metric", "type": "avg" @@ -223,7 +223,7 @@ "id": "5", "params": { "customLabel": "insert", - "field": "mongodb.status.opcounters.insert" + "field": "mongodb.status.ops.counters.insert" }, "schema": "metric", "type": "avg" @@ -233,7 +233,7 @@ "id": "6", "params": { "customLabel": "query", - "field": "mongodb.status.opcounters.query" + "field": "mongodb.status.ops.counters.query" }, "schema": "metric", "type": "avg" @@ -243,7 +243,7 @@ "id": "7", "params": { "customLabel": "update", - "field": "mongodb.status.opcounters_replicated.update" + "field": "mongodb.status.ops.replicated.update" }, "schema": "metric", "type": "avg" From 3e52b09bb03202f1d4999a831f40b5aef134b143 Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 8 Jan 2019 12:15:32 +0100 Subject: [PATCH 2/2] Move CHANGELOG entry to 'next' file (cherry picked from commit 84058f7ff7ba4fd14c676d9ab82bec38aed22321) --- CHANGELOG.asciidoc | 65 ----------------------------------------- CHANGELOG.next.asciidoc | 1 + 2 files changed, 1 insertion(+), 65 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index aea98a582da..65df8bae0e6 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -31,71 +31,6 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff] - Fix issue preventing diskio metrics collection for idle disks. {issue}9124[9124] {pull}9125[9125] - Allow beats to blacklist certain part of the configuration while using Central Management. {pull}9099[9099] -- Fix MongoDB dashboard that had some incorrect field names from `status` Metricset {pull}9795[9795] {issue}9715[9715] - -*Packetbeat* - -- Adjust Packetbeat `http` fields to ECS Beta 2 {pull}9645[9645] - - `http.request.body` moves to `http.request.body.content` - - `http.response.body` moves to `http.response.body.content` - -*Winlogbeat* - -*Functionbeat* - -==== Bugfixes - -*Affecting all Beats* - -- Enforce validation for the Central Management access token. {issue}9621[9621] -- Allow to unenroll a Beat from the UI. {issue}9452[9452] - -*Auditbeat* - -*Filebeat* - -*Heartbeat* - -- Made monitors.d configuration part of the default config. {pull}9004[9004] - -*Journalbeat* - -*Metricbeat* - -*Packetbeat* - -*Winlogbeat* - -*Functionbeat* - -==== Added - -*Affecting all Beats* - -- Update field definitions for `http` to ECS Beta 2 {pull}9645[9645] -- Release Jolokia autodiscover as GA. {pull}9706[9706] - -*Auditbeat* - -- Add system module. {pull}9546[9546] - -*Filebeat* - -- Added module for parsing Google Santa logs. {pull}9540[9540] -- Added netflow input type that supports NetFlow v1, v5, v6, v7, v8, v9 and IPFIX. {issue}9399[9399] -- Add option to modules.yml file to indicate that a module has been moved {pull}9432[9432]. - -*Heartbeat* - -- Fixed rare issue where TLS connections to endpoints with x509 certificates missing either notBefore or notAfter would cause the check to fail with a stacktrace. {pull}9566[9566] - - -*Journalbeat* - -*Metricbeat* - -- Add `key` metricset to the Redis module. {issue}9582[9582] {pull}9657[9657] {pull}9746[9746] -- Add `socket_summary` metricset to system defaults, removing experimental tag and supporting Windows {pull}9709[9709] *Packetbeat* diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index b6b1f205137..5884c556374 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -84,6 +84,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff] - Fix issue with not collecting Elasticsearch cross-cluster replication stats correctly. {pull}9179[9179] - The `node.name` field in the `elasticsearch/node` metricset now correctly reports the Elasticsarch node name. Previously this field was incorrectly reporting the node ID instead. {pull}9209[9209] - Fix issue preventing diskio metrics collection for idle disks. {issue}9124[9124] {pull}9125[9125] +- Fix MongoDB dashboard that had some incorrect field names from `status` Metricset {pull}9795[9795] {issue}9715[9715] *Packetbeat*