From 0665527662b9e19e64f3834888d237faa6a9823a Mon Sep 17 00:00:00 2001 From: Mario Castro Date: Thu, 20 Aug 2020 14:36:52 +0200 Subject: [PATCH] [Metricbeat] Fix nesting of headings in Elasticsearch fields description (#20676) --- metricbeat/docs/fields.asciidoc | 82 +++---------------- metricbeat/module/elasticsearch/fields.go | 2 +- .../elasticsearch/node_stats/_meta/fields.yml | 51 +++--------- 3 files changed, 27 insertions(+), 108 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index eda84195962..8bcf3ca3448 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -16565,16 +16565,10 @@ type: boolean [float] === node.stats -node_stats +Statistics about each node in a Elasticsearch cluster -[float] -=== indices - -Node indices stats - - *`elasticsearch.node.stats.indices.docs.count`*:: + @@ -16628,18 +16622,6 @@ type: long -- -[float] -=== jvm.mem.pools - -JVM memory pool stats - - - -[float] -=== old - -Old memory pool stats. - *`elasticsearch.node.stats.jvm.mem.pools.old.max.bytes`*:: @@ -16647,6 +16629,7 @@ Old memory pool stats. -- Max bytes. + type: long format: bytes @@ -16658,6 +16641,7 @@ format: bytes -- Peak bytes. + type: long format: bytes @@ -16669,6 +16653,7 @@ format: bytes -- Peak max bytes. + type: long format: bytes @@ -16680,24 +16665,20 @@ format: bytes -- Used bytes. + type: long format: bytes -- -[float] -=== young - -Young memory pool stats. - - *`elasticsearch.node.stats.jvm.mem.pools.young.max.bytes`*:: + -- Max bytes. + type: long format: bytes @@ -16709,6 +16690,7 @@ format: bytes -- Peak bytes. + type: long format: bytes @@ -16720,6 +16702,7 @@ format: bytes -- Peak max bytes. + type: long format: bytes @@ -16731,24 +16714,20 @@ format: bytes -- Used bytes. + type: long format: bytes -- -[float] -=== survivor - -Survivor memory pool stats. - - *`elasticsearch.node.stats.jvm.mem.pools.survivor.max.bytes`*:: + -- Max bytes. + type: long format: bytes @@ -16760,6 +16739,7 @@ format: bytes -- Peak bytes. + type: long format: bytes @@ -16771,6 +16751,7 @@ format: bytes -- Peak max bytes. + type: long format: bytes @@ -16782,31 +16763,18 @@ format: bytes -- Used bytes. + type: long format: bytes -- -[float] -=== jvm.gc.collectors - -GC collector stats. - - - -[float] -=== old.collection - -Old collection gc. - *`elasticsearch.node.stats.jvm.gc.collectors.old.collection.count`*:: + -- - - type: long -- @@ -16814,24 +16782,14 @@ type: long *`elasticsearch.node.stats.jvm.gc.collectors.old.collection.ms`*:: + -- - - type: long -- -[float] -=== young.collection - -Young collection gc. - - *`elasticsearch.node.stats.jvm.gc.collectors.young.collection.count`*:: + -- - - type: long -- @@ -16839,24 +16797,14 @@ type: long *`elasticsearch.node.stats.jvm.gc.collectors.young.collection.ms`*:: + -- - - type: long -- -[float] -=== fs.summary - -File system summary - - *`elasticsearch.node.stats.fs.summary.total.bytes`*:: + -- - - type: long format: bytes @@ -16866,8 +16814,6 @@ format: bytes *`elasticsearch.node.stats.fs.summary.free.bytes`*:: + -- - - type: long format: bytes @@ -16877,8 +16823,6 @@ format: bytes *`elasticsearch.node.stats.fs.summary.available.bytes`*:: + -- - - type: long format: bytes diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index aadc37a05c3..03c96ad20a5 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "eJzsXM1u47YTv/spBjntAokewIf/Zf/bNgU2WHSzvRSFlpbGFhN+KCTl2H36gqQkyzJlybYcZwv7Fsua+c33DD9yB8+4ngIyog1NNBKVZBMAQw3DKdx8bn5/MwFIUSeK5oZKMYX/TQAAtn4DXKYFwwmAQoZE4xQWZAKg0RgqFnoKf91ozW5u4SYzJr/52z7LpDJxIsWcLqYwJ0zb9+cUWaqnjsUdCMJxF6b9mHVumShZ5OU3AYzb5JokE1Zogyqyf9UPK6rPuH6VKm18H6TtP9t6KOk6LtGkky1Nz8GUpntYakMMjszY0QyzFTI9nduDTBHu/99B/XTbOfreVDtqS9QO7aa39VD+pKTWd5VhFOaMJsT+0OlMN367HTDVp+23TWgMSYpq61EXwi5STXJUpLjaedqtzwHSV58HwhHkvETcwanCwckq1vgSC9kJhkmxOA7JF7KivOCg8aVAkSCIgs9QWXAyR+VNIwWYDCu0OiMtuSukc8mYfP25TFBh7jGCEzryyjmDGR5qrVtFO2bwSk1Gveb3Y6sNpeNXRY1BcVaEG3YeF6bwoQpkTD8CFUY61LVqvTxzJfl+P2oKZSjHWFORYGxTa6yQpBHXZ5DskXK8BSqA61twHLfRW/YwR5NkuCNEJ/wFkzPC4iTD5DmXVJgzAP/V8YAND1gSVqAN123V7619+qR0Xiby05O3pVC0zbsvznsU1ERWaPiwUIjiFtZoFXMLCtOPURCILaFhHKEM1oPCFlLtMFDXHkSDEmBtJlkEHGeP2/Q6zaM0hDVyvBPW+n7lER1IOLFPR4WySSie+B0yuqAzhoNBpcSQM0GypHtwNGoUTcbzmHtP7h37TCnwAAO55LObsrt1MwDNN1dLurXT31SENTRCHWnpyUu/R00bSLminCi640XngOV5rfvh1V2d1acNiIgjl2odzdYmgPQUF/viCEOhbYWVqsFyp3ShULQeduGYmvXZURihZL0UWGCk6T8YDP6AKvqqxcZ3/BypbFeujbOSbTo8xyAYhVwajKs3RmvBk0IpPEu8fPKUmxNHYbQhIqViUcpTa6A7doz17/M2vN2wAFeYFAbTsnG0JcN6ljJFHrZT9ULsTYw6CgkwvgeZjJgyeCBXMkGtpdKQkSUOE6JrJjs4/toEDg+81gIHnNYp3ls8rdUO6HGw4+MplYmO3qoEpTIpOIpNAnG6744lBy5FhgZDY/Xo8Dyng2FqI5VPvB21qAfqXCpOzBS6Xh4sioVQDe0OsxXAUd0DHhdO1jdzAg+sZtsPbG+ZfyvVbvDzRnMwW/sFkhJqQN3hfBUpTOQS1fqyiYu2o+rYPO+74Eoot9Ic4mfJj5coW0wtpTDbssUMcp5JyZC0V6h6OD+qAoG2etcwb23IYkSZ/6ikdXQDbtbkbYhaoIk6rHwU/0dH0pfkTit7tpnU7XQyEmNLGUiaKtQaPiSyYCnMEO6/1l9K5X5k8XQsq5Qgxy3dTZDbBTzsG7JQCY5qn2+O5H77lGzHtU+T8Rj2KUGOa58myPB2ks/OuuCthHGB5Nw1hF97vVHgXXu9a6/Xi/+wXg+uU9o1cq+R+xNGbr2vxKInOTul7nN2jonsqG7nu6AvBQJn8CRn3d2gIWbEFut3OfMkw9xSYkjsfFhH5bIfprGd4VQah3z72In0a0Xc753hcteNQ5ioWBJG0zglBkfF85g1z7J4gbU7UwFITYYKCHCqNRULCwi9l9hGmfi/3YKp76WFNLafzonSmAZmjB23tg3vKU7dev9wt16i0lS2p+wT3MydCCuphq36tOSDy2+fT//5Be7FXA7b+eyTuk/yAYAqUEEFNBGUSTlDkkdUUHOx9Pwbkhwsgq2MbGXor31NIThZXVYGTlbHiyCkuLwpHqS4G8EclSyXtEgtynCrbKZrVx8izmTyTFi4VT9qcfB+XhEHSxtTd5bLKy2YmU8/9vStPn4AZCYLA0iSrFwEEkDCx5BP61MOPGXyrgYcXFll2UJbjRDvd7h5RyPBzzYMVHNWz8QOI86IR82AjmlPunpacqvUKJeSjRd1knX7dPg8VDdN2D4i3qk/6NMhDPABGKZr8CfKu6zehJwjeX43mL8ieR4KOn5PynbA+TCN23r9boB/983D3uSwlkUQyjVeLo35Gi9vDXxIvOhCLelSdt9PuYbM5TBfQ+atgYdCprPXWyRRIhnDxEg1ar9Xkd23LnVKXHYNI9Cv7Tq0j7DWVo3+j8kYdJK5DpxS2C9en3e4LctzzGw1ZoVn2Xur6JMloYzM2KhM2nfUcnQnr2ND9POkTfmANZsfIYI/IJHCECo0ECgfgH3QpNTMeces3GhUJpaq627y4Xsb944k7JJsHGWRipqwqx6ztxMgt31wKMjphDNDEfwiFeCK8JxZgQpzx0me0xb0rduiVMT+gsROsB+9iUS5WyhwZHc8tH2B9WCXLO/FOuc5ycfOduDSZFQD1W7ZZMDhy+D96HF28ByS/ec+x9xWfXTrRMTgEN4KmUyIsUkl9A8YRoDilpYbV8OJrpiWd5Kjyb8BAAD//5BO1pw=" } diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml index 82c0d9feb70..07e5f502d14 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml @@ -1,13 +1,11 @@ - name: node.stats type: group description: > - node_stats + Statistics about each node in a Elasticsearch cluster release: ga fields: - name: indices type: group - description: > - Node indices stats fields: - name: docs.count type: long @@ -32,127 +30,104 @@ Total size of the store in bytes. - name: jvm.mem.pools type: group - description: > - JVM memory pool stats fields: - name: old type: group - description: > - Old memory pool stats. fields: - name: max.bytes type: long format: bytes - description: + description: > Max bytes. - name: peak.bytes type: long format: bytes - description: + description: > Peak bytes. - name: peak_max.bytes type: long format: bytes - description: + description: > Peak max bytes. - name: used.bytes type: long format: bytes - description: + description: > Used bytes. - name: young type: group - description: > - Young memory pool stats. fields: - name: max.bytes type: long format: bytes - description: + description: > Max bytes. - name: peak.bytes type: long format: bytes - description: + description: > Peak bytes. - name: peak_max.bytes type: long format: bytes - description: + description: > Peak max bytes. - name: used.bytes type: long format: bytes - description: + description: > Used bytes. - name: survivor type: group - description: > - Survivor memory pool stats. fields: - name: max.bytes type: long format: bytes - description: + description: > Max bytes. - name: peak.bytes type: long format: bytes - description: + description: > Peak bytes. - name: peak_max.bytes type: long format: bytes - description: + description: > Peak max bytes. - name: used.bytes type: long format: bytes - description: + description: > Used bytes. - name: jvm.gc.collectors type: group - description: > - GC collector stats. fields: - name: old.collection type: group - description: > - Old collection gc. fields: - name: count type: long - description: > - name: ms type: long - description: > - name: young.collection type: group - description: > - Young collection gc. fields: - name: count type: long - description: > - name: ms type: long - description: > - name: fs.summary type: group - description: > - File system summary fields: - name: total.bytes type: long format: bytes - description: > - name: free.bytes type: long format: bytes - description: > - name: available.bytes type: long format: bytes - description: >