diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index e98800ce333..854eb4e1672 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -237,6 +237,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add Prometheus remote write endpoint {pull}16609[16609] - Release STAN module as GA. {pull}16980[16980] - Release ActiveMQ module as GA. {issue}17047[17047] {pull}17049[17049] +- Release Zookeeper/connection module as GA. {issue}14281[14281] {pull}17043[17043] *Packetbeat* diff --git a/metricbeat/docs/modules/zookeeper.asciidoc b/metricbeat/docs/modules/zookeeper.asciidoc index ceb2dc61842..d4beca48b29 100644 --- a/metricbeat/docs/modules/zookeeper.asciidoc +++ b/metricbeat/docs/modules/zookeeper.asciidoc @@ -6,7 +6,7 @@ This file is generated! See scripts/mage/docs_collector.go == ZooKeeper module The ZooKeeper module fetches statistics from the ZooKeeper service. The default -metricset is `mntr` and `server`. +metricsets are `mntr` and `server`. [float] === Compatibility diff --git a/metricbeat/docs/modules/zookeeper/connection.asciidoc b/metricbeat/docs/modules/zookeeper/connection.asciidoc index 2bfcf081a5c..06f31f45f58 100644 --- a/metricbeat/docs/modules/zookeeper/connection.asciidoc +++ b/metricbeat/docs/modules/zookeeper/connection.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-zookeeper-connection]] === ZooKeeper connection metricset -beta[] - include::../../../module/zookeeper/connection/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 0da48bae0bd..42733e18eaf 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -263,7 +263,7 @@ This file is generated! See scripts/mage/docs_collector.go .2+| .2+| |<> beta[] |<> |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.3+| .3+| |<> beta[] +.3+| .3+| |<> |<> |<> |=== diff --git a/metricbeat/module/zookeeper/_meta/docs.asciidoc b/metricbeat/module/zookeeper/_meta/docs.asciidoc index 847229fa0bd..34703014c73 100644 --- a/metricbeat/module/zookeeper/_meta/docs.asciidoc +++ b/metricbeat/module/zookeeper/_meta/docs.asciidoc @@ -1,5 +1,5 @@ The ZooKeeper module fetches statistics from the ZooKeeper service. The default -metricset is `mntr` and `server`. +metricsets are `mntr` and `server`. [float] === Compatibility diff --git a/metricbeat/module/zookeeper/connection/_meta/docs.asciidoc b/metricbeat/module/zookeeper/connection/_meta/docs.asciidoc index 1203c43d04f..9e6ff5025bb 100644 --- a/metricbeat/module/zookeeper/connection/_meta/docs.asciidoc +++ b/metricbeat/module/zookeeper/connection/_meta/docs.asciidoc @@ -1 +1,6 @@ -This is the 'connection' metricset of the module zookeeper. +`connection` Metricset fetches the data returned by the `cons` admin keyword. It exposes the following metrics: + +* `zookeeper.connection.interest_ops`: Interest ops +* `zookeeper.connection.queued`: Queued connections +* `zookeeper.connection.received`: Received connections +* `zookeeper.connection.sent`: Connections sent diff --git a/metricbeat/module/zookeeper/connection/_meta/fields.yml b/metricbeat/module/zookeeper/connection/_meta/fields.yml index 1a1c0e552bb..95cfcd0c48d 100644 --- a/metricbeat/module/zookeeper/connection/_meta/fields.yml +++ b/metricbeat/module/zookeeper/connection/_meta/fields.yml @@ -1,6 +1,6 @@ - name: connection type: group - release: beta + release: ga description: > connections fields: diff --git a/metricbeat/module/zookeeper/connection/connection.go b/metricbeat/module/zookeeper/connection/connection.go index dea21844c7c..06daf9ba2eb 100644 --- a/metricbeat/module/zookeeper/connection/connection.go +++ b/metricbeat/module/zookeeper/connection/connection.go @@ -20,7 +20,6 @@ package connection import ( "github.com/pkg/errors" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" "github.com/elastic/beats/v7/metricbeat/mb" "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/elastic/beats/v7/metricbeat/module/zookeeper" @@ -47,8 +46,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The zookeeper connection metricset is beta.") - config := struct{}{} if err := base.Module().UnpackConfig(&config); err != nil { return nil, err diff --git a/metricbeat/module/zookeeper/fields.go b/metricbeat/module/zookeeper/fields.go index c275c78c479..9ab4ca9a74b 100644 --- a/metricbeat/module/zookeeper/fields.go +++ b/metricbeat/module/zookeeper/fields.go @@ -32,5 +32,5 @@ func init() { // AssetZookeeper returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/zookeeper. func AssetZookeeper() string { - return "eJy0WM2O2zgMvucpiF56afMAOSxQbPdQLNrFFt1LLy4jM7EQWXQlOj/z9AvJln8SeyYz4/EpiCx+Hyn+fPJHONBlAw/MB6KK3ApAtBjawLufzH/H/96tAHLyyulKNNsN/LECAOjWoSRxWnlQbAwpoRy2F5CCYMe1+2hIJLzEVgs7bfeguCzR5n69AvAFO8kU253eb2CHxtMKwJEh9LSBPa4AdppM7jcR9SNYLGnMODxyqcLrjuuq/WeCcnh+dTt/gWIrqK2PZJMXjip2rROdj932IffwDLkN+Sm2llQA75amSIanc3ZLgoP/ZxxoWCTrfvD/NZchH22FHHnJuPKjFxIrw3Z/tfAIgfB8aU3CtcmE+bummvKF0P6NxmY87zEdKdLHxVC/t+aexPVkZSHMP3uosdmEVVpxT2bVIyC/goE7sv+6hJt9V4kYy2E9lc57vDM3C/YSfk3G70CXE7vr83wihH1vSrbXk8hYVY7PukShLEfBzOuHaRrPP8ZPvW0IZoF3A14BbZqTQSGrLms8XgO+mMmRHO4pWQ595kRkgayncmsoBsmDtlBqY7QnxYMON2ZHVUElOTQ+U1wvlvPf6nJLLoSoA4AHyznN0NixMXwit1Qv6/E7y+BDjNoyULVzZCVGappRiedspw1lCYndohH6imdd1iXYnqk2BD2aB4zMc9ixi6T7bKscK/IzsUwJV+J5Ya4p4e7KrI6GtkvR0Pb5NGxdZmj0kbK5lr9Elg1sg/DgpKRAAXRdxpkLRDbTZLki+6ZZ920+2wJ2Ko87M41r8YI213afOfpdk5flQzsAgQTShNUS5SHaW0o0+zmnTO2F3DTvCtWBxK8XFhc95z5+luTE7pAgOz3zOLEF1cc9pALcDCFqTtdfrFr+aFvrEK2Hk1To3CWc+LiIusHWNfNptp7ckVzmBWVB8fGdDYVeMy6MxGmGycUqyrO3G2sNwGC6dULvVJAFhDBsRwEB7cEQ5nNFcSTnx9ebnikajdc+VChFE3KtaD29+25Z124HtDlsa21y8OKaim/cmuZ8QlHFGzXIaJv8oHF7EuAmDwwrNPe2ySh83ohlI6puZP6T/MYl87zbx/tm0wsuHN4d40WluWS8f9Ut47XjfDC8jSYrw5NubTfjJXhxE6YbnTPJ4TqMcz4N7d3eEx716cavdDvAMiRc8E90SSB4INtJyfYEhcGRr9hGR7GNRBqzsxRvleXzKCY9+ZYUb1TnMym2WnNhih09zl88ob6Gzh4IdQzW8CW0zm4mfQAptIcSL0BaCnJBIjW9H9h1Q2MN/4TFk/b0AbSEARGVFhq2NC2mX9fIfrCgGdx4Yu96Slm+srg7ydh8vQKUUeB+hEDRWRHlHh7IcTM/B6fbKjYPJTsaKVDbBg2DNBFOTXb571gT3iR7qc0+0qBeLCYnYIOtOyDbcZ7lc0JsYmEE/TkIljbHf6YPvGlIDBq1tlD76Vx9OOvpaN9RYv9Z/bsmOKKpJ2iIQ+sxjh748jnkEEW0MDa8DmHiXSzHilURJQ1CLJpYqTFlyAtujfbFYGQ39Rle1z54FbtJTkKu1JbiO0JlxQ4NsMsp6qMwvgq0+5k6em2tDlz1KRAtUd06OPNZ6XrlXty/YtDujPynFGSv91bvNDVapCKnOQ8MT4UOR5BqORRry3/1fwAAAP//QtgX7Q==" + return "eJy0WM2O2zgMvucpiF56afMAc1ig2O6hWLSLLbqXXlxGZmJhZNGV6PzM0y8kW/5J7CQz4/EpiCx+Hyn+fPJHeKTTAzwxPxJV5FYAosXQA7z7yfx3/O/dCiAnr5yuRLN9gD9WAADdOpQkTisPio0hJZTD5gRSEGy5dh8NiYSX2Gphp+0OFJcl2tyvVwC+YCeZYrvVuwfYovG0AnBkCD09wA5XAFtNJvcPEfUjWCxpzDg8cqrC647rqv1ngnJ4fnU7f4FiK6itj2STF44qdq0TnY/d9iH38Ay5DfkptpZUAO+WpkiGZ+xsemboNxySbT/4/5zJkI22Qo68ZFz50QuJk2G7O1u4QiA8X1qTcG4yYf6uqaZ8IbR/o7EZz3tMR4r0fjHU7625m7ierCyE+WcPNTabsEor7mZOXQH5FQzckfvnBdzsO0vEWAzrm8l8LTcL9hJ+TcbvkU4HdufneSOEfWdKtteTyFhVjo+6RKEsR8HM66dpGs8/xk+9bQhmgbcDXgFtmpNBIatOa9yfA76YyZ4c7ihZhg3JgcgCWU/lxlAMkgdtodTGaE+KB/1tzI6qgkpyaHymuF4s57/V5YZcCFEHAE+Wc5qhsWVj+EBuqV7W43eWwYcYtWWgaufISozUNKMSj9lWG8oSErtFI/QVj7qsS7A9U20IejQPGJnnsGUXSffZVjlW5GdimRKuxOPCXFPC3ZVZHQ1tl6Kh7fNp2LrM0Og9ZXMtf4ksG9gG4cFJSYEC6LqMMyeIbKbJckX2TbPu23y2BexUHndmGtfiBW2u7S5z9LsmL8uHdgACCaQJqyXKQ7Q3lGj2c06Z2gu5ad4VqkcSv15YXPSc+/hZkgO7xwTZ6ZnrxBZUH/eQCnAzhKg5XX+yavmjba1DtB5OUqFzp3Di4yLqBlvXzKfZenJ7cpkXlAXFx3c2FHrNuDASpxkmJ6soz95urDUAg+nWCb1DQRYQwrAdBQS0B0OYzxXFnpwfX256pmg0nvtQoRRNyLWi9fTuu2Vdux3Q5rCptcnBi2sqvnFrmvMBRRVv1CCjbfKDxu1JgJs8MKzQ3Nsmo/B5I5aNqLqQ+Tf5jUvmebeP982mF1w4vNvHi0pzyXj/qlvGa8f5YHgbTVaGJ93absZL8OIiTBc6Z5LDeRjnfBrau7wnXPXpwq90O8AyJFzwT3RJIPhItpOS7QkKgyNfsY2OYhuJNGZnKV4qy+dRTHryLSleqM5nUmy15sIUO3qcv3hCfQ2dPRDqGKzhS2id3Uz6AFJoDyWegLQU5IJEano/sOuGxhr+CYsH7ekDaAkDIiotNGxpWky/rpH9YEEzuPHE3nVLWb6yuDvJ2Hy9ApRR4H6EQNFREeUenshxMz8Hp9sqNg8lOxopUNsGDYM0EU5NdvnvWBPeJHupzV5pUC8WkxOwwdYdkO04z/I5ITaxMIL+HARLm+M/0+fdNCQGjVpbqP10rj4d9XS07yix/6z+XRPs0dQTNMSh9RhHD3z5HHKIIloYG16HMPE2lmPFqoiSBiEWTazUmDLkBTdG+2Iwspv6DK9rH7yK3SQnIVdqS/EdobJihwbY5RT1URhfBdrdTB29tlYHrvoUiJaobh2c+ax0vnIv7l8xaHdG/lMKstc7q7eaGi1SkdOcB4aHQocjSLUcirXlv/o/AAD//7suFxk=" } diff --git a/metricbeat/module/zookeeper/mntr/_meta/docs.asciidoc b/metricbeat/module/zookeeper/mntr/_meta/docs.asciidoc index f041ec8b8cf..7821c750379 100644 --- a/metricbeat/module/zookeeper/mntr/_meta/docs.asciidoc +++ b/metricbeat/module/zookeeper/mntr/_meta/docs.asciidoc @@ -1 +1,21 @@ -The ZooKeeper `mntr` metricset collects ZooKeeper monitoring statistics. +`mntr` Metricset fetches the data returned by the `mntr` admin keyword. It exposes the following metrics: + +* `zookeeper.mntr.hostname`: ZooKeeper hostname. +* `zookeeper.mntr.approximate_data_size`: Approximate size of ZooKeeper data. +* `zookeeper.mntr.latency.avg`: Average latency between ensemble hosts in milliseconds. +* `zookeeper.mntr.ephemerals_count`: Number of ephemeral znodes. +* `zookeeper.mntr.followers`: Number of followers seen by the current host. +* `zookeeper.mntr.max_file_descriptor_count`: Maximum number of file descriptors allowed for the ZooKeeper process. +* `zookeeper.mntr.latency.max`: Maximum latency in milliseconds. +* `zookeeper.mntr.latency.min`: Minimum latency in milliseconds. +* `zookeeper.mntr.num_alive_connections`: Number of connections to ZooKeeper that are currently alive. +* `zookeeper.mntr.open_file_descriptor_count`: Number of file descriptors open by the ZooKeeper process. +* `zookeeper.mntr.outstanding_requests`: Number of outstanding requests that need to be processed by the cluster. +* `zookeeper.mntr.packets.received`: Number of ZooKeeper network packets received. +* `zookeeper.mntr.packets.sent`: Number of ZooKeeper network packets sent. +* `zookeeper.mntr.pending_syncs`: Number of pending syncs to carry out to ZooKeeper ensemble followers. +* `zookeeper.mntr.server_state`: Role in the ZooKeeper ensemble. +* `zookeeper.mntr.synced_followers`: Number of synced followers reported when a node server_state is leader. +* `zookeeper.mntr.version`: Version and build string reported. +* `zookeeper.mntr.watch_count`: Number of watches currently set on the local ZooKeeper process. +* `zookeeper.mntr.znode_count`: Number of znodes reported by the local ZooKeeper process. diff --git a/metricbeat/module/zookeeper/server/_meta/docs.asciidoc b/metricbeat/module/zookeeper/server/_meta/docs.asciidoc index fd30fbeebe2..0bb2ea5cd84 100644 --- a/metricbeat/module/zookeeper/server/_meta/docs.asciidoc +++ b/metricbeat/module/zookeeper/server/_meta/docs.asciidoc @@ -1,15 +1,15 @@ `server` Metricset fetches the data returned by the `srvr` admin keyword. -* *connections*: Connections established by the server -* *latency.avg*: Average latency of the server -* *latency.max*: Max latency reached by the server -* *latency.min*: Minimum latency that has been reached by the server -* *mode*: Server mode -* *node_count*: Total number of nodes -* *outstanding*: Outstanding -* *received*: Received requests to the server -* *sent*: Requests sent by the server -* *version_date*: Date of the Zookeeper release in use -* *zxid*: Original value of the Zookeeper transaction ID -* *count*: Total transactions of the leader in epoch -* *epoch*: Epoch value of the Zookeeper transaction ID +* `zookeeper.server.connections`: Connections established by the server +* `zookeeper.server.latency.avg`: Average latency of the server +* `zookeeper.server.latency.max`: Max latency reached by the server +* `zookeeper.server.latency.min`: Minimum latency that has been reached by the server +* `zookeeper.server.mode`: Server mode +* `zookeeper.server.node_count`: Total number of nodes +* `zookeeper.server.outstanding`: Outstanding +* `zookeeper.server.received`: Received requests to the server +* `zookeeper.server.sent`: Requests sent by the server +* `zookeeper.server.version_date`: Date of the Zookeeper release in use +* `zookeeper.server.zxid`: Original value of the Zookeeper transaction ID +* `zookeeper.server.count`: Total transactions of the leader in epoch +* `zookeeper.server.epoch`: Epoch value of the Zookeeper transaction ID