Skip to content

Commit

Permalink
[Metricbeat] Move Zookeeper/connection to GA (elastic#17043)
Browse files Browse the repository at this point in the history
(cherry picked from commit 2b8279b)

# Conflicts:
#	metricbeat/module/zookeeper/connection/connection.go
  • Loading branch information
sayden committed Mar 17, 2020
1 parent c3c9f34 commit cc70c7a
Show file tree
Hide file tree
Showing 11 changed files with 90 additions and 25 deletions.
45 changes: 45 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,51 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Metricbeat*

- Move the windows pdh implementation from perfmon to a shared location in order for future modules/metricsets to make use of. {pull}15503[15503]
- Add lambda metricset in aws module. {pull}15260[15260]
- Expand data for the `system/memory` metricset {pull}15492[15492]
- Add azure `storage` metricset in order to retrieve metric values for storage accounts. {issue}14548[14548] {pull}15342[15342]
- Add cost warnings for the azure module. {pull}15356[15356]
- Add DynamoDB AWS Metricbeat light module {pull}15097[15097]
- Release elb module as GA. {pull}15485[15485]
- Add a `system/network_summary` metricset {pull}15196[15196]
- Add mesh metricset for Istio Metricbeat module {pull}15535[15535]
- Add mixer metricset for Istio Metricbeat module {pull}15696[15696]
- Add pilot metricset for Istio Metricbeat module {pull}15761[15761]
- Make the `system/cpu` metricset collect normalized CPU metrics by default. {issue}15618[15618] {pull}15729[15729]
- Add galley metricset for Istio Metricbeat module {pull}15857[15857]
- Add `key/value` mode for SQL module. {issue}15770[15770] {pull]15845[15845]
- Add STAN dashboard {pull}15654[15654]
- Add support for Unix socket in Memcached metricbeat module. {issue}13685[13685] {pull}15822[15822]
- Add `up` metric to prometheus metrics collected from host {pull}15948[15948]
- Add citadel metricset for Istio Metricbeat module {pull}15990[15990]
- Add support for processors in light modules. {issue}14740[14740] {pull}15923[15923]
- Add collecting AuroraDB metrics in rds metricset. {issue}14142[14142] {pull}16004[16004]
- Reuse connections in SQL module. {pull}16001[16001]
- Improve the `logstash` module (when `xpack.enabled` is set to `true`) to use the override `cluster_uuid` returned by Logstash APIs. {issue}15772[15772] {pull}15795[15795]
- Add region parameter in googlecloud module. {issue}15780[15780] {pull}16203[16203]
- Add kubernetes storage class support via kube-state-metrics. {pull}16145[16145]
- Add database_account azure metricset. {issue}15758[15758]
- Add support for NATS 2.1. {pull}16317[16317]
- Add Load Balancing metricset to GCP {pull}15559[15559]
- Add support for Dropwizard metrics 4.1. {pull}16332[16332]
- Add azure container metricset in order to monitor containers. {issue}15751[15751] {pull}16421[16421]
- Improve the `haproxy` module to support metrics exposed via HTTPS. {issue}14579[14579] {pull}16333[16333]
- Add filtering option for prometheus collector. {pull}16420[16420]
- Add metricsets based on Ceph Manager Daemon to the `ceph` module. {issue}7723[7723] {pull}16254[16254]
- Release `statsd` module as GA. {pull}16447[16447] {issue}14280[14280]
- Add collecting tags and tags_filter for rds metricset in aws module. {pull}16605[16605] {issue}16358[16358]
- Add OpenMetrics Metricbeat module {pull}16596[16596]
- Add `cloudfoundry` module to send events from Cloud Foundry. {pull}16671[16671]
- Add `redisenterprise` module. {pull}16482[16482] {issue}15269[15269]
- Add system/users metricset as beta {pull}16569[16569]
- Align fields to ECS and add more tests for the azure module. {issue}16024[16024] {pull}16754[16754]
- Add additional cgroup fields to docker/diskio{pull}16638[16638]
- Add PubSub metricset to Google Cloud Platform module {pull}15536[15536]
- 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*

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/zookeeper.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/zookeeper/connection.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]


Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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>>
|===
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/zookeeper/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 6 additions & 1 deletion metricbeat/module/zookeeper/connection/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion metricbeat/module/zookeeper/connection/_meta/fields.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- name: connection
type: group
release: beta
release: ga
description: >
connections
fields:
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/zookeeper/connection/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/zookeeper/fields.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 21 additions & 1 deletion metricbeat/module/zookeeper/mntr/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -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.
26 changes: 13 additions & 13 deletions metricbeat/module/zookeeper/server/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit cc70c7a

Please sign in to comment.