Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZooKeeper module: Adapt to ZooKeeper 3.6+ mntr response fields' changes. #30068

Merged
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3834c0c
ZooKeeper module: Adapt to ZooKeeper 3.6+ `mntr` response fields' cha…
pfcoperez Jan 27, 2022
2308a1c
`zk_learners` and `zk_followers` need to be optional in other to make…
pfcoperez Jan 27, 2022
3967840
Update ITs
pfcoperez Jan 27, 2022
24ef6e9
Test metric beats ZooKeeper module against officialZooKeeper 3.5, 3.6…
pfcoperez Feb 3, 2022
b46e16c
PR Comments: Remove unnecessary `ZOOKEEPER_VARIANT` values.
pfcoperez Feb 3, 2022
f676add
PR Comments: Add `learners` field description, update followers.
pfcoperez Feb 3, 2022
d0f443a
PR Comments: Update compatibility notes
pfcoperez Feb 4, 2022
94347e2
Add CHANGELOG entry
pfcoperez Feb 4, 2022
2379bb0
Update generated asciidoc
pfcoperez Feb 4, 2022
1868aec
Fix go integration tests by removing string quotes in ZK Docker compo…
pfcoperez Feb 4, 2022
46cb5eb
Include leader schema fields when `zk_learners` is provided instead o…
pfcoperez Feb 4, 2022
25f45fa
PR Comments: Offer a seamless migration path for Dashboards, alerts a…
pfcoperez Feb 8, 2022
93567d4
PR Comments: Removed wrong changelog annotation
pfcoperez Feb 8, 2022
9b40f02
PR Comments: Make code more idiomatic
pfcoperez Feb 9, 2022
d034056
`mntr` unit tests
pfcoperez Feb 9, 2022
93fde37
Lint style changes
pfcoperez Feb 9, 2022
77212ad
PR comments: UT, Test mntr samples against expected values
pfcoperez Feb 10, 2022
45b9b24
PR Suggestions: Make use `t.Run` to group all tests for a given version
pfcoperez Feb 10, 2022
e4c96c7
PR Suggestions: Embed mntr samples as string variable contents by loa…
pfcoperez Feb 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Test metric beats ZooKeeper module against officialZooKeeper 3.5, 3.6…
… and 3.7 images
pfcoperez committed Feb 8, 2022

Unverified

The committer email address is not verified.
commit 24ef6e9baabf15acce639136a6f6c18de307e808
2 changes: 1 addition & 1 deletion metricbeat/module/zookeeper/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ARG ZOOKEEPER_VERSION
FROM jplock/zookeeper:${ZOOKEEPER_VERSION}
FROM zookeeper:${ZOOKEEPER_VERSION}
pfcoperez marked this conversation as resolved.
Show resolved Hide resolved
HEALTHCHECK --interval=1s --retries=90 CMD nc -z localhost 2181
7 changes: 7 additions & 0 deletions metricbeat/module/zookeeper/_meta/supported-versions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
variants:
- ZOOKEEPER_VARIANT: zookeeper
pfcoperez marked this conversation as resolved.
Show resolved Hide resolved
ZOOKEEPER_VERSION: 3.5.5
- ZOOKEEPER_VARIANT: zookeeper
ZOOKEEPER_VERSION: 3.6.3
- ZOOKEEPER_VARIANT: zookeeper
ZOOKEEPER_VERSION: 3.7.0
2 changes: 2 additions & 0 deletions metricbeat/module/zookeeper/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -9,3 +9,5 @@ services:
ZOOKEEPER_VERSION: ${ZOOKEEPER_VERSION:-3.5.5}
ports:
- 2181
environment:
- ZOO_4LW_COMMANDS_WHITELIST="stat, ruok, conf, isro, cons, mntr"
1 change: 1 addition & 0 deletions metricbeat/module/zookeeper/test_zookeeper.py
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
"approximate_data_size", "num_alive_connections"]


@metricbeat.parameterized_with_supported_versions
class ZooKeeperMntrTest(metricbeat.BaseTest):

COMPOSE_SERVICES = ['zookeeper']