Add a different doc helper for http and tls configurations

metricbeat/docs/modules/apache.asciidoc

@@ -50,7 +50,8 @@ metricbeat.modules:
   #password: password
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/ceph.asciidoc

@@ -32,7 +32,8 @@ metricbeat.modules:
   enabled: true
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/couchbase.asciidoc

@@ -32,7 +32,8 @@ metricbeat.modules:
   enabled: true
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/dropwizard.asciidoc

@@ -33,7 +33,8 @@ metricbeat.modules:
   enabled: true
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/elasticsearch.asciidoc

@@ -43,7 +43,8 @@ metricbeat.modules:
   #index_recovery.active_only: true
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/etcd.asciidoc

@@ -32,7 +32,8 @@ metricbeat.modules:
   hosts: ["localhost:2379"]
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/golang.asciidoc

@@ -31,7 +31,8 @@ metricbeat.modules:
     path: "/debug/vars"
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/http.asciidoc

@@ -54,7 +54,8 @@ metricbeat.modules:
   #      key: "value"
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/jolokia.asciidoc

@@ -60,7 +60,8 @@ metricbeat.modules:
   jmx.instance:
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/kibana.asciidoc

@@ -34,7 +34,8 @@ metricbeat.modules:
   enabled: true
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/kubernetes.asciidoc

@@ -87,7 +87,8 @@ metricbeat.modules:
   hosts: ["https://${KUBERNETES_SERVICE_HOST}:${KUBERNETES_SERVICE_PORT}"]
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/logstash.asciidoc

@@ -33,7 +33,8 @@ metricbeat.modules:
   hosts: ["localhost:9600"]
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/mongodb.asciidoc

@@ -99,7 +99,7 @@ metricbeat.modules:
   #password: pass
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/nginx.asciidoc

@@ -45,7 +45,8 @@ metricbeat.modules:
   server_status_path: "server-status"
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/php_fpm.asciidoc

@@ -57,7 +57,8 @@ metricbeat.modules:
   hosts: ["localhost:8080"]
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/prometheus.asciidoc

@@ -42,7 +42,8 @@ metricbeat.modules:
   #  - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/docs/modules/rabbitmq.asciidoc

@@ -44,7 +44,8 @@ metricbeat.modules:
   #password: guest
 ----
 
-This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>. It also supports the options described in <<module-http-config-options>>.
+This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
+It also supports the options described in <<module-http-config-options>>.
 
 [float]
 === Metricsets

metricbeat/module/apache/_meta/fields.yml

@@ -4,7 +4,7 @@
     Apache HTTPD server metricsets collected from the Apache web server.
   short_config: false
   release: ga
-  settings: ["ssl"]
+  settings: ["ssl", "http"]
   fields:
     - name: apache
       type: group

metricbeat/module/ceph/_meta/fields.yml

@@ -4,7 +4,7 @@
     Ceph module
   short_config: false
   release: beta
-  settings: ["ssl"]
+  settings: ["ssl", "http"]
   fields:
     - name: ceph
       type: group

metricbeat/module/couchbase/_meta/fields.yml

@@ -4,7 +4,7 @@
     Metrics collected from Couchbase servers.
   short_config: false
   release: beta
-  settings: ["ssl"]
+  settings: ["ssl", "http"]
   fields:
     - name: couchbase
       type: group

metricbeat/module/dropwizard/_meta/fields.yml

@@ -3,7 +3,7 @@
   description: >
     Stats collected from Dropwizard.
   release: beta
-  settings: ["ssl"]
+  settings: ["ssl", "http"]
   short_config: false
   fields:
     - name: dropwizard

metricbeat/module/elasticsearch/_meta/fields.yml

@@ -3,7 +3,7 @@
   description: >
     Elasticsearch module
   release: beta
-  settings: ["ssl"]
+  settings: ["ssl", "http"]
   short_config: false
   fields:
     - name: elasticsearch