From 0f3ea0d3f75a5ba37c3690f242be0e1b99fb49c2 Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Tue, 29 Jan 2019 21:02:20 +0100 Subject: [PATCH] Change text fields to keyword for Metricbeat (#10318) Searching for `type: text` revealed a few fields which were text but I think should be keyword. --- CHANGELOG.next.asciidoc | 10 ++++++ metricbeat/docs/fields.asciidoc | 14 ++++---- .../module/ceph/cluster_disk/_meta/data.json | 22 ++++++++----- .../ceph/cluster_health/_meta/data.json | 18 +++++++---- .../ceph/cluster_status/_meta/data.json | 32 +++++++++++-------- metricbeat/module/ceph/fields.go | 2 +- .../ceph/monitor_health/_meta/data.json | 32 +++++++++++-------- metricbeat/module/ceph/osd_df/_meta/data.json | 25 +++++++++------ .../module/ceph/osd_df/_meta/fields.yml | 2 +- .../module/ceph/osd_tree/_meta/data.json | 20 ++++++++---- .../module/ceph/osd_tree/_meta/fields.yml | 4 +-- metricbeat/module/ceph/osd_tree/data.go | 2 +- .../module/ceph/osd_tree/osd_tree_test.go | 4 +-- .../module/ceph/pool_disk/_meta/data.json | 18 +++++++---- .../kafka/consumergroup/_meta/fields.yml | 2 +- metricbeat/module/kafka/fields.go | 2 +- metricbeat/module/kibana/fields.go | 2 +- .../module/kibana/stats/_meta/fields.yml | 2 +- metricbeat/module/mongodb/fields.go | 2 +- .../module/mongodb/metrics/_meta/fields.yml | 2 +- metricbeat/module/php_fpm/fields.go | 2 +- .../module/php_fpm/process/_meta/fields.yml | 2 +- 22 files changed, 137 insertions(+), 84 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 878d44724b6..029824c74ae 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -24,6 +24,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Docker and Kubernetes labels/annotations will be "dedoted" by default. {pull}10338[10338] *Auditbeat* + - Rename `process.exe` to `process.executable` in auditd module to align with ECS. {pull}9949[9949] - Rename `process.cwd` to `process.working_directory` in auditd module to align with ECS. {pull}10195[10195] - Change data type of `process.pid` and `process.ppid` to number in JSON output @@ -84,6 +85,15 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Rename http.request.body field to http.request.body.content. {pull}10315[10315] - Adjust php_fpm.process metricset fields to ECS. {pull}10366[10366] - Adjust mongodb.status metricset to to ECS. {pull}10368[10368] +- Change the following fields from type text to keyword: {pull}10318[10318] + - ceph.osd_df.name + - ceph.osd_tree.name + - ceph.osd_tree.children + - kafka.consumergroup.meta + - kibana.stats.name + - mongodb.metrics.replication.executor.network_interface + - php_fpm.process.request_uri + - php_fpm.process.script *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 2fdd5cc13c5..2172b0ab549 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -1587,7 +1587,7 @@ osd node id *`ceph.osd_df.name`*:: + -- -type: text +type: keyword osd node name @@ -1682,7 +1682,7 @@ osd or bucket node id *`ceph.osd_tree.name`*:: + -- -type: text +type: keyword osd or bucket node name @@ -1712,7 +1712,7 @@ osd or bucket node typeID *`ceph.osd_tree.children`*:: + -- -type: text +type: keyword bucket children list, separated by comma. @@ -10779,7 +10779,7 @@ consumer offset into partition being read *`kafka.consumergroup.meta`*:: + -- -type: text +type: keyword custom consumer meta data string @@ -11028,7 +11028,7 @@ Kibana instance UUID *`kibana.stats.name`*:: + -- -type: text +type: keyword Kibana instance name @@ -14736,7 +14736,7 @@ type: boolean *`mongodb.metrics.replication.executor.network_interface`*:: + -- -type: text +type: keyword -- @@ -18967,7 +18967,7 @@ The user (PHP_AUTH_USER) (or - if not set) (for the current request) *`php_fpm.process.script`*:: + -- -type: text +type: keyword The main script called (or - if not set) (for the current request) diff --git a/metricbeat/module/ceph/cluster_disk/_meta/data.json b/metricbeat/module/ceph/cluster_disk/_meta/data.json index 7306589ec33..a26d6f1dde3 100644 --- a/metricbeat/module/ceph/cluster_disk/_meta/data.json +++ b/metricbeat/module/ceph/cluster_disk/_meta/data.json @@ -1,26 +1,32 @@ { "@timestamp": "2017-10-12T08:05:34.853Z", - "beat": { + "agent": { "hostname": "host.example.com", "name": "host.example.com" }, "ceph": { "cluster_disk": { "available": { - "bytes": 50847313920 + "bytes": 0 }, "total": { - "bytes": 67371577344 + "bytes": 0 }, "used": { - "bytes": 13071564800 + "bytes": 0 } } }, + "event": { + "dataset": "ceph.cluster_disk", + "duration": 115000, + "module": "ceph" + }, "metricset": { - "host": "ceph:5000", - "module": "ceph", - "name": "cluster_disk", - "rtt": 115 + "name": "cluster_disk" + }, + "service": { + "address": "127.0.0.1:5000", + "type": "ceph" } } \ No newline at end of file diff --git a/metricbeat/module/ceph/cluster_health/_meta/data.json b/metricbeat/module/ceph/cluster_health/_meta/data.json index 5a7c98cf0cd..08de2b92e68 100644 --- a/metricbeat/module/ceph/cluster_health/_meta/data.json +++ b/metricbeat/module/ceph/cluster_health/_meta/data.json @@ -1,12 +1,12 @@ { "@timestamp": "2017-10-12T08:05:34.853Z", - "beat": { + "agent": { "hostname": "host.example.com", "name": "host.example.com" }, "ceph": { "cluster_health": { - "overall_status": "HEALTH_WARN", + "overall_status": "HEALTH_OK", "timechecks": { "epoch": 3, "round": { @@ -16,10 +16,16 @@ } } }, + "event": { + "dataset": "ceph.cluster_health", + "duration": 115000, + "module": "ceph" + }, "metricset": { - "host": "ceph:5000", - "module": "ceph", - "name": "cluster_health", - "rtt": 115 + "name": "cluster_health" + }, + "service": { + "address": "127.0.0.1:5000", + "type": "ceph" } } \ No newline at end of file diff --git a/metricbeat/module/ceph/cluster_status/_meta/data.json b/metricbeat/module/ceph/cluster_status/_meta/data.json index a6d41779df7..c6ce81c817a 100644 --- a/metricbeat/module/ceph/cluster_status/_meta/data.json +++ b/metricbeat/module/ceph/cluster_status/_meta/data.json @@ -1,6 +1,6 @@ { "@timestamp": "2017-10-12T08:05:34.853Z", - "beat": { + "agent": { "hostname": "host.example.com", "name": "host.example.com" }, @@ -17,19 +17,19 @@ "total": 0 }, "osd": { - "epoch": 18, + "epoch": 3, "full": false, - "in_osd_count": 1, + "in_osd_count": 0, "nearfull": false, "osd_count": 1, "remapped_pg_count": 0, - "up_osd_count": 1 + "up_osd_count": 0 }, "pg": { - "avail_bytes": 50847313920, - "data_bytes": 3656, - "total_bytes": 67371577344, - "used_bytes": 13071564800 + "avail_bytes": 0, + "data_bytes": 0, + "total_bytes": 0, + "used_bytes": 0 }, "traffic": { "read_bytes": 0, @@ -37,13 +37,19 @@ "write_bytes": 0, "write_op_per_sec": 0 }, - "version": 32 + "version": 4 } }, + "event": { + "dataset": "ceph.cluster_status", + "duration": 115000, + "module": "ceph" + }, "metricset": { - "host": "ceph:5000", - "module": "ceph", - "name": "cluster_status", - "rtt": 115 + "name": "cluster_status" + }, + "service": { + "address": "127.0.0.1:5000", + "type": "ceph" } } \ No newline at end of file diff --git a/metricbeat/module/ceph/fields.go b/metricbeat/module/ceph/fields.go index 7112808d2df..8f8636152e8 100644 --- a/metricbeat/module/ceph/fields.go +++ b/metricbeat/module/ceph/fields.go @@ -32,5 +32,5 @@ func init() { // AssetCeph returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/ceph. func AssetCeph() string { - return "eJzEmt9v2zYQx9/zVxzytAGJsb36YUDXFWiwpQ2W9mkYVJo8SZwpkeBRcf3fD6RkOdZP26FdP22x+72P7k7Hu5PuYY3bJXA0+Q2Ak07hEm7fo8lvbwAEErfSOKnLJfx2AwDgv4JCi0rhDQDl2rqE6zKV2RJSpsj/1aJCRriEjPnfoHOyzGgJ/9wSqds7uM2dM7f/3gCkEpWgZVC+h5IV2LL4j9sar2J1ZZq/DBD5zzf/j74B16VjsiRwOUKBzkru/5s52KBFIG6ZQQGp1QW8//D0cdEIvMY4QFEVObSJkLRuvxzCmkDznxGdQz/tPl2Y10DshUnFVgoXq61DOvjNjkvpMut8MYHmP+92qhBUQafBgQ115+eptgVzS+gD7CCddkxFBfziFePAVYQiKttXQnE+WjfTcmTK5TFyrad0erbpF7RMqYQcc9Wwv9a43WgrTnPZ51oXat0pt7UpJQvkOfI1LdBonkeK3SMz8IKWpC7nzFpdlWLxwlSFkYy34hC0jwOIHYrngxAcgnRzs2d7ODeH8+yIjO3pT+XmUNjOj0U41RpfTCaEZWkq+cIiE8lJVWS8Ms3D1f4BbxRcbnWV5aZyYNACIddjudOwbqx0eHXYYPUM2uBZbRLjEwJ5rPi+dqHUhk5z3sV4ai8dA1RIMopxXITTNTLGThxMBmVVrEaqcMugV/8hd7FO0B5FI38UimVO6kEQ4kyhSFKlmRvJb4OWY9n99lTcPsKOUmBmmUBxkaDtxGeC1jJcJmgtxRFBa1F+XNBa3PGgmWwhmGNXr5gmA293onc12SIMAFdHY4cDwhhcyPKrw7n9cDAG5pv+q3NV7WAwghUaHgwtHSb+j5FuzacsdNb4+nfTCFxXvRvqXOvPud4Q5HoDBSu3YDICZhFk2UDpdPbSe3yRm70mQDTf72kSi7RSw6V7pbVC1qWaMf5AXhR6oq8tlsjsRax64RnTVZFoErFOiU4yeGWfCXPj3o6kMpeG8ampa6A2Pb8+TULJ8kdAPXyahLJYMGNQJCa7NtnfHx7fPT19+GOUL+bEHrS6PUbbFOpSOn30EuXkQfVQP3iAwpl95My6394ZHqvc7nd3TV+0m+UfPw9nTM858LYNwsfaGTNW95e+XkW/8j9/nzNfrySjma73kfNmw7IxmtWwaZw3qhi5pDKCOeyGsrbsvznxemWBsMmxhA0jGNLeGR9tY87KrU+swLnLJacthj6BFkpnUXe7f+lsv9rtAhyzbX4NV0jiUekeJfF4eEQuKt3z85d4cBd/pPBWwNmb7ozkY+R699qrczURafwjjqPJQ6soJK2hIpb51r32xWGTPHXQyVg+CE2rFthVnC03Dr+fuCFoTY2OIwJfJMeEK0YRN/CtXa9xB1IpzJgK/wey5KoSCLkQd0AkAB1fTBxwPlevMOG2+VGP3i9aVSMua5+2XZOqztoJqjOfosZg229SJvhMlpRVEekWou48DkpzX1PqRl6GyXA8eGOd6qUWdZ0oNhosw8ES6CzibBE8ptx5oVDoZovn1eqetrCq+BrdNStgx+hoLfQ24tbAjuWJaqhJ3EGuyd2B1dpNFMWtweSSMfFSD8ODL8+lEhaHd1anx6axulMFJf3lExpmw7282gLXRcGGHcFtRXmyQZnlw3fz0G187LkVxGFAfH9umpGB8/QgBIt9wZ0p/C5p5BHHWXszSbVFclKpWt3nQKndT7/eb5Hu4Jf7Uv88XMWtLJjdJixNZSndNpbj/TBUe9s3rhaZkGXz6CC82NTYHS3rFicS4YzXGHJsJT3QmNnYby7sXx4J9UA6f9JVSsAKoTI+SkJvhre6l2nkvCNqZQjKLZqS62NauJS5vPfW0Bt5DLNYNsUqzNH1cd+pY72j1Wit3vzS25DIDzxSH8Ruk+DBTjtL37y8GDVZT49Xfa2vx3LcrOs54z5C/hS2uOE2aZ4dH+etK7zC9wYfXWDnt14dcP0fAAD//wWoKpo=" + return "eJzEms9v27gSx+/5KwY5vQckxntXHx7Q1y3QYDdtsGlPi4VKkyOJa0okOFS8/u8XpGTZ1k/boV2fWtv5zsczo+HMSI+wxu0SOJr8DsBJp3AJ9x/R5Pd3AAKJW2mc1OUS/ncHAOA/gkKLSuEdAOXauoTrMpXZElKmyL9rUSEjXELG/HfQOVlmtIQ/7onU/QPc586Z+z/vAFKJStAyKD9CyQpsWfzLbY1XsboyzTsDRP71w//RD+C6dEyWBC5HKNBZyf2/mYMNWgTilhkUkFpdwMdPL58XjcAhxhGKqsihTYSkdfvhENYEmn+N6Bz7affqwhwCsTcmFVspXKy2DunoOzsupcus88EEmn992KlCUAWdBgc21J2vp9oWzC2hD7CDdNoxFRXwm1eMA1cRiqhs3wnF5WjdTMuRKZfHyLWe0vnZpt/QMqUScsxVw/5a43ajrTjPZV9rXah1p9zWppQskOfI17RAo3keKXbPzMAbWpK6nDNrdVWKxRtTFUYy3opD0D4NIHYoXo9CcAzSzc2e7eHcHM6zEzK2pz+Vm0NhuzwW4VRrfDGZEJalqeQLi0wkZ1WR8co0D1f7B7xRcLnVVZabyoFBC4Rcj+VOw7qx0uHNYYPVC2iDZ7VJjE8I5LHie+hCqQ2d57yr8dReOgWokGQU47gIp2tkjJ04mAzKqliNVOGWQa/+Qu5inaA9ikb+JBTLnNSDIMSZQpGkSjM3kt8GLcey++m5uH2EHaXAzDKB4ipB24nPBK1luE7QWooTgtai/LygtbjjQTPZQjDHbl4xTQbe7kTvarJFGABujsaOB4QxuJDlN4dz++FgDMw3/TfnqtrBYAQrNDwYWjpM/JuRLs2XLHTWePi9aQSuq94Fdan111xvCHK9gYKVWzAZAbMIsmygdDr703t8kZu9JkA03+9pEou0UsOle6W1QtalmjH+RF4UeqKHFktk9ipWvfCM6apINIlYp0QnGbyyz4S5cW9HUplrw/jU1DVQm57fXyahZPkzoJ6+TEJZLJgxKBKT3Zrs90/PH15ePv0yyhdzYg9a3R6jbQp1KZ0+eYly9qB6rB88QOHMPnFm3W/vDI9Vbve7u6Yv2s3yz1+HM6bnHHjfBuFz7YwZq/ufvl5F/+W//n/OfL2SjGa63kfOmw3LxmhWw6Zx3qhi5JLKCOawG8rasv/kzN8rC4RNjiVsGMGQ9s74aBtzUW59YQXO/Vxy2mLoE2ihdBZ1t/ubzvar3S7AKdvmQ7hCEo9K9yyJx8MjclHpXl+/xYO7+i2F9wLOXnQXJB8j17vWDs7VRKTxjziOJg+topC0hopY5lv32hfHTfLUQSdj+SA0rVpgV/E65aa1NjqRCHyTHBOuGEVcwrd2vcYDSKUwYyr8D2TJVSUQciEegEgAOr6YOON8ut5gyG1TpJ6+37SqRlzW3nC7JVWduBNUF95IjcG2X6ZM8JksKasi0lVE3ZEclOa+rNS9vAzD4XjwxprVa+3qOlFsNFiGg1XQWcTZOnhKxfNCodbN1s+blT5tYVXxNbobF8GO3dFy6M1c1fJEQdQkHiDX5B7Aau0m6uLWYHLNsHipp+Hxl+dSCYvDm6uLnNQY3gmDkt4DhIbZcEWvtsB1UbBhX3BbUZ5sUGb58DU9dDGfenoFcRgQ35+eZmTyPD8OwWJfcGcK/5Y0cq/jogWapNoiOalUre7ToNTuX/993CI9wH8eS/3v4VpuZcHsNmFpKkvptrEc76ei2tu+g7XIhCybewjhCafG7mhxtziRCBc8z5BjK+mBxszGfoRh/xRJKAnS+fOuUgJWCJXxURJ6M7zevU475x1RK0NQbtGUXJ/SyKXM5b3Hh97JY5jFsqlXYaCuD/1OKesdsEZr9e6n34ZEfuLB+iR2KwUPdoMT9XCLMWqyHiNv+nxfj+W0oddzxr2X/CWsc8Nl0txEPs1bN3iW7x0+usLyb7064vonAAD//8IHLlo=" } diff --git a/metricbeat/module/ceph/monitor_health/_meta/data.json b/metricbeat/module/ceph/monitor_health/_meta/data.json index 38d4741b2c5..3557141daf4 100644 --- a/metricbeat/module/ceph/monitor_health/_meta/data.json +++ b/metricbeat/module/ceph/monitor_health/_meta/data.json @@ -1,18 +1,18 @@ { "@timestamp": "2017-10-12T08:05:34.853Z", - "beat": { + "agent": { "hostname": "host.example.com", "name": "host.example.com" }, "ceph": { "monitor_health": { "available": { - "kb": 49653688, - "pct": 75 + "kb": 46814916, + "pct": 76 }, "health": "HEALTH_OK", - "last_updated": "2017-12-07T07:26:33.344939Z", - "name": "93c038136d94", + "last_updated": "2019-01-25T12:37:24.921587Z", + "name": "f0e2841bb524", "store_stats": { "last_updated": "0.000000", "log": { @@ -22,24 +22,30 @@ "bytes": 65552 }, "sst": { - "bytes": 726 + "bytes": 1087 }, "total": { - "bytes": 2097894 + "bytes": 2098255 } }, "total": { - "kb": 65792556 + "kb": 61255492 }, "used": { - "kb": 12767092 + "kb": 11299252 } } }, + "event": { + "dataset": "ceph.monitor_health", + "duration": 115000, + "module": "ceph" + }, "metricset": { - "host": "ceph:5000", - "module": "ceph", - "name": "monitor_health", - "rtt": 115 + "name": "monitor_health" + }, + "service": { + "address": "127.0.0.1:5000", + "type": "ceph" } } \ No newline at end of file diff --git a/metricbeat/module/ceph/osd_df/_meta/data.json b/metricbeat/module/ceph/osd_df/_meta/data.json index a84eb48dfe3..fb8e83329dc 100644 --- a/metricbeat/module/ceph/osd_df/_meta/data.json +++ b/metricbeat/module/ceph/osd_df/_meta/data.json @@ -1,25 +1,30 @@ { "@timestamp": "2017-10-12T08:05:34.853Z", - "beat": { + "agent": { "hostname": "host.example.com", "name": "host.example.com" }, "ceph": { "osd_df": { - "available.byte": 49655580, + "available.byte": 0, "device_class": "", "id": 0, "name": "osd.0", - "pg_num": 120, - "total.byte": 65792556, - "used.byte": 12765200, - "used.pct": 0.1940219498388237 + "pg_num": 0, + "total.byte": 0, + "used.byte": 0 } }, + "event": { + "dataset": "ceph.osd_df", + "duration": 115000, + "module": "ceph" + }, "metricset": { - "host": "ceph:5000", - "module": "ceph", - "name": "osd_df", - "rtt": 115 + "name": "osd_df" + }, + "service": { + "address": "127.0.0.1:5000", + "type": "ceph" } } \ No newline at end of file diff --git a/metricbeat/module/ceph/osd_df/_meta/fields.yml b/metricbeat/module/ceph/osd_df/_meta/fields.yml index 8ad2589c314..033a1ddd253 100644 --- a/metricbeat/module/ceph/osd_df/_meta/fields.yml +++ b/metricbeat/module/ceph/osd_df/_meta/fields.yml @@ -9,7 +9,7 @@ description: > osd node id - name: name - type: text + type: keyword description: > osd node name - name: device_class diff --git a/metricbeat/module/ceph/osd_tree/_meta/data.json b/metricbeat/module/ceph/osd_tree/_meta/data.json index daf3e06953d..6f8cf7a9106 100644 --- a/metricbeat/module/ceph/osd_tree/_meta/data.json +++ b/metricbeat/module/ceph/osd_tree/_meta/data.json @@ -1,12 +1,14 @@ { "@timestamp": "2017-10-12T08:05:34.853Z", - "beat": { + "agent": { "hostname": "host.example.com", "name": "host.example.com" }, "ceph": { "osd_tree": { - "children": "-2", + "children": [ + "-2" + ], "father": "", "id": -1, "name": "default", @@ -14,10 +16,16 @@ "type_id": 10 } }, + "event": { + "dataset": "ceph.osd_tree", + "duration": 115000, + "module": "ceph" + }, "metricset": { - "host": "ceph:5000", - "module": "ceph", - "name": "osd_tree", - "rtt": 115 + "name": "osd_tree" + }, + "service": { + "address": "127.0.0.1:5000", + "type": "ceph" } } \ No newline at end of file diff --git a/metricbeat/module/ceph/osd_tree/_meta/fields.yml b/metricbeat/module/ceph/osd_tree/_meta/fields.yml index 67078e0206a..07dcd1c78c8 100644 --- a/metricbeat/module/ceph/osd_tree/_meta/fields.yml +++ b/metricbeat/module/ceph/osd_tree/_meta/fields.yml @@ -9,7 +9,7 @@ description: > osd or bucket node id - name: name - type: text + type: keyword description: > osd or bucket node name - name: type @@ -21,7 +21,7 @@ description: > osd or bucket node typeID - name: children - type: text + type: keyword description: > bucket children list, separated by comma. - name: crush_weight diff --git a/metricbeat/module/ceph/osd_tree/data.go b/metricbeat/module/ceph/osd_tree/data.go index 27a3ea14278..bc0290acddf 100644 --- a/metricbeat/module/ceph/osd_tree/data.go +++ b/metricbeat/module/ceph/osd_tree/data.go @@ -86,7 +86,7 @@ func eventsMapping(content []byte) ([]common.MapStr, error) { nodeInfo := common.MapStr{} if node.ID < 0 { //bucket node - nodeInfo["children"] = childrenMap[node.Name] + nodeInfo["children"] = strings.Split(childrenMap[node.Name], ",") } else { //osd node nodeInfo["crush_weight"] = node.CrushWeight diff --git a/metricbeat/module/ceph/osd_tree/osd_tree_test.go b/metricbeat/module/ceph/osd_tree/osd_tree_test.go index dcfedc2e291..8207c4e8156 100644 --- a/metricbeat/module/ceph/osd_tree/osd_tree_test.go +++ b/metricbeat/module/ceph/osd_tree/osd_tree_test.go @@ -59,7 +59,7 @@ func TestFetchEventContents(t *testing.T) { nodeInfo := events[0] assert.EqualValues(t, "default", nodeInfo["name"]) assert.EqualValues(t, "root", nodeInfo["type"]) - assert.EqualValues(t, "-3", nodeInfo["children"]) + assert.EqualValues(t, []string{"-3"}, nodeInfo["children"]) assert.EqualValues(t, -1, nodeInfo["id"]) assert.EqualValues(t, 10, nodeInfo["type_id"]) assert.EqualValues(t, "", nodeInfo["father"]) @@ -68,7 +68,7 @@ func TestFetchEventContents(t *testing.T) { nodeInfo = events[1] assert.EqualValues(t, "ceph-mon1", nodeInfo["name"]) assert.EqualValues(t, "host", nodeInfo["type"]) - assert.EqualValues(t, "1,0", nodeInfo["children"]) + assert.EqualValues(t, []string{"1", "0"}, nodeInfo["children"]) assert.EqualValues(t, -3, nodeInfo["id"]) assert.EqualValues(t, 1, nodeInfo["type_id"]) assert.EqualValues(t, "default", nodeInfo["father"]) diff --git a/metricbeat/module/ceph/pool_disk/_meta/data.json b/metricbeat/module/ceph/pool_disk/_meta/data.json index 930a560cebb..8d0d0ba019d 100644 --- a/metricbeat/module/ceph/pool_disk/_meta/data.json +++ b/metricbeat/module/ceph/pool_disk/_meta/data.json @@ -1,6 +1,6 @@ { "@timestamp": "2017-10-12T08:05:34.853Z", - "beat": { + "agent": { "hostname": "host.example.com", "name": "host.example.com" }, @@ -10,7 +10,7 @@ "name": "rbd", "stats": { "available": { - "bytes": 47478734249 + "bytes": 0 }, "objects": 0, "used": { @@ -20,10 +20,16 @@ } } }, + "event": { + "dataset": "ceph.pool_disk", + "duration": 115000, + "module": "ceph" + }, "metricset": { - "host": "ceph:5000", - "module": "ceph", - "name": "pool_disk", - "rtt": 115 + "name": "pool_disk" + }, + "service": { + "address": "127.0.0.1:5000", + "type": "ceph" } } \ No newline at end of file diff --git a/metricbeat/module/kafka/consumergroup/_meta/fields.yml b/metricbeat/module/kafka/consumergroup/_meta/fields.yml index 0cea9183255..963844e43b4 100644 --- a/metricbeat/module/kafka/consumergroup/_meta/fields.yml +++ b/metricbeat/module/kafka/consumergroup/_meta/fields.yml @@ -40,7 +40,7 @@ description: consumer offset into partition being read - name: meta - type: text + type: keyword description: custom consumer meta data string - name: error.code diff --git a/metricbeat/module/kafka/fields.go b/metricbeat/module/kafka/fields.go index d5a0bd09a9e..7a7d0fa0bb2 100644 --- a/metricbeat/module/kafka/fields.go +++ b/metricbeat/module/kafka/fields.go @@ -32,5 +32,5 @@ func init() { // AssetKafka returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/kafka. func AssetKafka() string { - return "eJy8WE1v2zgQvftXDHJyDtGedg8+LNAmRWE0aIu0PRu0OLIJU6RK0k797wtSli1RIvVhJzrFjPTe43D4ZsgH2OFxATuS7cgMwDDDcQF3X+zvuxkARZ0qVhgmxQL+nwEAuP9BLume4wxAb6Uyq1SKjG0WkBGu7ahCjkTjAjYWNmPIqV64zx9AkBwvlPYxx8K+quS+OI108DZh6lBrJXeozsNdeEHM8vnoEOBRCr3PUcFn+yksRSZVTuwHsCUHhDWiAIWEQqZkDvPTZ1siKGdi04A0W4S0wnNS7pPaC/5c6vNhtDFczYdLjyI6pdq0GJ118hBKFWrdSbbD46tUvpBhfIQeUBmmkZ4pWmtmZMHSxP7dWrc2dYT2p8VxmCEOVEqqJJW0zeRFtJfGQYGFStpsBVGG2W+TxvqNZfpewQCjURY3u1UHVzx+DbJfgv3eIzAKMnMZW1zYhRsoY9ivo9yD7yMHiKDuV0matMRV+853gNG+EAJq2lv1xPZ0y6PCekpNhcKUGKQL+C/5d9I2vKWbQb+jhSIAMWeDmLsNmCo0XK4aCfJ3Ox70uN44HT7HGIsf4Lr+qj7FidyGGcU1OPFq1huVcN7Ew6vaYA0Xt+wLhMwyjWZSYT0nfYkBTBhZs6Y1MrFxGymuIEdDOvkN/vGFNfn32sj8IsMCASWGgDaqvlM7aTvr3/DJt3PddW5nNf9cAlEvj1FJKWcoutei2wyjej5ozTYC6QnWrYRdETygMLo0t1AOXmFYA73isRS1fIJ5GTiNxlh5pdqE0ft+39pK7YdrqpAGVJAwx3ztl/NJrEwYVIJwr3KcCOq7NmYXowt3F8j4oh3xjCl5eiCMkzXHE66uupwNO6CodVQjc1TgK0bSY3ph/eqAK9fzWzJfZi1snL6NoG8OuF/QhDI0YT0vtcd68Xu0QrGyOEAwtI4X1WhQJUdCW23rAKW9Op4dsG3152Vr3Oola6HSYQVXdWzPzGWTJQBGdViBwoKz1K/et4jDS4ncHYhwRIQ+inTVJ2stJUfiJ/xAZUtBmc02DSyrAgBMAxMp31Ok1ZGMiQcrpnrFoK1wMF/+eBk0E73qybE3mYQV7vEGJQYbKLjB+n8690xlo5KhSbe2PRhqa5FLjqi+q06YpnUdEpbm3fHA7Q4gbV1DjySni4MxF23Xn8c9Nk/LlMu46zUFD6uzvwEAAP//PK58aA==" + return "eJy8WM1u2zwQvPspFjk5h+g7fT34UKBNisJo0BZpezZocWUTpkiVpB347QtSli1RIvVjJzrFjDQzXC5nl3yAHR4XsCPZjswADDMcF3D3zf6+mwFQ1KlihWFSLODjDADA/Q9ySfccZwB6K5VZpVJkbLOAjHBtRxVyJBoXsLGwGUNO9cJ9/gCC5HihtI85FvZVJffFaaSDtwlTh1oruUN1Hu7CC2KWz2eHAI9S6H2OCr7aT2EpMqlyYj+ALTkgrBEFKCQUMiVzmJ8+2xJBORObBqTZIqQVnpNyn9Re8OdSnw+jjeFqPlx6FNEp1abF6KyTh1CqUOtOsh0eX6XyhQzjI/SAyjCN9EzRWjMjC5Ym9u/WurWpI7S/LY7DDHGgUlIlqaRtJi+ivTQOCixU0mYriDLMfps01m8s088KBhiNsrjZrTq44vFrkP0R7O8egVGQmcvY4sIu3EAZw34d5R58HzlABHW/StKkJa7ad74DjPaFEFDT3qontqdbHhXWU2oqFKbEIF3Ah+T/Sdvwlm4G/Y4WigDEnA1i7jZgqtBwuWokyN/teNDjeuN0+BxjLH6A6/qr+hQnchtmFNfgxKtZb1TCeRMPr2qDNVzcsi8QMss0mkmF9Zz0JQYwYWTNmtbIxMZtpLiCHA2ZuurpXhuZX5RYLKDEENBG1TdrJ3NnCRw+/3a6u+btrOa/SyzqFTIqKeUMRfdydPthVM8nrdlGID3BusWwi4IHFEaX/hZKwys8a6BdPJailk8wLwOn0Rgrr1SbMHrfb11bqf1wTRXSgAoS5piv/Yo+iZUJg0oQ7hWPE0F948YcY3Tt7gIZX7cjtjElTw+EcbLmeMLVVaOzYQcUtaZqZI4KfMVIekyvrd8dcGV8flfmy6yFjdO3EfTDAfcLmlCJJqznpfxYL36PbihWGQcIhtYJoxoNquRIaKtzHaC0V8ezA7bd/rzsjlvtZC1UOqzgqqbtmblssgTAqA4rUFhwlvoF/BZxeCmRuwMRjojQR5Gu+mStpeRI/IQfqGwpKLPZpoFlVQCAaWAi5XuKtDqVMfFgxVSvGLQVDubLXy+DZqJXPTn2JpOwwj3eoMRgAwU3WP8v556pbFQyNOnWtgdDbS1yzxHVd9Uh07RuRMLSvGseuN0ZpK1r6KnkdHcw5q7t+iO5x+ZpmXIfd72m4Hl19i8AAP//Xtd9qA==" } diff --git a/metricbeat/module/kibana/fields.go b/metricbeat/module/kibana/fields.go index b59d1e5e13c..dece8615f47 100644 --- a/metricbeat/module/kibana/fields.go +++ b/metricbeat/module/kibana/fields.go @@ -32,5 +32,5 @@ func init() { // AssetKibana returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/kibana. func AssetKibana() string { - return "eJzEmM9u40YMxu95CsKXvSR6AB8KFG2BFkWCYtugh6IwaA1tTTMaqkPKsfv0xeiPI8ujWNm1sToEiWR/32/IIanJA7zQYQkvdo0e7wDUqqMlLH5tbizuAAxJHmyllv0SvrsDAGgfQsmmdnQHIAUHXeXsN3a7hA06iXcDOUKhJWyjsJCq9VtZwl8LEbe4h0WhWi3+vgPYWHJGlo32A3gsaUAULz1UUSdwXXV3ElSnOkMtUVQ53k3JTUq2V7fgRgfQGwi1f1BbEpSkweaSDT5+uu7+GrMN+erampMHPeILHV45jJ+9AzqAtV4UfU7w/PzLj0nb+DNpq7TXr/M8k+49rTe0v95an7Ak4E3n/0nAeqXg0SWMeoSCRbPJtV8l5NFiMgQa0EsVKwaNCSRydQ6hsKPwSY4czZ6NlkmgHQWx7K+OkdI9lqTHSgoeb7PWdM3sCMdAF0z/LEgLCqAF9QDr2joDVgCPfu29NJKi1tdPRr8pYjoInRYpo54hZ5/XIZBv2qmnPIqnmRz77QeLpS7XFGK55M6SVxhYQImGQLkJX7t/MnhiJdACFdaBX4WCQI4ehLyBsnZqK0cgNv6KnriWE0VlCPRvTaKDDzfKgCIUO6kC+5zum+2pBR0a+UAPtRCQKK6dlYLMUDZLxq0KnE9V0rjPz4jUb61c391Hz1Ot/A2FdjF7jrlaGXJ4yMrx93swydGRWW0c47gOLhIC/BR9IPpA4wPWQ2mds0I5ezM27fFKKjkcsoJwHJP34jWDp49ZVJ4I3FToBr2RFV22Piidf/edjd9IcyhRlzD15YsLAPgjurcLQOc4RyUTt3G3u2KE0+rHQS5kvhn9z5E7EsD6MB9Z7H+0cra0+s3AH3GfATsDUmFODdFp/J/YUPaP9Iu6n5GIKr6dpUrvwnJm4D432rGNDoI8WXk9UdcKr9WhAD53vTXn2uuHOtUblLHStdZbBOpt3nSLl3aYvFKggTWN5+qoHdyArC10f8Y3kTmp2AutYtqvlb/PnShE0Y8Nmjcy3G1vs8W/31HALR2X3lBeGDCDEYP722A94t6WdTkTa/K97sPHv98bhS4dX3XSu+2xI6qn349ue8KM6mnf7giQtaV2qxNGV8lphDb9Gcct7VwW/7x+Cjr1xmwiBekS/+IG8tjKnW9KmNE4Zh0z4AoV+0PrMjCcfpeH82k5jZR+SZ3F1A/OmCsrOvrvTX9NhRBmj0+4FL+ZvJAYWMPp+X5EYcY4vSXpCdz/AQAA//98JjTx" + return "eJzEmN9u6zYMxu/7FERuzs2pHyAXA4ZtwIahxXC2YhfDEDAWE2uVRU+k02ZPP8h/UseRG3eLcXxRtHbyfT+RImn1Hp7puIZnu0WPdwBq1dEaVj83N1Z3AIYkD7ZSy34N39wBALQPoWRTO7oDkIKDbnL2O7tfww6dxLuBHKHQGvZRWEjV+r2s4Y+ViFt9hlWhWq3+vAPYWXJG1o32PXgsaUAULz1WUSdwXXV3ElTnOkMtUVQ53U3JTUq2V7fgRgfQGwi1v1dbEpSkweaSDT5+vu7+GrMN+eramrMHPeIzHV84jJ+9AzqAtV4UfU7w9PTT90nb+HM52wv13tZ6Q6+3833EkoB3nf8nAeuVgkeXMOoRChbNll1+tJgMgQb0UsWiQWMCidycQygcKHySE0ezbaNlEuhAQSz7m2OkdE9V6bGSgjVpumV2hGOgK6a/F6QFBdCCeoBtbZ0BK4Anv/ZeGklR69sno98UMR2ETouUUc+Qs8/rEMg3HdVTHsXTTI79/oPFUpdbCrFccmfJKwwsoERDoNyEr90/GTyyEmiBCtvAL0JBIEcPQt5AWTu1lSMQG39FT1zLmaIyBPq7JtHBhxtlQBGKzVSBfU6fm+2pBR0b+UD3tRCQKG6dlYLMUDZLxq0KnE9V0rjVz4jUL61c3+BHz1Pd/A2FDjF7jrnaGHJ4zMrx93swydGR2ewc47gOrhIC/BB9IPpA4wPWQ2mds0I5ezM27fFKKjkcs4JwHJP34jWDp49ZVJ4I3FToBr2RFV22PSpdfvedjd9IcyhR1zD15asLAPgturcLQOc4RyUTt3G3u2KE0+qnWS5kvhr9j5E7EsD2OB9Z7D+0cba0+tXAH/A1A3YGpMKcGqLz+D+yoewv6Rf1eUYiqviCliq9K8uZgfvUaMc2OgjyZOX1RF0rvFWHAvjS9daca68f6lRvUMZK11qXCNTbvOkWL+0weaFAA2saz9VRO1iArC10f8E3kTmp2AttYtpvlb8vnShE0Y8NmjcyPOyX2eLfHijgnk5LbyivDJjBiMHXZbAe8NWWdTkTa/K97sMnwF8bhS4d/+uwt/ypK/1+tOwhM6qnfbsjQNaW2lInjK6S0wht+jOOW9q5LP55+xR06o3ZRArSJf6fG8hDK3e5KWFG45h1zIAbVOx3rcvAcPpdHi6n5TRS+iV1FlM/OGOurOjoHzj9NRVCmD0+4Vr8ZvJCYmANp+f7EYUZ43RJ0jO4fwMAAP//HHg2MQ==" } diff --git a/metricbeat/module/kibana/stats/_meta/fields.yml b/metricbeat/module/kibana/stats/_meta/fields.yml index 3c7048dda2c..fd83bd73314 100644 --- a/metricbeat/module/kibana/stats/_meta/fields.yml +++ b/metricbeat/module/kibana/stats/_meta/fields.yml @@ -9,7 +9,7 @@ description: > Kibana instance UUID - name: name - type: text + type: keyword description: > Kibana instance name - name: index diff --git a/metricbeat/module/mongodb/fields.go b/metricbeat/module/mongodb/fields.go index d9fc332c1f5..9394cc66c58 100644 --- a/metricbeat/module/mongodb/fields.go +++ b/metricbeat/module/mongodb/fields.go @@ -32,5 +32,5 @@ func init() { // AssetMongodb returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/mongodb. func AssetMongodb() string { - return "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" + return "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" } diff --git a/metricbeat/module/mongodb/metrics/_meta/fields.yml b/metricbeat/module/mongodb/metrics/_meta/fields.yml index 973153e2b9b..a3b89c0c1ec 100644 --- a/metricbeat/module/mongodb/metrics/_meta/fields.yml +++ b/metricbeat/module/mongodb/metrics/_meta/fields.yml @@ -384,7 +384,7 @@ - name: shutting_down type: boolean - name: network_interface - type: text + type: keyword - name: apply type: group description: > diff --git a/metricbeat/module/php_fpm/fields.go b/metricbeat/module/php_fpm/fields.go index fd226faf68c..42f9698f953 100644 --- a/metricbeat/module/php_fpm/fields.go +++ b/metricbeat/module/php_fpm/fields.go @@ -32,5 +32,5 @@ func init() { // AssetPhpFpm returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/php_fpm. func AssetPhpFpm() string { - return "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" + return "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" } diff --git a/metricbeat/module/php_fpm/process/_meta/fields.yml b/metricbeat/module/php_fpm/process/_meta/fields.yml index 252c75455c3..aa3fe71dca9 100644 --- a/metricbeat/module/php_fpm/process/_meta/fields.yml +++ b/metricbeat/module/php_fpm/process/_meta/fields.yml @@ -56,7 +56,7 @@ description: > The user (PHP_AUTH_USER) (or - if not set) (for the current request) - name: script - type: text + type: keyword description: > The main script called (or - if not set) (for the current request) - name: last_request_cpu