From dd16e57f2e4bfe576e639a48c8eb8126025e73d0 Mon Sep 17 00:00:00 2001 From: Kristoffer Johansson <51340510+krijohs@users.noreply.github.com> Date: Thu, 1 Apr 2021 16:10:19 +0200 Subject: [PATCH] Fix types of fields GetHits and Ops in Metricbeat module for Couchbase (#23287) They were defined as long, but they can be floats. (cherry picked from commit 38dac25e4e6c4857e9269c2a6df2a14cce85c4fe) --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/fields.asciidoc | 4 ++-- metricbeat/module/couchbase/fields.go | 2 +- metricbeat/module/couchbase/node/_meta/data.json | 4 ++-- metricbeat/module/couchbase/node/_meta/fields.yml | 4 ++-- metricbeat/module/couchbase/node/_meta/testdata/docs.json | 4 ++-- .../couchbase/node/_meta/testdata/docs.json-expected.json | 4 ++-- metricbeat/module/couchbase/node/data.go | 4 ++-- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index a58de4c796f6..0af9a257c643 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -295,6 +295,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Remove io.time from windows {pull}22237[22237] - Fix `logstash` module when `xpack.enabled: true` is set from emitting redundant events. {pull}22808[22808] - Change vsphere.datastore.capacity.used.pct value to betweeen 0 and 1. {pull}23148[23148] +- Fix incorrect types of fields GetHits and Ops in NodeInterestingStats for Couchbase module in Metricbeat {issue}21021[21021] {pull}23287[23287] - Update config in `windows.yml` file. {issue}23027[23027]{pull}23327[23327] - Add stack monitoring section to elasticsearch module documentation {pull}#23286[23286] - Fix metric grouping for windows/perfmon module {issue}23489[23489] {pull}23505[23505] diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index c34e57ea31be..b82db6579be6 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -8171,7 +8171,7 @@ type: long Number of get hits. -type: long +type: double -- @@ -8243,7 +8243,7 @@ type: long Number of operations performed on Couchbase. -type: long +type: double -- diff --git a/metricbeat/module/couchbase/fields.go b/metricbeat/module/couchbase/fields.go index e283a53e038b..85d8cb7ae024 100644 --- a/metricbeat/module/couchbase/fields.go +++ b/metricbeat/module/couchbase/fields.go @@ -32,5 +32,5 @@ func init() { // AssetCouchbase returns asset data. // This is the base64 encoded gzipped contents of module/couchbase. func AssetCouchbase() string { - return "eJzMmVFv4zYMgN/zK4gAA3rAznvPw4DihuH2kOFw656GwUdLTKzVtjxJTpr79QMlO3FcO3FSN5kf+hC75EeRIinqIzzTbgFCVyJN0NIMwCmX0QLmn5rf5jMASVYYVTqliwX8PAMAWJIzSlgQOstIOJKwMjqH/b+BJbMhY6MZgE21cbHQxUqtF7DCzGsylBFaWsAa+RtyThVru4C/5tZm8x9hnjpXzv+eAawUZdIuvN6PUGBOx8z8uF3JooyuyvqXHmh+vu3/8xsIXThUhQWXEuS1RS5FB1syBFYYLF9ZFtWi2lRtsqQSz+T2P/ehncDj57CIQVaDFrW+Ol695ukytbn479GLhuyZdlttZOfdCT5+fsecQK/8ygXKqFcrq5hO69OuHKVVosOosiSjZOfIduSstMnRLaDvXYDLdLG+jOwP9d2TVZaMVw9b5VJV1Ji2obYlCbVSJME6dBSiDQ2BIaskFQ5UAV8flwN2KfscrciJdABc6irJugt+zpVVnpBhQBYPtfgTADdd2MdcV4Xb07FuePAKPvQj5pRrs7sXZNAeMJNdK1BPQ/9baYeRwfwOyF8fl1fyVpaiUrgB2pKMoKL7NvBagRnJeJVp7H5whvtLkIprOmJ/WGkDKJzaEOjkHxLOfgBcc3Z33qpQfirDdgYDLW/Zhx8GLNSljUsysSXxDjtNl2SQP7O8TGBJ6EL2gyhHeSzYWRN5/kDBoi2gtVoo5BrOOas3ue7LblZZR2aa6lYLm6a8pVJGK0N0sw30qyGCFI0EaTjqbImCOHv7aKtNO7mJGDlsJKcdZjcj/3yA9urBq2dVl7HflvrJQ75acNygyjDJCJy+DN9XiA1m1e1i5nOXvp13LwNPdrHvcv4X6L7huST0c3yJQ46ZNLUt8aXJ7l5sc6w4VcRUIeklrruGPJks2S9DJxB2WM2x32O/sVJ/RlKC4GHJa3Wy1N6Yb+/EU2TcrrTz1233Epf+q9NXF50rfaHlPeiPUkBlDJ8BGOWi/XSw5w5ZbcCWK7hv7wbMr3PDoDX3KIrsgKM6OHrt7xQtV8XJXcpel3ZUpduPXLSkaVplH4mT9Mkil/Ga+gvu2840a1918xwLaftVszmR1MJGfJaP+QB2rznCcQ/jFxqY7HQYti1Ah7e14BcOPVvPmVrE3fMbhmgZYYgt0SnMztjy1pFYOI6HncNFutYKG0XbUeu9xzwZNO8SGBez+g/vQRoC4lLOmzp+PGJZxZVTmfruZySxQdc3aHrrKOkpJfj05U9oqQJWNTwUqhuD2A9OQt2cfCjTNB9BxwgM33FM2k8UIyZEvk3rpaMyTtZxGCN35/tvX572jBpKMpxpSYJVhaAwYfcXT7BFC9ahcTQwV1uTi1Plpgr64zrIggcO8Nq6aa9iOIwbqc01w7B3ciGbwy5mmRbs1fvMyQVygDQT8z3MmcHBAd+Qd3U//TsQNvpGXT8MjiInu2JgDftD7/mKX3MNH0/eljIaL3ancaPBBu9rrp4Fvb6JOQ+jy+nzwfGsv85Xunh9o3yMYrdYvpu7WHjoJUfuO08zuY8OQR2ADh3NSZiqdCqnaOhq5opFUTmBrIwq1rBNlTiUOF9HVHFwIjxYEgNcmyQ2VGZKYMwlOtTnyePJS/1JalHlVDjbvkL2um00+y8AAP//ab0SFw==" + return "eJzMmUGv2zYMgO/5FUSAAa/A6t1zGFB0GLpDhqLrTsPg0hITa8+2PElOXvrrB0p24vjZiZPnJPPhHWI/8qNIkRT1Hp5ptwChK5EmaGkG4JTLaAHzj81v8xmAJCuMKp3SxQJ+ngEALMkZJSwInWUkHElYGZ3D/t/AktmQsdEMwKbauFjoYqXWC1hh5jUZyggtLWCN/A05p4q1XcBfc2uz+Y8wT50r53/PAFaKMmkXXu97KDCnY2Z+3K5kUUZXZf1LDzQ/3/b/+Q2ELhyqwoJLCfLaIpeigy0ZAisMlq8si2pRbao2WVKJZ3L7n/vQTuDxc1jEIKtBi1pfHa9e83SZ2lz89+hFQ/ZMu602svPuBB8/v2NOoFd+5QJl1KuVVUyn9euuHKVVosOosiSjZOfIduSstMnRLaDvXYDLdLG+jOwP9d2TVZaMVw9b5VJV1Ji2obYlCbVSJME6dBSiDQ2BIaskFQ5UAV8+LAfsUvY5WpET6QC41FWSdRf8nCurPCHDgCweavEnAO66sB9yXRVuT8e64ckreNePmFOuze5RkEF7wEx2rUA9Df1vpR1GBvMHIH/5sLySt7IUlcIN0JZkBBXdt4HXCsxIxqtMY/eDM9yfg1Rc0xH700obQOHUhkAn/5Bw9h3gmrO781aF8lMZtjMYaHnLPv0wYKEubVySiS2JG+w0XZJB/szyMoEloQvZD6Ic5bFgZ03k+QMFi7aA1mqhkGs456ze5Lovu1llHZlpqlstbJrylkoZrQzR3TbQr4YIUjQSpOGosyUK4uzto6027eQmYuSwkZx2mN2N/NMB2qsHr55VXcZ+X+qvHvLVguMGVYZJRuD0Zfi+Qmwwq+4XM5+69O28exl4sot9l/O/QPcNzyWhn+NLHHLMpKltiS9Ndvdim2PFqSKmCkkvcd015MlkyX4ZOoGww2qO/R77jZX6M5ISBE9LXquTpfbOfHsnniLjdqWdv+67l7j0X52+uuhc6QstH0F/lAIqY/gMwCgX7aeDPQ/IagO2XMF9fzdgfp0bBq15RFFkBxzVwdFr/6BouSpOHlL2urSjKt1+5KIlTdMq+0icpE8WuYzX1F9w33amWfuqm+dYSNuvms2JpBY24rN8zAewR80RjnsYv9DAZKfDsG0BOryvBb9w6Nl6ztQi7p7fMETLCENsiU5hdsaWt47EwnE87Bwu0rVW2CjajlrvPebJoLlJYFzM6j98BGkIiEs57+r48YhlFVdOZeq7n5HEBl3foOmto6SvKcHHz39CSxWwquGhUN0YxH5wEurm5EOZpvkIOkZg+I5j0n6iGDEh8m1aLx2VcbKOwxi5O99/+/K0Z9RQkuFMSxKsKgSFCbu/eIItWrAOjaOBudqaXJwqd4s5OldCFj1whNfWTXsZw4HcSG0uGob9kwvZHHcxy7Rgvz5mUi6QQ6SZme9hzowODviGvLP76W9A2OgbdQExOIyc7JKBNeyPvedrfs01fEB5W9JovNidx40GG7yxuXoa9Pou5jyMLm+REY7n/XXO0sXrW+VjGLvF8mYOY+Ghnxy58zzN5F46hHUAOnQ1J2Gq0qmcoqHrmSsWReUEsjKqWMM2VeJQ5nwtUcXBifBkSQxwbZLYUJkpgTGX6VCjJ6+CXupPUosqp8LZ9jWy122j2X8BAAD//ytkE60=" } diff --git a/metricbeat/module/couchbase/node/_meta/data.json b/metricbeat/module/couchbase/node/_meta/data.json index 7b3c48537a41..bd533a03867a 100644 --- a/metricbeat/module/couchbase/node/_meta/data.json +++ b/metricbeat/module/couchbase/node/_meta/data.json @@ -37,7 +37,7 @@ "value": 7303 }, "ep_bg_fetched": 0, - "get_hits": 0, + "get_hits": 1.1, "hostname": "172.17.0.2:8091", "mcd_memory": { "allocated": { @@ -58,7 +58,7 @@ "bytes": 53962016 } }, - "ops": 0, + "ops": 1.1, "swap": { "total": { "bytes": 4189057024 diff --git a/metricbeat/module/couchbase/node/_meta/fields.yml b/metricbeat/module/couchbase/node/_meta/fields.yml index 95f6613e4cc6..bb36fc9c68f6 100644 --- a/metricbeat/module/couchbase/node/_meta/fields.yml +++ b/metricbeat/module/couchbase/node/_meta/fields.yml @@ -51,7 +51,7 @@ description: > Number of disk fetches performed since the server was started. - name: get_hits - type: long + type: double description: > Number of get hits. - name: hostname @@ -80,7 +80,7 @@ description: > Memory used by the node (bytes). - name: ops - type: long + type: double description: > Number of operations performed on Couchbase. - name: swap.total.bytes diff --git a/metricbeat/module/couchbase/node/_meta/testdata/docs.json b/metricbeat/module/couchbase/node/_meta/testdata/docs.json index 73519a9b2014..4ba618e5545f 100644 --- a/metricbeat/module/couchbase/node/_meta/testdata/docs.json +++ b/metricbeat/module/couchbase/node/_meta/testdata/docs.json @@ -43,9 +43,9 @@ "curr_items": 7303, "curr_items_tot": 7303, "ep_bg_fetched": 0, - "get_hits": 0, + "get_hits": 1.1, "mem_used": 53962016, - "ops": 0, + "ops": 1.1, "vb_replica_curr_items": 0 }, "uptime": "7260", diff --git a/metricbeat/module/couchbase/node/_meta/testdata/docs.json-expected.json b/metricbeat/module/couchbase/node/_meta/testdata/docs.json-expected.json index de61c7650314..16f5024c0a40 100644 --- a/metricbeat/module/couchbase/node/_meta/testdata/docs.json-expected.json +++ b/metricbeat/module/couchbase/node/_meta/testdata/docs.json-expected.json @@ -37,7 +37,7 @@ "value": 7303 }, "ep_bg_fetched": 0, - "get_hits": 0, + "get_hits": 1.1, "hostname": "172.17.0.2:8091", "mcd_memory": { "allocated": { @@ -58,7 +58,7 @@ "bytes": 53962016 } }, - "ops": 0, + "ops": 1.1, "swap": { "total": { "bytes": 4189057024 diff --git a/metricbeat/module/couchbase/node/data.go b/metricbeat/module/couchbase/node/data.go index e1f797ed1bb8..901729737f96 100644 --- a/metricbeat/module/couchbase/node/data.go +++ b/metricbeat/module/couchbase/node/data.go @@ -45,9 +45,9 @@ type NodeInterestingStats struct { CurrItems int64 `json:"curr_items"` CurrItemsTot int64 `json:"curr_items_tot"` EpBgFetched int64 `json:"ep_bg_fetched"` - GetHits int64 `json:"get_hits"` + GetHits float64 `json:"get_hits"` MemUsed int64 `json:"mem_used"` - Ops int64 `json:"ops"` + Ops float64 `json:"ops"` VbReplicaCurrItems int64 `json:"vb_replica_curr_items"` }