From bb81b231bd8c6635e4144d519fb3ab38b139793f Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 17 Mar 2020 09:29:57 +0100 Subject: [PATCH] Release ActiveMQ filebeat/metricbeat module as GA --- CHANGELOG.next.asciidoc | 2 ++ filebeat/docs/modules/activemq.asciidoc | 2 +- metricbeat/docs/modules/activemq.asciidoc | 2 -- metricbeat/docs/modules/activemq/broker.asciidoc | 2 -- metricbeat/docs/modules/activemq/queue.asciidoc | 2 -- metricbeat/docs/modules/activemq/topic.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 8 ++++---- x-pack/filebeat/module/activemq/_meta/docs.asciidoc | 2 +- x-pack/filebeat/module/activemq/_meta/fields.yml | 2 +- x-pack/filebeat/module/activemq/fields.go | 2 +- x-pack/metricbeat/module/activemq/_meta/fields.yml | 2 +- x-pack/metricbeat/module/activemq/broker/_meta/fields.yml | 2 +- x-pack/metricbeat/module/activemq/fields.go | 2 +- x-pack/metricbeat/module/activemq/queue/_meta/fields.yml | 2 +- x-pack/metricbeat/module/activemq/topic/_meta/fields.yml | 2 +- 15 files changed, 15 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 525d234afd6..431b4b7858d 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -181,6 +181,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Improve ECS categorization, host field mappings in elasticsearch module. {issue}16160[16160] {pull}16469[16469] - Add ECS related fields to CEF module {issue}16157[16157] {pull}16338[16338] - 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* @@ -234,6 +235,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add PubSub metricset to Google Cloud Platform module {pull}15536[15536] - 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* diff --git a/filebeat/docs/modules/activemq.asciidoc b/filebeat/docs/modules/activemq.asciidoc index 1fffb68c2d9..c276cd63952 100644 --- a/filebeat/docs/modules/activemq.asciidoc +++ b/filebeat/docs/modules/activemq.asciidoc @@ -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. diff --git a/metricbeat/docs/modules/activemq.asciidoc b/metricbeat/docs/modules/activemq.asciidoc index 8f3e0551fd1..4a4702ff537 100644 --- a/metricbeat/docs/modules/activemq.asciidoc +++ b/metricbeat/docs/modules/activemq.asciidoc @@ -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] diff --git a/metricbeat/docs/modules/activemq/broker.asciidoc b/metricbeat/docs/modules/activemq/broker.asciidoc index 16e5cd8f4a8..bd3b96526e7 100644 --- a/metricbeat/docs/modules/activemq/broker.asciidoc +++ b/metricbeat/docs/modules/activemq/broker.asciidoc @@ -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. diff --git a/metricbeat/docs/modules/activemq/queue.asciidoc b/metricbeat/docs/modules/activemq/queue.asciidoc index 84f0e17fffd..9badb525ec4 100644 --- a/metricbeat/docs/modules/activemq/queue.asciidoc +++ b/metricbeat/docs/modules/activemq/queue.asciidoc @@ -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. diff --git a/metricbeat/docs/modules/activemq/topic.asciidoc b/metricbeat/docs/modules/activemq/topic.asciidoc index fec92cbf9cc..f9cb2a4b45a 100644 --- a/metricbeat/docs/modules/activemq/topic.asciidoc +++ b/metricbeat/docs/modules/activemq/topic.asciidoc @@ -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. diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 2a8c8f76bc4..0da48bae0bd 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -5,10 +5,10 @@ This file is generated! See scripts/mage/docs_collector.go [options="header"] |=== |Modules |Dashboards |Metricsets -|<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.3+| .3+| |<> beta[] -|<> beta[] -|<> beta[] +|<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | +.3+| .3+| |<> +|<> +|<> |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | .1+| .1+| |<> |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | diff --git a/x-pack/filebeat/module/activemq/_meta/docs.asciidoc b/x-pack/filebeat/module/activemq/_meta/docs.asciidoc index cdded2dc7fb..6e7d6d74551 100644 --- a/x-pack/filebeat/module/activemq/_meta/docs.asciidoc +++ b/x-pack/filebeat/module/activemq/_meta/docs.asciidoc @@ -5,7 +5,7 @@ == ActiveMQ module -beta[] +ga[] This module parses Apache ActiveMQ logs. It supports application and audit logs. diff --git a/x-pack/filebeat/module/activemq/_meta/fields.yml b/x-pack/filebeat/module/activemq/_meta/fields.yml index 987343d282c..1dde6cdd257 100644 --- a/x-pack/filebeat/module/activemq/_meta/fields.yml +++ b/x-pack/filebeat/module/activemq/_meta/fields.yml @@ -1,6 +1,6 @@ - key: activemq title: "activemq" - release: beta + release: ga description: > Module for parsing ActiveMQ log files. fields: diff --git a/x-pack/filebeat/module/activemq/fields.go b/x-pack/filebeat/module/activemq/fields.go index 6c81d244204..c40861e62db 100644 --- a/x-pack/filebeat/module/activemq/fields.go +++ b/x-pack/filebeat/module/activemq/fields.go @@ -19,5 +19,5 @@ func init() { // AssetActivemq returns asset data. // This is the base64 encoded gzipped contents of module/activemq. func AssetActivemq() string { - return "eJyskrFu20AQRHt+xUBVUkgfwCJAmnQKECCpg81xSB105FG7SwX6e4O0ZJOWDAGWtyKGe2/mbneNPU8lJHg8sj0UgEdPLLG6SKsCUCaKscQ/uhRARQsae4+5K/GtAIBtroZE1FnRi1rsGnyfCNtfSLlBHRNtUwB1ZKqsnA6t0UnLhf1YfupZotE89GflhuGSNKcFSYn6Il94e57+Z61m+k3qc/2Ulsg1fMczD9FsGK81Sik3zfitPAw0x5eQxAxZobQ8aODXzVUu3ymleizX74kB34mjYUcVZ7WIxCM7vzYf7NEn+WPUDxjLUEW/cp4P947vj2nMqDW3rys1UUdr28ya39uIlJvPT9D3KQYZ++/mmGcxl7D/6yqBi/9vZ/IUAAD//5OoA7o=" + return "eJysksFO80AMhO95ilFP/39oHyAHJC7cioQEZ2RtnO2qm2xqe4v69mhDCwktqkTxKZrY801iL7HlQw1yFvbc7SrAgkWusThJiwoQjkzKNTxVQMPqJAwWUl/jrgKAdWpyZLRJMJBo6D3ux/n1E2LyaENkXVVAGzg2Wo9DS/TU8Qxeyg5DIUnKw1G5AJw7Td0cxcjyKZ/8tnx4S9JM9IuuH/VIHSO1sA0f/RBUc/msIsXkfXkW3mVWwz8XSRVJIKwpi+P/q7NcthGm5rZcz6MHbEMGzz0LGTezSLzn3s7hWW/9JS/K8gsw5SbYGXm63Cvch3HNaCV1Xyc1uha0ribNP11ETP7vEwxDDI5K/9Uc0yxq5LavJuR49v77Tt4DAAD//6D2AuY=" } diff --git a/x-pack/metricbeat/module/activemq/_meta/fields.yml b/x-pack/metricbeat/module/activemq/_meta/fields.yml index 0db8a43bbdc..b7ada0a5ce8 100644 --- a/x-pack/metricbeat/module/activemq/_meta/fields.yml +++ b/x-pack/metricbeat/module/activemq/_meta/fields.yml @@ -1,6 +1,6 @@ - key: activemq title: "activemq" - release: beta + release: ga description: > activemq module fields: diff --git a/x-pack/metricbeat/module/activemq/broker/_meta/fields.yml b/x-pack/metricbeat/module/activemq/broker/_meta/fields.yml index a7b4184b0fd..be2fb756be2 100644 --- a/x-pack/metricbeat/module/activemq/broker/_meta/fields.yml +++ b/x-pack/metricbeat/module/activemq/broker/_meta/fields.yml @@ -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 diff --git a/x-pack/metricbeat/module/activemq/fields.go b/x-pack/metricbeat/module/activemq/fields.go index d2362e3ea29..70ac0447da5 100644 --- a/x-pack/metricbeat/module/activemq/fields.go +++ b/x-pack/metricbeat/module/activemq/fields.go @@ -19,5 +19,5 @@ func init() { // AssetActivemq returns asset data. // This is the base64 encoded gzipped contents of module/activemq. func AssetActivemq() string { - return "eJzsl8tu2zoQhvd+ikFW5xw4egABOUCzb9AC2RcUOZYI86KQQyfu0xfULZItXyTbXQT2wguK88+nn5cZPcIatykwTnKD+m0BQJIUpvDQDj0sABwqZB5TyJDYAkCg506WJK1J4f8FAHQKoK0IChcAK4lK+LR6+giGaRzkiT/alphC7mwom5ER5aFSXy1zdo2uGx7T29N8rmJAIznJPayc1WBdnrCS8QKTFjCttV+Yxqf/llH36Xk3264r7W8X9xNYZ8hMb3yH7Xt8DFQwAiqkB9ygIZA+ZmKEAsgOguvXXeP23Toxki7+H87WOLE36ZSqRm3dNqkNSkpOh1O8FgglOo6GWI5gV0AFNgKgpJYEwaNIRvJ7zhSKXytl2TDByjrNKG11DwN6sg6P8/2oNSJYNfvmTIS6nGNZjIPg48jNELk1Bnmk8Am3wRyDtMQUmKAzdBGxHzoCpazJxxP6oNGdTPfSJdLoKxM+Q89P18T6ROBbwICTs/r6aBZsg5AhGmB8bey7QpGjAGuqlWqOxQwsNFfC8nFLk61wBHqShsXQOUxnswQzMKNDm+tK6awIfNbe6EKbahMZejZMZWqJqsWZVmt+xpCJpaZHuj/yGutQpfo1S1Jt2OSK5OXvk6J7c6YdSpIaE7bJD6f5tkEXt1+cCazbje/MQ4GquR+kP3UihQ2ZwmNI8U3OQ2kZYsS5+a93V3ch4EMWZ2TVdrmE4npXuB+5wf9hRoBDbTco/q2P6xWuUCF9yYgXF7MKVHKDrjaxM3cJ0nAVhDQ5UGE9grE0eK+vUovwo5QOxeVMrdAMBmlWSuYFXQ7RbotqOZeQBdpbOMi2y8s6ncHtpdnH8bYzqqGnS2+wg1Bnfzb02vLbfyuMWiWPlMRolS+so9t5NaP76XU9RKzZV9MZWgKypeTTup3XGHL1bqdS/ZrdTm3YjO/ve28yyH7vTe69yRTme29y7012oe69yble/f3e5E8AAAD///+VcHo=" + return "eJzsl8tu2zoQhvd+ikFW5xw4egADOUCzb9AC2RcUOZYI86KQQyXu0xfULZItXyTbXQT2wguK88+nn5cZPcIGtytgnGSJ+m0BQJIUruChHXpYADhUyDyuIGMLAIGeO1mQtGYF/y8AoIsHbUVQuABYS1TCr6qnj2CYxkGW+KNtESWdDUUzMqI8VOqrpc5u0HXDY3p7ms9VDGgkJ7mHtbMarMsSVjCeY9ICrmrtF6bx6b9l1H163s029KT97cJ+4uoUmemN75B9j4+BckZAufSAJRoC6WMeRiiA7CC4ftkNbt+tEyPp4v/hbI0Pe5NOqWrU1m2T2p6k4HQ4xWuOUKDjaIhlCHYNlGMjAEpqSRA8imQkv+dMofi1VpYNE6yt04xWre5hQE/W4XG+H7VGBKtm35yJUBdzLItxEHwcuRkit8YgjxQ+4TaYY5CWmAITdIouIvZDR6CUNdl4Qh80upPpXrpEGn1lwmfo+emaWJ8IfAsYcHJWXx/NnJUIKaIBxjfGvisUGQqwplqp5ljMwEJzJSwftzTZCkegJ2lYDJ3DdDZLMAMzOrS5rhTOisBn7Y0utKk1kaFnw1SmlqhanGmV5mcMmVhoeqT7I6+xClWqX7Eg1XZNrkde/j4pujdn2pEkqTFhZXY4zbcSXdx8cSawbi++Mw85quZ2kP7UeRQ2pAqPIcU3OQ+lZYgR5+a/3k3dhYAPaZyRVtvlEorrXeB+5P7+hxkBDrUtUfxbH9YrXKBC+oIRzy9mFahkia42sTN3CdJwFYQ0GVBuPYKxNHivr1KJ8KOQDsXlTK3QDAZp1kpmOV0O0W6LajmXkAbaWzhIt8vL+pzB7aXZx/GmM6qhp0tvsINQZ3809Jry238pjFolj5TEaJXPraPbeTWj9+n1PESs2VfTGVoCsoXk03qd1xhy9V6nUv2KvU5t14xv73tnMsh+70zunckU5ntncu9MdqHuncm5Xv39zuRPAAAA//9Q1m0q" } diff --git a/x-pack/metricbeat/module/activemq/queue/_meta/fields.yml b/x-pack/metricbeat/module/activemq/queue/_meta/fields.yml index 08bdd562c7c..5c6e81bcc2a 100644 --- a/x-pack/metricbeat/module/activemq/queue/_meta/fields.yml +++ b/x-pack/metricbeat/module/activemq/queue/_meta/fields.yml @@ -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 diff --git a/x-pack/metricbeat/module/activemq/topic/_meta/fields.yml b/x-pack/metricbeat/module/activemq/topic/_meta/fields.yml index 4862b605b86..e5ba35fb839 100644 --- a/x-pack/metricbeat/module/activemq/topic/_meta/fields.yml +++ b/x-pack/metricbeat/module/activemq/topic/_meta/fields.yml @@ -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