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

Cherry-pick #17049 to 7.x: Move ActiveMQ filebeat/metricbeat to GA #17051

Merged
merged 4 commits into from
Mar 18, 2020
Merged

Cherry-pick #17049 to 7.x: Move ActiveMQ filebeat/metricbeat to GA #17051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cad0942
Release ActiveMQ filebeat/metricbeat module as GA
Mar 17, 2020
ec1370a
Fix changelog
Mar 17, 2020
84c27f3
Fix changelog
Mar 17, 2020
8cba1b7
Merge branch '7.x' into backport_17049_7.x
mtojek Mar 18, 2020
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
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add ECS related fields to CEF module {issue}16157[16157] {pull}16338[16338]
- Improve ECS categorization, host field mappings in elasticsearch module. {issue}16160[16160] {pull}16469[16469]
- Improve ECS categorization field mappings in suricata module. {issue}16181[16181] {pull}16843[16843]
- Release ActiveMQ module as GA. {issue}17047[17047] {pull}17049[17049]

*Heartbeat*

Expand Down Expand Up @@ -309,6 +310,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add additional cgroup fields to docker/diskio{pull}16638[16638]
- 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]

*Packetbeat*

Expand Down
2 changes: 1 addition & 1 deletion filebeat/docs/modules/activemq.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This file is generated! See scripts/docs_collector.py

== ActiveMQ module

beta[]
ga[]

This module parses Apache ActiveMQ logs. It supports application and audit logs.

Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/activemq.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ This file is generated! See scripts/mage/docs_collector.go
[role="xpack"]
== activemq module

beta[]

This module periodically fetches JMX metrics from Apache ActiveMQ.

[float]
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/activemq/broker.asciidoc
View file
Open in desktop
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-activemq-broker]]
=== activemq broker metricset

beta[]

include::../../../../x-pack/metricbeat/module/activemq/broker/_meta/docs.asciidoc[]

This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/activemq/queue.asciidoc
View file
Open in desktop
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-activemq-queue]]
=== activemq queue metricset

beta[]

include::../../../../x-pack/metricbeat/module/activemq/queue/_meta/docs.asciidoc[]

This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/activemq/topic.asciidoc
View file
Open in desktop
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-activemq-topic]]
=== activemq topic metricset

beta[]

include::../../../../x-pack/metricbeat/module/activemq/topic/_meta/docs.asciidoc[]

This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
Expand Down
8 changes: 4 additions & 4 deletions metricbeat/docs/modules_list.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ This file is generated! See scripts/mage/docs_collector.go
[options="header"]
|===
|Modules |Dashboards |Metricsets
|<<metricbeat-module-activemq,activemq>> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.3+| .3+| |<<metricbeat-metricset-activemq-broker,broker>> beta[]
|<<metricbeat-metricset-activemq-queue,queue>> beta[]
|<<metricbeat-metricset-activemq-topic,topic>> beta[]
|<<metricbeat-module-activemq,activemq>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.3+| .3+| |<<metricbeat-metricset-activemq-broker,broker>>
|<<metricbeat-metricset-activemq-queue,queue>>
|<<metricbeat-metricset-activemq-topic,topic>>
|<<metricbeat-module-aerospike,Aerospike>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.1+| .1+| |<<metricbeat-metricset-aerospike-namespace,namespace>>
|<<metricbeat-module-apache,Apache>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/activemq/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

== ActiveMQ module

beta[]
ga[]

This module parses Apache ActiveMQ logs. It supports application and audit logs.

Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/activemq/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- key: activemq
title: "activemq"
release: beta
release: ga
description: >
Module for parsing ActiveMQ log files.
fields:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/activemq/fields.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/activemq/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- key: activemq
title: "activemq"
release: beta
release: ga
description: >
activemq module
fields:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/activemq/broker/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- name: broker
type: group
description: Broker metrics from org.apache.activemq:brokerName=*,type=Broker
release: beta
release: ga
fields:
- name: mbean
description: Mbean that this event is related to
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/activemq/fields.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/activemq/queue/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- name: queue
type: group
description: Queue metrics from org.apache.activemq:brokerName=*,destinationName=*,destinationType=Queue,type=Broker
release: beta
release: ga
fields:
- name: mbean
description: Mbean that this event is related to
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/activemq/topic/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- name: topic
type: group
description: Topic metrics from org.apache.activemq:brokerName=*,destinationName=*,destinationType=Topic,type=Broker
release: beta
release: ga
fields:
- name: mbean
description: Mbean that this event is related to
Expand Down