elastic · ruflin · Jan 21, 2019 · Jan 18, 2019 · Jan 18, 2019 · Jan 21, 2019
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -167,6 +167,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add more meaningful metrics to 'performance' Metricset on 'MSSQL' module {pull}10011[10011]
 - Rename some fields in `performance` Metricset on MSSQL module to match the updated documentation from Microsoft {pull}10074[10074]
 - Add AWS EC2 module. {pull}9257[9257] {issue}9300[9300]
+- Release windows Metricbeat module as GA. {pull}10163[10163]
 - Release traefik Metricbeat module as GA. {pull}10166[10166]
 - Release Elastic stack modules (Elasticsearch, Logstash, and Kibana) as GA. {pull}10094[10094]
 - Release php_fpm module as GA. {pull}10198[10198]

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -24377,7 +24377,7 @@ Network names
 [[exported-fields-windows]]
 == Windows fields
 
-beta[] Module for Windows
+Module for Windows
 
 
 

diff --git a/metricbeat/docs/modules/windows.asciidoc b/metricbeat/docs/modules/windows.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-windows]]
 == Windows module
 
-beta[]
-
 This is the Windows module. It collects metrics from Windows systems,
 by default metricset `service` is enabled.
 

diff --git a/metricbeat/docs/modules/windows/service.asciidoc b/metricbeat/docs/modules/windows/service.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-windows-service]]
 === Windows service metricset
 
-beta[]
-
 include::../../../module/windows/service/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -150,9 +150,9 @@ This file is generated! See scripts/docs_collector.py
 .3+| .3+|  |<<metricbeat-metricset-vsphere-datastore,datastore>> beta[]  
 |<<metricbeat-metricset-vsphere-host,host>> beta[]  
 |<<metricbeat-metricset-vsphere-virtualmachine,virtualmachine>> beta[]  
-|<<metricbeat-module-windows,Windows>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
+|<<metricbeat-module-windows,Windows>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .2+| .2+|  |<<metricbeat-metricset-windows-perfmon,perfmon>> beta[]  
-|<<metricbeat-metricset-windows-service,service>> beta[]  
+|<<metricbeat-metricset-windows-service,service>>   
 |<<metricbeat-module-zookeeper,ZooKeeper>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .1+| .1+|  |<<metricbeat-metricset-zookeeper-mntr,mntr>>   
 |================================

diff --git a/metricbeat/module/windows/_meta/fields.yml b/metricbeat/module/windows/_meta/fields.yml
@@ -1,10 +1,9 @@
 - key: windows
   title: "Windows"
   description: >
-    beta[]
     Module for Windows
   short_config: false
-  release: beta
+  release: ga
   fields:
     - name: windows
       type: group

diff --git a/metricbeat/module/windows/fields.go b/metricbeat/module/windows/fields.go
diff --git a/metricbeat/module/windows/service/_meta/fields.yml b/metricbeat/module/windows/service/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     `service` contains the status for Windows services.
-  release: beta
+  release: ga
   fields:
     - name: id
       type: keyword

diff --git a/metricbeat/module/windows/service/service.go b/metricbeat/module/windows/service/service.go
@@ -21,7 +21,6 @@ package service
 
 import (
 	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/metricbeat/mb"
 )
 
@@ -46,8 +45,6 @@ type MetricSet struct {
 // Part of new is also setting up the configuration by processing additional
 // configuration entries if needed.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The windows service metricset is beta")
-
 	reader, err := NewServiceReader()
 	if err != nil {
 		return nil, err
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py @@
     [[metricbeat-metricset-windows-service]]
     === Windows service metricset
-    beta[]
     include::../../../module/windows/service/_meta/docs.asciidoc[]
@@ Expand Down @@