From fa56928851f0f53959a844e5b5583162d398feed Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Wed, 5 Dec 2018 08:51:06 +0100 Subject: [PATCH 1/5] Introduce event.duration and event.dataset for backward compatiblity The field event.duration is introduced as a replacement for metricset.rtt. event.duration is in nano seconds, metricset.rtt in nano seconds so the two are not compatible. `metricset.rtt` will be removed in 7.0. `event.dataset` is introduced as `{module}.{metricset}` for better backward compatiblity in 7.0. Further changes * Fix tests --- CHANGELOG.asciidoc | 3 +++ metricbeat/_meta/fields.common.yml | 10 ++++++++++ metricbeat/docs/fields.asciidoc | 20 ++++++++++++++++++++ metricbeat/include/fields.go | 2 +- metricbeat/include/fields/fields.go | 2 +- metricbeat/mb/event.go | 14 +++++++++++--- metricbeat/mb/event_test.go | 7 +++++++ metricbeat/mb/module/example_test.go | 5 +++++ metricbeat/tests/system/metricbeat.py | 2 +- metricbeat/tests/system/test_processors.py | 2 +- 10 files changed, 60 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 69006a5be57..28151066be1 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -112,6 +112,7 @@ https://github.com/elastic/beats/compare/v6.5.0...6.x[Check the HEAD diff] - Add setting to disable docker cpu metrics per core. {pull}9194[9194] - The `elasticsearch/node` metricset now reports the Elasticsearch cluster UUID. {pull}8771[8771] - Add `host.os.name` field to add_host_metadata processor. {issue}8948[8948] {pull}9405[9405] +- Add field `event.dataset` which is `{module}.{metricset). *Packetbeat* @@ -131,6 +132,8 @@ https://github.com/elastic/beats/compare/v6.5.0...6.x[Check the HEAD diff] *Metricbeat* +- Deprecate field `metricset.rtt`. Replaced by `event.duration` which is in nano instead of micro seconds. + *Packetbeat* - Support new TLS version negotiation introduced in TLS 1.3. {issue}8647[8647]. diff --git a/metricbeat/_meta/fields.common.yml b/metricbeat/_meta/fields.common.yml index ed6b0308f24..865842461e5 100644 --- a/metricbeat/_meta/fields.common.yml +++ b/metricbeat/_meta/fields.common.yml @@ -38,3 +38,13 @@ example: elasticsearch description: > Name of the service metricbeat fetches the data from. + + - name: event.duration + type: long + description: > + Duration of the event in nano seconds. + + - name: event.dataset + type: long + description: > + Event dataset name. diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index f31ba88cf10..eaa920d2c06 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -1877,6 +1877,26 @@ example: elasticsearch Name of the service metricbeat fetches the data from. +-- + +*`event.duration`*:: ++ +-- +type: long + +Duration of the event in nano seconds. + + +-- + +*`event.dataset`*:: ++ +-- +type: long + +Event dataset name. + + -- [[exported-fields-couchbase]] diff --git a/metricbeat/include/fields.go b/metricbeat/include/fields.go index ddae3fcafcd..5b5aef7ffb6 100644 --- a/metricbeat/include/fields.go +++ b/metricbeat/include/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJyUk0Fu3DAMRfdzio/s4wN4UaAICnTVVS7AkTiREEl0RXpc376QaieZQTODeCfL/O+T/H7EK68jnOQs5QBYtMQjnvazZ3U1ThaljPh2AIAnKUax6FaEU+TkFXSmmOiYGLGAUgKfuRhsnViHA7bPxkPXeEShzCMyW41O2YYsfk7cL/9Lbc9z4F4HOcEC418NLJDhhQtXMvb9prOHz1jt/EXSXvt1WBC127CfonYBIxdiYZyqZCwhunDlYaE2/JTYGfsBzyHqm1gfMzKtKGI4MqbK2haxBC5dx5PRpQSSOEpp/bSHansLbZ0jkpSX7UXl33Os7EdYne9M9UdPRJW5eFiNEyzmHpccXRVlJ8Xrza3pRI4vrLzyukj1t8G/9tI2Yr8WytG9K18jm/Ct7vgP5Sl99Kb30+TFzXn/IQZ8Twutip4owYMX93DlQrmeo+OPYX0DcyK1Rqbqwv3W92BtkpvvI5PhxOYC63swWuiGw98AAAD//53pSR0=" + return "eJyUlEFu2zAQRfc+xUf20QG0KFCkBbrqKhcYk+OQCMlRyZFV3T4gLSWxEcmIdzQ1//2Z+dIjXnnuYSRGSQdAvQbu8bSeLReT/aBeUo8fBwB4kqTkU1mKcPIcbAGdyQc6BoZPoBDAZ04KnQcu3QHLY/2haTwiUeQekTV7U1i7KHYM3C6/pNbfs+NWBzlBHeNSA3WkeOHEmZRtu2nsbotVz98krbXfhzkpug/7I0WvYGScT4xTlojJeeNuPExUhx8CG2Xb4dn58i7WxoxIM5Iojowhc6mLmBynpmNJ6VoCQQyFMG/2kHVtoa6zR5D0svyR+d/oM9semsc7U/3dEpFlTBaa/QD1scUlepOlsJFky+7WykCGr6y88jxJtvvgv2tpHbGdE0VvPpRvkVV4rzv+T3EIn72V+2myYsa4vhAdfoaJ5oKWKMGDFfNw46JwPnvDn8P6DuZARSuZsnH3W1+DtUguvo9MihOrcVw+glFDd+Pkkm87ZqriW0HY4P9aylYPl6+CT0iUBF/vfAGSUuHN4O1mbKltet3hLQAA///iTYXi" } diff --git a/metricbeat/include/fields/fields.go b/metricbeat/include/fields/fields.go index f71a8ded7ce..b105b0c5e70 100644 --- a/metricbeat/include/fields/fields.go +++ b/metricbeat/include/fields/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/metricbeat/mb/event.go b/metricbeat/mb/event.go index eb60b83f772..7be8705d862 100644 --- a/metricbeat/mb/event.go +++ b/metricbeat/mb/event.go @@ -18,6 +18,7 @@ package mb import ( + "fmt" "time" "github.com/elastic/beats/libbeat/beat" @@ -116,14 +117,21 @@ func AddMetricSetInfo(module, metricset string, event *Event) { if event.Host != "" { info["host"] = event.Host } - if event.Took > 0 { - info["rtt"] = event.Took / time.Microsecond - } + if event.Namespace != "" { info["namespace"] = event.Namespace } info = common.MapStr{ "metricset": info, + "event": common.MapStr{ + "dataset": fmt.Sprintf("%s.%s", module, metricset), + }, + } + + if event.Took > 0 { + // rtt is deprecated and will be removed in 7.0. Replaced by event.duration. + info.Put("metricset.rtt", event.Took/time.Microsecond) + info.Put("event.duration", event.Took/time.Nanosecond) } if event.RootFields == nil { diff --git a/metricbeat/mb/event_test.go b/metricbeat/mb/event_test.go index 78845b107df..2c3254e33e2 100644 --- a/metricbeat/mb/event_test.go +++ b/metricbeat/mb/event_test.go @@ -180,6 +180,10 @@ func TestAddMetricSetInfo(t *testing.T) { "name": metricSetName, "rtt": time.Duration(500000), }, + "event": common.MapStr{ + "duration": time.Duration(500000000), + "dataset": moduleName + "." + metricSetName, + }, }, e.RootFields) }) @@ -193,6 +197,9 @@ func TestAddMetricSetInfo(t *testing.T) { "module": moduleName, "name": metricSetName, }, + "event": common.MapStr{ + "dataset": moduleName + "." + metricSetName, + }, }, e.RootFields) }) } diff --git a/metricbeat/mb/module/example_test.go b/metricbeat/mb/module/example_test.go index 0f84ba8bdc8..f4c73cc3fdd 100644 --- a/metricbeat/mb/module/example_test.go +++ b/metricbeat/mb/module/example_test.go @@ -65,6 +65,7 @@ func ExampleWrapper() { defer wg.Done() for event := range output { event.Fields.Put("metricset.rtt", 111) + event.Fields.Put("event.duration", 111000) output, err := encodeEvent(event) if err == nil { @@ -90,6 +91,10 @@ func ExampleWrapper() { // "version": "1.2.3" // }, // "@timestamp": "2016-05-10T23:27:58.485Z", + // "event": { + // "dataset": "fake.eventfetcher", + // "duration": 111000 + // }, // "fake": { // "eventfetcher": { // "metric": 1 diff --git a/metricbeat/tests/system/metricbeat.py b/metricbeat/tests/system/metricbeat.py index 8308a9c0e76..067dd0eee0f 100644 --- a/metricbeat/tests/system/metricbeat.py +++ b/metricbeat/tests/system/metricbeat.py @@ -7,7 +7,7 @@ from beat.beat import TestCase COMMON_FIELDS = ["@timestamp", "beat", "metricset.name", "metricset.host", - "metricset.module", "metricset.rtt", "host.name"] + "metricset.module", "metricset.rtt", "host.name", "event"] INTEGRATION_TESTS = os.environ.get('INTEGRATION_TESTS', False) diff --git a/metricbeat/tests/system/test_processors.py b/metricbeat/tests/system/test_processors.py index e9192d092d9..aa8a21e8633 100644 --- a/metricbeat/tests/system/test_processors.py +++ b/metricbeat/tests/system/test_processors.py @@ -35,7 +35,7 @@ def test_drop_fields(self): print(evt.keys()) self.assertItemsEqual(self.de_dot([ 'beat', '@timestamp', 'system', 'metricset.module', - 'metricset.rtt', 'metricset.name', 'host' + 'metricset.rtt', 'metricset.name', 'host', 'event' ]), evt.keys()) cpu = evt["system"]["cpu"] print(cpu.keys()) From b6407a538abcf02dc0a648af782be430fdd95084 Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Thu, 6 Dec 2018 13:26:28 +0100 Subject: [PATCH 2/5] fix alias --- metricbeat/_meta/fields.common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/_meta/fields.common.yml b/metricbeat/_meta/fields.common.yml index 865842461e5..586f5466411 100644 --- a/metricbeat/_meta/fields.common.yml +++ b/metricbeat/_meta/fields.common.yml @@ -45,6 +45,6 @@ Duration of the event in nano seconds. - name: event.dataset - type: long + type: keyword description: > Event dataset name. From a2ed1867fde392ecd383e0ef18bd1612897c26ef Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Fri, 7 Dec 2018 13:33:58 +0100 Subject: [PATCH 3/5] update generated files --- metricbeat/docs/fields.asciidoc | 2 +- metricbeat/include/fields.go | 2 +- metricbeat/include/fields/fields.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index eaa920d2c06..80e487d6d0b 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -1892,7 +1892,7 @@ Duration of the event in nano seconds. *`event.dataset`*:: + -- -type: long +type: keyword Event dataset name. diff --git a/metricbeat/include/fields.go b/metricbeat/include/fields.go index 5b5aef7ffb6..9177ecda20f 100644 --- a/metricbeat/include/fields.go +++ b/metricbeat/include/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJyUlEFu2zAQRfc+xUf20QG0KFCkBbrqKhcYk+OQCMlRyZFV3T4gLSWxEcmIdzQ1//2Z+dIjXnnuYSRGSQdAvQbu8bSeLReT/aBeUo8fBwB4kqTkU1mKcPIcbAGdyQc6BoZPoBDAZ04KnQcu3QHLY/2haTwiUeQekTV7U1i7KHYM3C6/pNbfs+NWBzlBHeNSA3WkeOHEmZRtu2nsbotVz98krbXfhzkpug/7I0WvYGScT4xTlojJeeNuPExUhx8CG2Xb4dn58i7WxoxIM5Iojowhc6mLmBynpmNJ6VoCQQyFMG/2kHVtoa6zR5D0svyR+d/oM9semsc7U/3dEpFlTBaa/QD1scUlepOlsJFky+7WykCGr6y88jxJtvvgv2tpHbGdE0VvPpRvkVV4rzv+T3EIn72V+2myYsa4vhAdfoaJ5oKWKMGDFfNw46JwPnvDn8P6DuZARSuZsnH3W1+DtUguvo9MihOrcVw+glFDd+Pkkm87ZqriW0HY4P9aylYPl6+CT0iUBF/vfAGSUuHN4O1mbKltet3hLQAA///iTYXi" + return "eJyUlE1u2zAQhfc6xUP20QG0KFCkBbrqKhcYk+OQCMlRyZFV3T4gLSWx4R/YO5qa972ZedIz3nkZYCRGSR2gXgMPeNnOlovJflQvacCPDgBeJCn5VNYi7D0HW0AH8oF2geETKATwgZNCl5FL32F9bOiaxjMSRR4QWbM3hbWPYqfA7fIitf5eHbc6yB7qGMcaqCPFGyfOpGzbTWP311j1/CBpq30c5qTobdgfKXoCI+N8YuyzRMzOG3fmYaY6/BDYKNser86XT7E2ZkRakESxY4yZS13E7Dg1HUtKpxIIYiiE5WoPWbcW6joHBElv6x+Z/00+sx2geboz1d8tEVmmZKHZj1AfW1yiN1kKG0m23NxaGcnwiZV3XmbJ9jb471ZaR2yXRNGbL+VzZBW+1R3/pziG797K/TRZMVPcXogeP8NMS0FLlODJink6c1E4H7zh72H9BHOgopVM2bj7rW/BWiVX3zsmxZ7VOC5fwaihO3NyzLedMlXxa0G4wv+1lm0ejl8Fn5AoCS7vfAWSUmF9fNvHmK3lTbLvPgIAAP//j0GHNw==" } diff --git a/metricbeat/include/fields/fields.go b/metricbeat/include/fields/fields.go index b105b0c5e70..c076d2ff270 100644 --- a/metricbeat/include/fields/fields.go +++ b/metricbeat/include/fields/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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" } From 09e70f82bef3ae5184f7c145d22f312257a69983 Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Mon, 10 Dec 2018 08:49:13 +0100 Subject: [PATCH 4/5] add event field to test --- metricbeat/tests/system/test_redis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/tests/system/test_redis.py b/metricbeat/tests/system/test_redis.py index e6fa9edd98e..328245de14a 100644 --- a/metricbeat/tests/system/test_redis.py +++ b/metricbeat/tests/system/test_redis.py @@ -92,7 +92,7 @@ def test_module_processors(self): Test local processors for Redis info event. """ fields = ["clients", "cpu"] - eventFields = ['beat', 'metricset'] + eventFields = ['beat', 'metricset', 'event'] eventFields += ['redis.info.' + f for f in fields] self.render_config_template(modules=[{ "name": "redis", From d4c5bc559699dbbe0c2b48665283db71159791ad Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Tue, 11 Dec 2018 22:13:13 +0100 Subject: [PATCH 5/5] implement review feedback --- metricbeat/_meta/fields.common.yml | 1 + metricbeat/docs/fields.asciidoc | 3 +++ metricbeat/include/fields.go | 2 +- metricbeat/include/fields/fields.go | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/metricbeat/_meta/fields.common.yml b/metricbeat/_meta/fields.common.yml index 586f5466411..66cce763d52 100644 --- a/metricbeat/_meta/fields.common.yml +++ b/metricbeat/_meta/fields.common.yml @@ -22,6 +22,7 @@ required: true description: > Event round trip time in microseconds. + deprecated: true - name: metricset.namespace type: keyword diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 80e487d6d0b..e38bfd73ec0 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -1838,6 +1838,9 @@ Hostname of the machine from which the metricset was collected. This field may n *`metricset.rtt`*:: + -- + +deprecated[True] + type: long required: True diff --git a/metricbeat/include/fields.go b/metricbeat/include/fields.go index 9177ecda20f..e210bf70ae7 100644 --- a/metricbeat/include/fields.go +++ b/metricbeat/include/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJyUlE1u2zAQhfc6xUP20QG0KFCkBbrqKhcYk+OQCMlRyZFV3T4gLSWx4R/YO5qa972ZedIz3nkZYCRGSR2gXgMPeNnOlovJflQvacCPDgBeJCn5VNYi7D0HW0AH8oF2geETKATwgZNCl5FL32F9bOiaxjMSRR4QWbM3hbWPYqfA7fIitf5eHbc6yB7qGMcaqCPFGyfOpGzbTWP311j1/CBpq30c5qTobdgfKXoCI+N8YuyzRMzOG3fmYaY6/BDYKNser86XT7E2ZkRakESxY4yZS13E7Dg1HUtKpxIIYiiE5WoPWbcW6joHBElv6x+Z/00+sx2geboz1d8tEVmmZKHZj1AfW1yiN1kKG0m23NxaGcnwiZV3XmbJ9jb471ZaR2yXRNGbL+VzZBW+1R3/pziG797K/TRZMVPcXogeP8NMS0FLlODJink6c1E4H7zh72H9BHOgopVM2bj7rW/BWiVX3zsmxZ7VOC5fwaihO3NyzLedMlXxa0G4wv+1lm0ejl8Fn5AoCS7vfAWSUmF9fNvHmK3lTbLvPgIAAP//j0GHNw==" + return "eJyUlEFu2zAQRfc+xUf20QG0KFCkBbrqKhcYk+OQCMlRyZFV3T4gJTmxEduwdzQ1//+ZedIz3nnuYSRGSTtAvQbu8bKdLReT/aBeUo8fOwB4kaTkU1mLcPAcbAEdyQfaB4ZPoBDAR04KnQcu3Q7rY/2uaTwjUeQekTV7U1i7KHYM3C6/da2/V8etDnKAOsZSA3WkeOPEmZRtu2ne3TWven7Qaat93MxJ0dtmf6TomRkZ5xPjkCVict64iwwT1eGHwEbZdnh1vpzE2pgRaUYSxZ4xZC51EZPj1HQsKZ1LIIihEOarPWTdWqjr7BEkva1/ZP43+sy2h+bxzlR/NyKyjMlCsx+gPjZcojdZChtJtrGyaAyZTR3yKn1jmWUgw2cJ33meJNvbef5upXXydk4UvflULhfjqMK3mub/FIfwNVu5D5kVM8btPenwM0w0FzTQBE9WzNNFisL56A1/ZfhkzIGKVmfKxt1vfeNtlVxz75kUB1bjuHzyUlm8SLJgb8dMVfwaH1f8f61lW4blY+ETEiXBCYXvDEmpsD6+7YW+tbxJdruPAAAA///0dI4s" } diff --git a/metricbeat/include/fields/fields.go b/metricbeat/include/fields/fields.go index c076d2ff270..8c310611be9 100644 --- a/metricbeat/include/fields/fields.go +++ b/metricbeat/include/fields/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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" }