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.

Sign up for GitHub

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

Jump to bottom

[7.x] [Backport] create ActiveMQ Metricbeat module #14788

Merged
merged 6 commits into from
Nov 26, 2019
Merged

[7.x] [Backport] create ActiveMQ Metricbeat module #14788

merged 6 commits into from
Nov 26, 2019

Conversation

mtojek
Copy link
Contributor

@mtojek mtojek commented Nov 26, 2019

This PR cherry-picks all changes related to the ActiveMQ Metricbeat module development:

31e3ed4
4db5135
9a9408b
b9481d3

Master issue: #14510

@mtojek
[Metricbeat] Create ActiveMQ module (elastic#14580)
1343b0e 
* 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 <[email protected]>

* Add CHANGELOG.next entry

* Fix: mage fmt update
@mtojek
Fix: import stomp in the function scope (elastic#14703)
80b20e2
@mtojek
Fix: use metrics_path instead of path in system tests (elastic#14690)
b26ba77
@mtojek
[Metricbeat] Create Kibana dashboards for ActiveMQ module (elastic#14655
f557fb8 
)

* 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
@mtojek mtojek added backport Team:Integrations Label for the Integrations team labels Nov 26, 2019
@mtojek mtojek requested a review from a team as a code owner November 26, 2019 11:21
@mtojek mtojek self-assigned this Nov 26, 2019
@zube zube bot unassigned mtojek Nov 26, 2019
@mtojek mtojek changed the title [7.x] Cherry-pick: create ActiveMQ Metricbeat module [7.x] [Backport] create ActiveMQ Metricbeat module Nov 26, 2019
@mtojek mtojek mentioned this pull request Nov 26, 2019
Merged
@mtojek
Copy link
Contributor Author

mtojek commented Nov 26, 2019 •
edited
Loading

Closing this in favor of #14792

@mtojek mtojek closed this Nov 26, 2019
@mtojek mtojek reopened this Nov 26, 2019
@zube zube bot added [zube]: Inbox and removed [zube]: Done labels Nov 26, 2019
@mtojek
Copy link
Contributor Author

mtojek commented Nov 26, 2019

I went same steps using cherrypick_pr in #14792 , adjusted missing labels. As this PR is approved I will merge this one instead (same commits).

@mtojek mtojek merged commit 14c97b6 into elastic:7.x Nov 26, 2019
@zube zube bot added [zube]: Done and removed [zube]: Inbox labels Nov 26, 2019
@mtojek mtojek mentioned this pull request Nov 26, 2019
Closed
@mtojek mtojek deleted the 7.x branch December 3, 2019 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@exekias exekias exekias approved these changes

Assignees
No one assigned
Labels
backport Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mtojek @exekias @andresrc