elastic · sayden · Mar 20, 2020 · Mar 17, 2020 · Mar 18, 2020
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -99,6 +99,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Metricbeat*
 
+- 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
@@ -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
@@ -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
@@ -224,7 +224,7 @@ This file is generated! See scripts/mage/docs_collector.go
 .2+| .2+|  |<<metricbeat-metricset-windows-perfmon,perfmon>> beta[]  
 |<<metricbeat-metricset-windows-service,service>>   
 |<<metricbeat-module-zookeeper,ZooKeeper>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.3+| .3+|  |<<metricbeat-metricset-zookeeper-connection,connection>> beta[]  
+.3+| .3+|  |<<metricbeat-metricset-zookeeper-connection,connection>>   
 |<<metricbeat-metricset-zookeeper-mntr,mntr>>   
 |<<metricbeat-metricset-zookeeper-server,server>>   
 |===

diff --git 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
@@ -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
@@ -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
@@ -20,7 +20,6 @@ package connection
 import (
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/metricbeat/mb"
 	"github.com/elastic/beats/metricbeat/mb/parse"
 	"github.com/elastic/beats/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
diff --git 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
@@ -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