Fix indentation in fields definition of generic modules (elastic#15742)…

… (elastic#15759)

Remove spurious strings in fields definitions of generic modules
caused by how these yaml files are indented and concatenated.

(cherry picked from commit f14b9a8)

metricbeat/docs/fields.asciidoc

@@ -25466,6 +25466,7 @@ Stats scraped from a Prometheus endpoint.
 
 
 
+
 *`prometheus.labels.*`*::
 +
 --
@@ -25479,7 +25480,7 @@ type: object
 *`prometheus.metrics.*`*::
 +
 --
-Prometheus metric - release: ga
+Prometheus metric
 
 
 type: object
@@ -27756,6 +27757,7 @@ Statsd module
 
 
 
+
 *`statsd.*.count`*::
 +
 --
@@ -27769,7 +27771,7 @@ type: object
 *`statsd.*.*`*::
 +
 --
-Statsd metrics - release: beta
+Statsd metrics
 
 
 type: object

metricbeat/module/prometheus/_meta/fields.yml

@@ -6,15 +6,18 @@
   release: ga
   settings: ["ssl", "http"]
   fields:
-    # Order is important here, labels will match first, the rest are double
-    - name: prometheus.labels.*
-      type: object
-      object_type: keyword
-      description: >
-        Prometheus metric labels
-    - name: prometheus.metrics.*
-      type: object
-      object_type: double
-      object_type_mapping_type: "*"
-      description: >
-        Prometheus metric
+    - name: prometheus
+      type: group
+      fields:
+        # Order is important here, labels will match first, the rest are double
+        - name: labels.*
+          type: object
+          object_type: keyword
+          description: >
+            Prometheus metric labels
+        - name: metrics.*
+          type: object
+          object_type: double
+          object_type_mapping_type: "*"
+          description: >
+            Prometheus metric

x-pack/metricbeat/module/statsd/_meta/fields.yml

@@ -4,15 +4,18 @@
     Statsd module
   release: beta
   fields:
-    - name: statsd.*.count
-      type: object
-      object_type: long
-      object_type_mapping_type: "long"
-      description: >
-        Statsd counters
-    - name: statsd.*.*
-      type: object
-      object_type: float
-      object_type_mapping_type: "*"
-      description: >
-        Statsd metrics
+    - name: statsd
+      type: group
+      fields:
+        - name: '*.count'
+          type: object
+          object_type: long
+          object_type_mapping_type: "long"
+          description: >
+            Statsd counters
+        - name: '*.*'
+          type: object
+          object_type: float
+          object_type_mapping_type: "*"
+          description: >
+            Statsd metrics