Rename filebeat apache2 module to apache

CHANGELOG.asciidoc

@@ -158,6 +158,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha1...v7.0.0-alpha2[Check the
 - Rename many `nginx.access.*` fields to map to ECS. {pull}9081[9081]
 - Rename many `system.auth.*` fields to map to ECS. {pull}9138[9138]
 - Rename many `apache2.access.*` fields to map to ECS. {pull}9245[9245]
+- Rename `apache2` module to `apache`. {pull}9402[9402]
 
 *Metricbeat*
 

dev-tools/cmd/module_fields/module_fields.go

@@ -80,6 +80,11 @@ func main() {
 		if err != nil {
 			log.Fatalf("Error fetching files for module %v: %v", module, err)
 		}
+		if len(files) == 0 {
+			// This can happen on moved modules
+			log.Printf("No fields files for module %v", module)
+			continue
+		}
 
 		data, err := fields.GenerateFieldsYml(files)
 		if err != nil {

filebeat/docs/fields.asciidoc

@@ -12,7 +12,7 @@ This file is generated! See _meta/fields.yml and scripts/generate_field_docs.py
 This document describes the fields that are exported by Filebeat. They are
 grouped in the following categories:
 
-* <<exported-fields-apache2>>
+* <<exported-fields-apache>>
 * <<exported-fields-auditd>>
 * <<exported-fields-beat>>
 * <<exported-fields-cloud>>
@@ -41,66 +41,54 @@ grouped in the following categories:
 * <<exported-fields-traefik>>
 
 --
-[[exported-fields-apache2]]
-== Apache2 fields
+[[exported-fields-apache]]
+== Apache fields
 
-Apache2 Module
+Apache Module
 
 
 
 [float]
 == apache2 fields
 
-Apache2 fields.
+Aliases for backward compatibility with old apache2 fields
 
 
 
-[float]
-== access fields
-
-Contains fields for the Apache2 HTTPD access logs.
-
-
 
 *`apache2.access.remote_ip`*::
 +
 --
-type: keyword
-
-Client IP address or hostname.
+type: alias
 
+alias to: apache.access.remote_ip
 
 --
 
 *`apache2.access.ssl.protocol`*::
 +
 --
-type: keyword
-
-SSL protocol version.
+type: alias
 
+alias to: apache.access.ssl.protocol
 
 --
 
 *`apache2.access.ssl.cipher`*::
 +
 --
-type: keyword
-
-SSL cipher name.
+type: alias
 
+alias to: apache.access.ssl.cipher
 
 --
 
 *`apache2.access.body_sent.bytes`*::
 +
 --
-type: long
-
-format: bytes
-
-The number of bytes of the server response body.
+type: alias
 
+alias to: apache.access.body_sent.bytes
 
 --
 
@@ -313,12 +301,6 @@ alias to: source.geo.region_iso_code
 
 --
 
-[float]
-== error fields
-
-Fields from the Apache error logs.
-
-
 
 *`apache2.error.level`*::
 +
@@ -327,58 +309,108 @@ type: alias
 
 alias to: log.level
 
-The severity level of the message.
+--
+
+*`apache2.error.message`*::
++
+--
+type: alias
 
+alias to: message
 
 --
 
-*`apache2.error.client`*::
+*`apache2.error.pid`*::
 +
 --
-type: keyword
+type: alias
+
+alias to: process.pid
+
+--
 
-The IP address of the client that generated the error.
+*`apache2.error.tid`*::
++
+--
+type: alias
 
+alias to: process.thread.id
 
 --
 
-*`apache2.error.message`*::
+*`apache2.error.module`*::
 +
 --
 type: alias
 
-alias to: message
+alias to: apache.error.module
 
-The logged message.
+--
+
+[float]
+== apache fields
+
+Apache fields.
+
+
+
+[float]
+== access fields
 
+Contains fields for the Apache HTTP Server access logs.
 
+
+
+*`apache.access.remote_ip`*::
++
 --
+type: keyword
 
-*`apache2.error.pid`*::
+Client IP address or hostname.
+
+
+--
+
+*`apache.access.ssl.protocol`*::
 +
 --
-type: alias
+type: keyword
 
-alias to: process.pid
+SSL protocol version.
 
-The process ID.
 
+--
 
+*`apache.access.ssl.cipher`*::
++
 --
+type: keyword
 
-*`apache2.error.tid`*::
+SSL cipher name.
+
+
+--
+
+*`apache.access.body_sent.bytes`*::
 +
 --
-type: alias
+type: long
 
-alias to: process.thread.id
+format: bytes
 
-The thread ID.
+The number of bytes of the server response body.
 
 
 --
 
-*`apache2.error.module`*::
+[float]
+== error fields
+
+Fields from the Apache error logs.
+
+
+
+*`apache.error.module`*::
 +
 --
 type: keyword

filebeat/docs/filebeat-modules-options.asciidoc

@@ -1,4 +1,4 @@
-:modulename: apache2 mysql
+:modulename: apache mysql
 
 [id="configuration-{beatname_lc}-modules"]
 == Specify which modules to run
@@ -38,13 +38,13 @@ available in {beatname_uc}. You can enable or disable specific module configurat
 under `modules.d` by running the
 <<modules-command,`modules enable` or `modules disable`>> commands.
 
-For example, to enable the `apache2` and `mysql` configs in the `modules.d`
+For example, to enable the `apache` and `mysql` configs in the `modules.d`
 directory, you use:
 
 include::./include/enable-modules-command.asciidoc[]
 
 Then when you run {beatname_uc}, it loads the corresponding module configurations
-specified in the `modules.d` directory (for example, `modules.d/apache2.yml` and
+specified in the `modules.d` directory (for example, `modules.d/apache.yml` and
 `modules.d/mysql.yml`).
 
 To see a list of enabled and disabled modules, run:

filebeat/docs/modules/apache2.asciidoc → filebeat/docs/modules/apache.asciidoc

@@ -2,11 +2,11 @@
 This file is generated! See scripts/docs_collector.py
 ////
 
-[[filebeat-module-apache2]]
-:modulename: apache2
+[[filebeat-module-apache]]
+:modulename: apache
 :has-dashboards: true
 
-== Apache2 module
+== Apache module
 
 The +{modulename}+ module parses access and error logs created by the
 https://httpd.apache.org/[Apache HTTP] server.
@@ -23,7 +23,7 @@ This module requires the
 
 The +{modulename}+ module was tested with logs from versions 2.2.22 and 2.4.23.
 
-On Windows, the module was tested with Apache2 installed from the Chocolatey
+On Windows, the module was tested with Apache HTTP Server installed from the Chocolatey
 repository.
 
 include::../include/running-modules.asciidoc[]
@@ -34,30 +34,30 @@ include::../include/running-modules.asciidoc[]
 This module comes with a sample dashboard. For example:
 
 [role="screenshot"]
-image::./images/kibana-apache2.png[]
+image::./images/kibana-apache.png[]
 
 include::../include/configuring-intro.asciidoc[]
 
 The following example shows how to set paths in the +modules.d/{modulename}.yml+
-file to override the default paths for Apache2 access and error logs:
+file to override the default paths for Apache HTTP Server access and error logs:
 
 ["source","yaml",subs="attributes"]
 -----
-- module: apache2
+- module: apache
   access:
     enabled: true
-    var.paths: ["/path/to/log/apache2/access.log*"]
+    var.paths: ["/path/to/log/apache/access.log*"]
   error:
     enabled: true
-    var.paths: ["/path/to/log/apache2/error.log*"]
+    var.paths: ["/path/to/log/apache/error.log*"]
 -----
 
 
 To specify the same settings at the command line, you use:
 
 ["source","sh",subs="attributes"]
 -----
--M "apache2.access.var.paths=[/path/to/apache2/access.log*]" -M "apache2.error.var.paths=[/path/to/log/apache2/error.log*]"
+-M "apache.access.var.paths=[/path/to/apache/access.log*]" -M "apache.error.var.paths=[/path/to/log/apache/error.log*]"
 -----
 
 
@@ -87,5 +87,5 @@ include::../include/var-paths.asciidoc[]
 === Fields
 
 For a description of each field in the module, see the
-<<exported-fields-apache2,exported fields>> section.
+<<exported-fields-apache,exported fields>> section.
 

filebeat/docs/modules_list.asciidoc

@@ -3,7 +3,7 @@ This file is generated! See scripts/docs_collector.py
 ////
 
   * <<filebeat-modules-overview>>
-  * <<filebeat-module-apache2>>
+  * <<filebeat-module-apache>>
   * <<filebeat-module-auditd>>
   * <<filebeat-module-elasticsearch>>
   * <<filebeat-module-haproxy>>
@@ -27,7 +27,7 @@ This file is generated! See scripts/docs_collector.py
 --
 
 include::modules-overview.asciidoc[]
-include::modules/apache2.asciidoc[]
+include::modules/apache.asciidoc[]
 include::modules/auditd.asciidoc[]
 include::modules/elasticsearch.asciidoc[]
 include::modules/haproxy.asciidoc[]

filebeat/docs/reload-configuration.asciidoc

@@ -83,7 +83,7 @@ For example:
 
 [source,yaml]
 ------------------------------------------------------------------------------
-- module: apache2
+- module: apache
   access:
     enabled: true
     var.paths: [/var/log/apache2/access.log*]

filebeat/filebeat.reference.yml

@@ -43,8 +43,8 @@ filebeat.modules:
     # can be added under this section.
     #input:
 
-#------------------------------- Apache2 Module -------------------------------
-#- module: apache2
+#-------------------------------- Apache Module --------------------------------
+#- module: apache
   # Access logs
   #access:
     #enabled: true

filebeat/module/apache2/_meta/config.reference.yml → filebeat/module/apache/_meta/config.reference.yml

@@ -1,4 +1,4 @@
-#- module: apache2
+#- module: apache
   # Access logs
   #access:
     #enabled: true

filebeat/module/apache2/_meta/config.yml → filebeat/module/apache/_meta/config.yml

@@ -1,4 +1,4 @@
-- module: apache2
+- module: apache
   # Access logs
   access:
     enabled: true