From a0dc952196d657423363fd70de9a01c3c70a126d Mon Sep 17 00:00:00 2001 From: Chris Mark Date: Fri, 13 Mar 2020 10:48:01 +0200 Subject: [PATCH 1/2] Release STAN module as GA (#16980) (cherry picked from commit 9325ec42699be02271e108cd3972e15119339a6e) --- CHANGELOG.next.asciidoc | 3 +++ metricbeat/docs/modules/stan.asciidoc | 2 -- metricbeat/docs/modules/stan/channels.asciidoc | 2 -- metricbeat/docs/modules/stan/stats.asciidoc | 2 -- metricbeat/docs/modules/stan/subscriptions.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 8 ++++---- x-pack/metricbeat/module/stan/_meta/fields.yml | 2 +- x-pack/metricbeat/module/stan/channels/_meta/fields.yml | 2 +- x-pack/metricbeat/module/stan/fields.go | 2 +- x-pack/metricbeat/module/stan/stats/_meta/fields.yml | 4 ++-- .../metricbeat/module/stan/subscriptions/_meta/fields.yml | 4 ++-- 11 files changed, 14 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 974a64a695c..49d088d6203 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -298,6 +298,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add system/users metricset as beta {pull}16569[16569] - Align fields to ECS and add more tests for the azure module. {issue}16024[16024] {pull}16754[16754] - Add additional cgroup fields to docker/diskio{pull}16638[16638] +- 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] *Packetbeat* diff --git a/metricbeat/docs/modules/stan.asciidoc b/metricbeat/docs/modules/stan.asciidoc index 1d569882570..13bcf8a7c2c 100644 --- a/metricbeat/docs/modules/stan.asciidoc +++ b/metricbeat/docs/modules/stan.asciidoc @@ -6,8 +6,6 @@ This file is generated! See scripts/mage/docs_collector.go [role="xpack"] == Stan module -beta[] - This is the STAN module. The STAN module uses https://github.com/nats-io/nats-streaming-server/blob/master/server/monitor.go[STAN monitoring server APIs] to collect metrics. The default metricsets are `channels`, `stats` and `subscriptions`. diff --git a/metricbeat/docs/modules/stan/channels.asciidoc b/metricbeat/docs/modules/stan/channels.asciidoc index 797657f6c5e..63ff79005a3 100644 --- a/metricbeat/docs/modules/stan/channels.asciidoc +++ b/metricbeat/docs/modules/stan/channels.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-stan-channels]] === Stan channels metricset -beta[] - include::../../../../x-pack/metricbeat/module/stan/channels/_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/stan/stats.asciidoc b/metricbeat/docs/modules/stan/stats.asciidoc index 1248d49c165..62b6532b8ef 100644 --- a/metricbeat/docs/modules/stan/stats.asciidoc +++ b/metricbeat/docs/modules/stan/stats.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-stan-stats]] === Stan stats metricset -beta[] - include::../../../../x-pack/metricbeat/module/stan/stats/_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/stan/subscriptions.asciidoc b/metricbeat/docs/modules/stan/subscriptions.asciidoc index df34fab9518..9ab2e2bd884 100644 --- a/metricbeat/docs/modules/stan/subscriptions.asciidoc +++ b/metricbeat/docs/modules/stan/subscriptions.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-stan-subscriptions]] === Stan subscriptions metricset -beta[] - include::../../../../x-pack/metricbeat/module/stan/subscriptions/_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 09d4357adf9..56acc64139c 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -219,10 +219,10 @@ This file is generated! See scripts/mage/docs_collector.go |<> beta[] |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> beta[] -|<> 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-no.png[No prebuilt dashboards] | .1+| .1+| |<> |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | diff --git a/x-pack/metricbeat/module/stan/_meta/fields.yml b/x-pack/metricbeat/module/stan/_meta/fields.yml index c4f3af644b7..473b4e87fd1 100644 --- a/x-pack/metricbeat/module/stan/_meta/fields.yml +++ b/x-pack/metricbeat/module/stan/_meta/fields.yml @@ -2,7 +2,7 @@ title: "Stan" description: > stan Module - release: beta + release: ga fields: - name: stan type: group diff --git a/x-pack/metricbeat/module/stan/channels/_meta/fields.yml b/x-pack/metricbeat/module/stan/channels/_meta/fields.yml index aa0dc557761..65ec2b9638b 100644 --- a/x-pack/metricbeat/module/stan/channels/_meta/fields.yml +++ b/x-pack/metricbeat/module/stan/channels/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > Contains stan / nats streaming/serverz endpoint metrics - release: beta + release: ga fields: - name: name type: keyword diff --git a/x-pack/metricbeat/module/stan/fields.go b/x-pack/metricbeat/module/stan/fields.go index 7fa6e2dc38d..be6a36a36b2 100644 --- a/x-pack/metricbeat/module/stan/fields.go +++ b/x-pack/metricbeat/module/stan/fields.go @@ -19,5 +19,5 @@ func init() { // AssetStan returns asset data. // This is the base64 encoded gzipped contents of module/stan. func AssetStan() string { - return "eJy8l0Fv4zYQhe/+FYPtJQGSzd2HLYIkCwRIXbROT0WxS4kjmzA1VDijNdxfX1AyFVmik6CVqkNgyPK8j0+TN+Q17PCwBBZFCwAxYnEJn9ai6NMCQCPn3lRiHC3hywIAmifhF6driwsAjxYV4xIyFLUAKAxazcvmyWsgVWJXO1xyqHAJG+/q6ngnoRCu7+FH3yF3JMoQhxpiWEzOIFslsEeP4FFpKLwrYaWEYS0eVWloA4z+B3q4WD/fri6PNftkJ3TNs5+N7r6JmDs87J3v3z8DG67nLUbZx/uRSG5rlolUjrWSMltFhJZHIn3H35G461lOcAMUrOVo7U27xr8BSVfOkECJ4k3elxz2RLyGb6BPHv6efHHennf4o02hIrgCZIsQ+uB1DdGmJEiJzGqDnISxjjb/gqQuM/SBZcCR1Iog2UHmpGjKg6HGn7cMKYxn+cb4MhHL11APGF9qpLzDYnEe9YDnMzwWr/rwBUpDF3+Gj4aA66zT4b8uQStRYB0zbBVD5ZhNZg/g8rz2HnVybVZNurQn9dGVJWk0VrKdCOW3GmtsK0KmGDXUlSNovKAxpCINW7PZIgt4rJwX1NHhZhGnz49DVJRMkzqO7KFBubb4A206hWLSerQqkE6TQWERE4dQzOqbfvo4Ksym9ir8sBVtJ9X97dOvq4cruHv6Y/388PvD/WUS0zs7IeVjESFRXzW129A0DOQ0dn17XMjFEyqN/gq+OmvdPny6U6SNVoJp3NwaJEknmSHBTa+dPuzrIMxSGt1b7efErBS99jyr+caknsGWlMhMg27VScfCoHIf4lhZ2+K8hEyaf9i9krQzLnfEdYn6IzzjYDvzJmffVvWFJ8o3M4yGqXdYx347Zb9o/zm/GX0mHxITcT60cOMEzzAoZpebZpDszWACR8qmV+ZjXN0+r1uN9njztqVj5iswBSg6dEI//U9bJ5Ip9047cnsabU6OHp1Y0B4CVQiZ3RnCCkmbEcZ/T5Vj3deca06gNyCuj5kN8jtSuaKwhtKtlDlnsTsrfxDskQeyUCq/C3HHUeznc9sdazGdCRORtO9THGQY5U5ZFv8EAAD//z+0hbY=" + return "eJy8l0Fv4zYQhe/+FYPtJQGSzd2HLYIkCwRIXbR2T0WxS4sjmzA1VDijNdxfX1AyZVmik6CVqkNgyPS8j0+TN9Qt7PAwBxZFMwAxYnEOn5ai6NMMQCNn3pRiHM3hywwA6pXwi9OVxRmAR4uKcQ4bNQPIDVrN83rdLZAqsK0cLjmUYaV3VXm8k6gfru/hR98hcyTKEIcaYlhMxiBbJbBHj+BRaci9K2ChhGEpHlVhaAOM/gd6uFqu7hfXx5pdsjO6eu1no9tvIuYOD3vnu/cvwIZrtcUo+/w4EMlsxTKSyrFWUmariNDyQKTr+DsSDx3LCe6AgrUcrb1r9vg3IOnSGRIoULzJupLnHRGvvv9d7vD37IvL5rxDH00KFcHlIFuE0AWnHUSTkiAFMqsNchLGOtr8C5KqWKMPLD2OpFYEWR9kSoq6PBiq/XnLkNx4lm+MryOxfA31gPG1QspaLBbnUfd4PsNzftKHL1AYuvozfDQEXK1bHf7rGrQSBdYxw1YxlI7ZrO0BXJZV3qNO7s2qUbf2oj66sySNxlK2I6H8VmGFTUVYK0YNVekIai9oCKlIw9ZstsgCHkvnBXV0uN7E+fphhIqScTLHkT3UKLcWf6BNZ1DMWY9WBdIxEihsYeQIijl9180eR7nZVF6FHzaizZR6vH/5dfF0Aw8vfyxXT78/PV4nMb2zI1I+5xES9U1du4lMw0BOY9u1x41cvaDS6G/gq7PW7cOnB0XaaCWYxs2sQZJ0jhkS3HSa6cO+9qIspdE+1W5KTErRac6Lmm9M6QlsSYlMNOYWrXQsDCrzIYyVtQ3Oa0ik6UfdiaSZcJkjrgrU7/EMI+3CU5z8ONUVHiXZTD8Uxj5ZHTvtnPyq+bf8ZvSFZEhMwunQwo0zPMOgmF1m6gGyN73JGynrLpmOcXG/WjYazUvN25YOmW/A5KDo0Ar99D8dmUjGPDPtyO1pcCg5enRmQfPqp0K87C4QlkjaDDD+e54c654Srn7vvANxXcx1L7kjlctzayjdSmvnLLZvyB8Ee+aeLBTK70LQcRT7+dJBx1pMZ8JIJM3zFAdrjHInltk/AQAA//+pwIFm" } diff --git a/x-pack/metricbeat/module/stan/stats/_meta/fields.yml b/x-pack/metricbeat/module/stan/stats/_meta/fields.yml index 8dadcc13ff6..ec5d45a0cdc 100644 --- a/x-pack/metricbeat/module/stan/stats/_meta/fields.yml +++ b/x-pack/metricbeat/module/stan/stats/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > Contains only high-level stan / nats streaming server related metrics - release: beta + release: ga fields: - name: state type: keyword @@ -32,4 +32,4 @@ type: long description: > Number of bytes consumed across all STAN queues - + diff --git a/x-pack/metricbeat/module/stan/subscriptions/_meta/fields.yml b/x-pack/metricbeat/module/stan/subscriptions/_meta/fields.yml index 536138f8c5f..4268a663733 100644 --- a/x-pack/metricbeat/module/stan/subscriptions/_meta/fields.yml +++ b/x-pack/metricbeat/module/stan/subscriptions/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > Contains stan / nats streaming/serverz endpoint subscription metrics - release: beta + release: ga fields: - name: id type: keyword @@ -33,4 +33,4 @@ type: boolean description: > Is the subscriber known to be stalled? - + From 976db1998cc9db5d7373ac822c82e3cefee80d9a Mon Sep 17 00:00:00 2001 From: Chris Mark Date: Fri, 13 Mar 2020 13:00:19 +0200 Subject: [PATCH 2/2] Update CHANGELOG.next.asciidoc --- CHANGELOG.next.asciidoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 49d088d6203..a04cb66f595 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -298,8 +298,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add system/users metricset as beta {pull}16569[16569] - Align fields to ECS and add more tests for the azure module. {issue}16024[16024] {pull}16754[16754] - Add additional cgroup fields to docker/diskio{pull}16638[16638] -- 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] *Packetbeat*