Move Prometheus query & remote_write to GA (elastic#21507)

(cherry picked from commit 9d2f3b9)
ChrsMark · Oct 6, 2020 · 96c9676 · 96c9676
1 parent 778007a
commit 96c9676
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -824,6 +824,8 @@ field. You can revert this change by configuring tags for the module and omittin
 - Add overview and platform health dashboards to Cloud Foundry module. {pull}21124[21124]
 - Release lambda metricset in aws module as GA. {issue}21251[21251] {pull}21255[21255]
 - Add dashboard for pubsub metricset in googlecloud module. {pull}21326[21326] {issue}17137[17137]
+- Move Prometheus query & remote_write to GA. {pull}21507[21507]
+- Expand unsupported option from namespace to metrics in the azure module. {pull}21486[21486]
 - Map cloud data filed `cloud.account.id` to azure subscription.  {pull}21483[21483] {issue}21381[21381]
 - Expand unsupported option from namespace to metrics in the azure module. {pull}21486[21486]
 

diff --git a/metricbeat/docs/modules/prometheus/query.asciidoc b/metricbeat/docs/modules/prometheus/query.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-metricset-prometheus-query]]
 === Prometheus query metricset
 
-beta[]
-
 include::../../../module/prometheus/query/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules/prometheus/remote_write.asciidoc b/metricbeat/docs/modules/prometheus/remote_write.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-metricset-prometheus-remote_write]]
 === Prometheus remote_write metricset
 
-beta[]
-
 include::../../../module/prometheus/remote_write/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -222,8 +222,8 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-metricset-postgresql-statement,statement>>   
 |<<metricbeat-module-prometheus,Prometheus>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .3+| .3+|  |<<metricbeat-metricset-prometheus-collector,collector>>   
-|<<metricbeat-metricset-prometheus-query,query>> beta[]  
-|<<metricbeat-metricset-prometheus-remote_write,remote_write>> beta[]  
+|<<metricbeat-metricset-prometheus-query,query>>   
+|<<metricbeat-metricset-prometheus-remote_write,remote_write>>   
 |<<metricbeat-module-rabbitmq,RabbitMQ>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .4+| .4+|  |<<metricbeat-metricset-rabbitmq-connection,connection>>   
 |<<metricbeat-metricset-rabbitmq-exchange,exchange>>   

diff --git a/metricbeat/module/prometheus/fields.go b/metricbeat/module/prometheus/fields.go
diff --git a/metricbeat/module/prometheus/query/_meta/fields.yml b/metricbeat/module/prometheus/query/_meta/fields.yml
@@ -2,5 +2,5 @@
   type: group
   description: >
     query metricset
-  release: beta
+  release: ga
   fields:
diff --git a/metricbeat/module/prometheus/remote_write/_meta/fields.yml b/metricbeat/module/prometheus/remote_write/_meta/fields.yml
@@ -2,5 +2,5 @@
   type: group
   description: >
     remote write metrics from Prometheus server
-  release: beta
+  release: ga
   fields:
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go @@
     [[metricbeat-metricset-prometheus-query]]
     === Prometheus query metricset
-    beta[]
     include::../../../module/prometheus/query/_meta/docs.asciidoc[]
@@ Expand Down @@