metricbeat - fix elasticsearch and kibana integration tests failures …

…in 8.0 (#30566) (#30593) * add missing elasticsearch.index fields * add missing elasticsearch.node.stats fields * remove deprecated elasticsearch.settings integration tests * mage update * remove useless field (cherry picked from commit a84f4d5) Co-authored-by: Kevin Lacabane <[email protected]>
elastic · Feb 28, 2022 · 981194d · 981194d
1 parent 3fcddb6
commit 981194d
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 112 deletions.
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -30365,6 +30365,42 @@ type: long
 
 --
 
+
+*`elasticsearch.index.total.bulk.total_size_in_bytes`*::
++
+--
+type: long
+
+--
+
+*`elasticsearch.index.total.bulk.avg_size_in_bytes`*::
++
+--
+type: long
+
+--
+
+*`elasticsearch.index.total.bulk.avg_time_in_millis`*::
++
+--
+type: long
+
+--
+
+*`elasticsearch.index.total.bulk.total_operations`*::
++
+--
+type: long
+
+--
+
+*`elasticsearch.index.total.bulk.total_time_in_millis`*::
++
+--
+type: long
+
+--
+
 [float]
 === index.recovery
 
@@ -31032,6 +31068,53 @@ Statistics about each node in a Elasticsearch cluster
 
 
 
+
+
+*`elasticsearch.node.stats.indices.bulk.avg_time.bytes`*::
++
+--
+type: long
+
+--
+
+*`elasticsearch.node.stats.indices.bulk.avg_time.ms`*::
++
+--
+type: long
+
+--
+
+
+*`elasticsearch.node.stats.indices.bulk.total_time.ms`*::
++
+--
+type: long
+
+--
+
+
+*`elasticsearch.node.stats.indices.bulk.total_size.bytes`*::
++
+--
+type: long
+
+--
+
+
+*`elasticsearch.node.stats.indices.bulk.avg_size.bytes`*::
++
+--
+type: long
+
+--
+
+*`elasticsearch.node.stats.indices.bulk.operations.total.count`*::
++
+--
+type: long
+
+--
+
 *`elasticsearch.node.stats.indices.docs.count`*::
 +
 --

diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go
diff --git a/metricbeat/module/elasticsearch/index/_meta/fields.yml b/metricbeat/module/elasticsearch/index/_meta/fields.yml
@@ -193,4 +193,16 @@
               type: long
             - name: throttle_time_in_millis
               type: long
-
+        - name: bulk
+          type: group
+          fields:
+            - name: total_size_in_bytes
+              type: long
+            - name: avg_size_in_bytes
+              type: long
+            - name: avg_time_in_millis
+              type: long
+            - name: total_operations
+              type: long
+            - name: total_time_in_millis
+              type: long
diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml
@@ -7,6 +7,33 @@
     - name: indices
       type: group
       fields:
+        - name: bulk
+          type: group
+          fields:
+            - name: avg_time
+              type: group
+              fields:
+                - name: bytes
+                  type: long
+                - name: ms
+                  type: long
+            - name: total_time
+              type: group
+              fields:
+                - name: ms
+                  type: long
+            - name: total_size
+              type: group
+              fields:
+                - name: bytes
+                  type: long
+            - name: avg_size
+              type: group
+              fields:
+                - name: bytes
+                  type: long
+            - name: operations.total.count
+              type: long
         - name: docs.count
           type: long
           description: >
@@ -312,4 +339,3 @@
               type: long
             - name: rejected.count
               type: long
-