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

Cherry-pick #14026 to 7.x: [Metricbeat] Add Overview dashboard to Tomcat module #18938

Merged
merged 2 commits into from
Jun 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- kubernetes.container.cpu.limit.cores and kubernetes.container.cpu.requests.cores are now floats. {issue}11975[11975]
- Update cloudwatch metricset mapping for both metrics and dimensions. {pull}15245[15245]
- Make use of secure port when accessing Kubelet API {pull}16063[16063]
- Add Tomcat overview dashboard {pull}14026[14026]

*Packetbeat*

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions metricbeat/docs/modules/tomcat.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ This module periodically fetches JMX metrics from Apache Tomcat.
=== Compatibility
The module has been tested with Tomcat 7.0.24 and 9.0.24. Other versions are expected to work.

[float]
== Dashboard
An overview dashboard for Kibana is already included:

image::./images/metricbeat-tomcat-overview.png[]

[float]
=== Usage
The Tomcat module requires <<metricbeat-module-jolokia,Jolokia>>to fetch JMX metrics. Refer to the link for instructions about how to use Jolokia.
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 @@ -256,7 +256,7 @@ This file is generated! See scripts/mage/docs_collector.go
|<<metricbeat-metricset-system-socket_summary,socket_summary>>
|<<metricbeat-metricset-system-uptime,uptime>>
|<<metricbeat-metricset-system-users,users>> beta[]
|<<metricbeat-module-tomcat,Tomcat>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
|<<metricbeat-module-tomcat,Tomcat>> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.4+| .4+| |<<metricbeat-metricset-tomcat-cache,cache>> beta[]
|<<metricbeat-metricset-tomcat-memory,memory>> beta[]
|<<metricbeat-metricset-tomcat-requests,requests>> beta[]
Expand Down
6 changes: 6 additions & 0 deletions x-pack/metricbeat/module/tomcat/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ This module periodically fetches JMX metrics from Apache Tomcat.
=== Compatibility
The module has been tested with Tomcat 7.0.24 and 9.0.24. Other versions are expected to work.

[float]
== Dashboard
An overview dashboard for Kibana is already included:

image::./images/metricbeat-tomcat-overview.png[]

[float]
=== Usage
The Tomcat module requires <<metricbeat-module-jolokia,Jolokia>>to fetch JMX metrics. Refer to the link for instructions about how to use Jolokia.
Loading