Move the metricbeat IIS module to x-pack (elastic#16726)

* move IIS module to x-pack * changelog * temp * tests * add tests * fmt * fmt * mage fmt * work on tests
adriansr · Mar 5, 2020 · 0bb2432 · 0bb2432
1 parent ed80900
commit 0bb2432
Show file tree

Hide file tree

Showing 51 changed files with 423 additions and 514 deletions.
diff --git a/metricbeat/docs/modules/iis.asciidoc b/metricbeat/docs/modules/iis.asciidoc
@@ -3,6 +3,7 @@ This file is generated! See scripts/mage/docs_collector.go
 ////
 
 [[metricbeat-module-iis]]
+[role="xpack"]
 == iis module
 
 beta[]

diff --git a/metricbeat/docs/modules/iis/application_pool.asciidoc b/metricbeat/docs/modules/iis/application_pool.asciidoc
@@ -7,7 +7,7 @@ This file is generated! See scripts/mage/docs_collector.go
 
 beta[]
 
-include::../../../module/iis/application_pool/_meta/docs.asciidoc[]
+include::../../../../x-pack/metricbeat/module/iis/application_pool/_meta/docs.asciidoc[]
 
 
 ==== Fields
@@ -19,5 +19,5 @@ Here is an example document generated by this metricset:
 
 [source,json]
 ----
-include::../../../module/iis/application_pool/_meta/data.json[]
+include::../../../../x-pack/metricbeat/module/iis/application_pool/_meta/data.json[]
 ----
diff --git a/metricbeat/docs/modules/iis/webserver.asciidoc b/metricbeat/docs/modules/iis/webserver.asciidoc
@@ -7,7 +7,7 @@ This file is generated! See scripts/mage/docs_collector.go
 
 beta[]
 
-include::../../../module/iis/webserver/_meta/docs.asciidoc[]
+include::../../../../x-pack/metricbeat/module/iis/webserver/_meta/docs.asciidoc[]
 
 This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
 
@@ -20,5 +20,5 @@ Here is an example document generated by this metricset:
 
 [source,json]
 ----
-include::../../../module/iis/webserver/_meta/data.json[]
+include::../../../../x-pack/metricbeat/module/iis/webserver/_meta/data.json[]
 ----
diff --git a/metricbeat/docs/modules/iis/website.asciidoc b/metricbeat/docs/modules/iis/website.asciidoc
@@ -7,7 +7,7 @@ This file is generated! See scripts/mage/docs_collector.go
 
 beta[]
 
-include::../../../module/iis/website/_meta/docs.asciidoc[]
+include::../../../../x-pack/metricbeat/module/iis/website/_meta/docs.asciidoc[]
 
 This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
 
@@ -20,5 +20,5 @@ Here is an example document generated by this metricset:
 
 [source,json]
 ----
-include::../../../module/iis/website/_meta/data.json[]
+include::../../../../x-pack/metricbeat/module/iis/website/_meta/data.json[]
 ----
diff --git a/metricbeat/include/list_common.go b/metricbeat/include/list_common.go
diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
@@ -348,18 +348,6 @@ metricbeat.modules:
   #    fields: # added to the the response in root. overwrites existing fields
   #      key: "value"
 
-#--------------------------------- Iis Module ---------------------------------
-- module: iis
-  metricsets:
-    - webserver
-    - website
-    - application_pool
-  enabled: true
-  period: 10s
-
- # filter on application pool names
- # application_pool.name: []
-
 #------------------------------- Jolokia Module -------------------------------
 - module: jolokia
   #metricsets: ["jmx"]

diff --git a/metricbeat/module/iis/application_pool/_meta/data.json b/metricbeat/module/iis/application_pool/_meta/data.json
diff --git a/metricbeat/module/iis/application_pool/application_pool_test.go b/metricbeat/module/iis/application_pool/application_pool_test.go
diff --git a/metricbeat/module/iis/application_pool/doc.go b/metricbeat/module/iis/application_pool/doc.go
diff --git a/metricbeat/module/iis/doc.go b/metricbeat/module/iis/doc.go
diff --git a/metricbeat/module/iis/fields.go b/metricbeat/module/iis/fields.go
diff --git a/metricbeat/module/iis/webserver/_meta/data.json b/metricbeat/module/iis/webserver/_meta/data.json
diff --git a/metricbeat/module/iis/webserver/doc.go b/metricbeat/module/iis/webserver/doc.go
diff --git a/metricbeat/module/iis/webserver/webserver_integration_test.go b/metricbeat/module/iis/webserver/webserver_integration_test.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ This file is generated! See scripts/mage/docs_collector.go @@
     ////
     [[metricbeat-module-iis]]
+    [role="xpack"]
     == iis module
     beta[]
@@ Expand Down @@