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

[Metricbeat] Create ActiveMQ module #14580

Merged
merged 26 commits into from
Nov 20, 2019
Merged

Conversation

mtojek
Copy link
Contributor

@mtojek mtojek commented Nov 18, 2019

Marking as WIP to let you review changes before I dive into testing and dashboards.

Issue: #14510

This PR introduces new Metricbeat module supporting ActiveMQ. The module collects metrics based on Jolokia REST endpoint.

As this is a lightweight module, I believe I can omit integration tests.

still TODO in this PR:

  • system test to verify if metrics are collected based on interaction with ActiveMQ
  • system test to verify supported versions

@mtojek mtojek requested a review from a team as a code owner November 18, 2019 07:36
@exekias exekias added enhancement module needs_backport PR is waiting to be backported to other branches. review Team:Integrations Label for the Integrations team labels Nov 18, 2019
Copy link
Contributor

@exekias exekias left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking great @mtojek! I left a few minor comments.

x-pack/metricbeat/docker-compose.yml Show resolved Hide resolved
x-pack/metricbeat/metricbeat.reference.yml Show resolved Hide resolved
x-pack/metricbeat/tests/system/test_activemq.py Outdated Show resolved Hide resolved
@exekias
Copy link
Contributor

exekias commented Nov 19, 2019

ey Marcin, is this one still in WIP? I think you can drop that from the title already 😸 Also, we have the in_progress label to flag that if you prefer

@mtojek mtojek changed the title WIP: [Metricbeat] Create ActiveMQ module [Metricbeat] Create ActiveMQ module Nov 19, 2019
@mtojek
Copy link
Contributor Author

mtojek commented Nov 19, 2019

You're right @exekias ! Totally forgot about it.

@mtojek mtojek force-pushed the 14510-activemq-module branch from 70adc53 to a368129 Compare November 19, 2019 19:28
@mtojek
Copy link
Contributor Author

mtojek commented Nov 19, 2019

Just rebased against latest master

Copy link
Contributor

@kaiyan-sheng kaiyan-sheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Are you planning to add a changelog entry for this?

@mtojek
Copy link
Contributor Author

mtojek commented Nov 20, 2019

@kaiyan-sheng

Thanks! Changelog.next has been updated.

@mtojek
Copy link
Contributor Author

mtojek commented Nov 20, 2019

As the PR got approved and Travis build passed, I will merge it to master.

@mtojek mtojek merged commit b9481d3 into elastic:master Nov 20, 2019
@mtojek mtojek self-assigned this Nov 20, 2019
mtojek added a commit to mtojek/beats that referenced this pull request Nov 26, 2019
* Generate bootstrap for broker, queue, topic

* Update generated files

* Define metricsets in disabler

* Prepare docker image for ActiveMQ

* Define jolokia endpoint in disabler

* Convert to lightweight module

* Remove downloaded installation bundle

* Fill sample data.json

* Refactor metricset fields

* Update docs

* Fix: do not expose ActiveMQ port

* Fix: mage fmt update

* Dockerfile: define healthcheck

* Move module contents to x-pack

* Fix: move docker-compose definition to x-pack

* Add basic system test

* Fix: update docs

* System tests: topic metrics collected

* Fix: mage fmt update

* System tests: queue, topic metrics collected

* Update docs

* Fix: use compose_host

* Assert that fields are documented

* Fix: typo in metricbeat/docs/modules/activemq.asciidoc

Co-Authored-By: kaiyan-sheng <kaiyan.sheng@elastic.co>

* Add CHANGELOG.next entry

* Fix: mage fmt update
@mtojek mtojek removed the needs_backport PR is waiting to be backported to other branches. label Nov 26, 2019
mtojek added a commit that referenced this pull request Nov 26, 2019
* [Metricbeat] Create ActiveMQ module (#14580)

* Generate bootstrap for broker, queue, topic

* Update generated files

* Define metricsets in disabler

* Prepare docker image for ActiveMQ

* Define jolokia endpoint in disabler

* Convert to lightweight module

* Remove downloaded installation bundle

* Fill sample data.json

* Refactor metricset fields

* Update docs

* Fix: do not expose ActiveMQ port

* Fix: mage fmt update

* Dockerfile: define healthcheck

* Move module contents to x-pack

* Fix: move docker-compose definition to x-pack

* Add basic system test

* Fix: update docs

* System tests: topic metrics collected

* Fix: mage fmt update

* System tests: queue, topic metrics collected

* Update docs

* Fix: use compose_host

* Assert that fields are documented

* Fix: typo in metricbeat/docs/modules/activemq.asciidoc

Co-Authored-By: kaiyan-sheng <kaiyan.sheng@elastic.co>

* Add CHANGELOG.next entry

* Fix: mage fmt update

* Fix: import stomp in the function scope (#14703)

* Fix: use metrics_path instead of path in system tests (#14690)

* [Metricbeat] Create Kibana dashboards for ActiveMQ module (#14655)

* Kibana dashboard: ActiveMQ broker overview

* Fix: mage fmt update

* Fix: invalid dashboard JSON

* Kibana dashboard: ActiveMQ queues and topics overview

* Add dashboard screenshots

* Enable time units, pct in dashboards

* Adjust PR reference in CHANGELOG.next

* Fix: mage fmt update
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants