Fix istio mapping (elastic#17562) (elastic#17568)

(cherry picked from commit df311e5)

metricbeat/docs/fields.asciidoc

@@ -19299,13 +19299,13 @@ type: long
 
 --
 
-*`istio.mixer.handler`*::
+*`istio.mixer.handler.name`*::
 +
 --
 The name of the daemon  handler
 
 
-type: long
+type: keyword
 
 --
 
@@ -19315,7 +19315,7 @@ type: long
 The name of the variety
 
 
-type: long
+type: keyword
 
 --
 
@@ -19332,7 +19332,7 @@ Contains statistics related to the Istio pilot service
 Count of concurrent xDS client connections for Pilot.
 
 
-type: integer
+type: long
 
 --
 
@@ -19342,14 +19342,34 @@ type: integer
 Count of xDS messages sent, as well as errors building or sending xDS messages for lds, rds, cds and eds.
 
 
-type: integer
+type: long
+
+--
+
+*`istio.pilot.xds.push.time.ms.bucket.*`*::
++
+--
+Total time Pilot takes to push lds, rds, cds and eds, histogram buckets in milliseconds.
+
+
+type: object
+
+--
+
+*`istio.pilot.xds.push.time.ms.sum`*::
++
+--
+Total time Pilot takes to push lds, rds, cds and eds, histogram sum of times in milliseconds.
+
+
+type: long
 
 --
 
-*`istio.pilot.xds.push.time.sec`*::
+*`istio.pilot.xds.push.time.ms.count`*::
 +
 --
-Total time in seconds Pilot takes to push lds, rds, cds and eds.
+Total time Pilot takes to push lds, rds, cds and eds, histogram count of times.
 
 
 type: long
@@ -19362,7 +19382,7 @@ type: long
 Instances for each cluster, as of last push. Zero instances is an error.
 
 
-type: object
+type: long
 
 --
 
@@ -19372,7 +19392,7 @@ type: object
 Number of errors (timeouts) initiating push context.
 
 
-type: integer
+type: long
 
 --
 
@@ -19382,7 +19402,7 @@ type: integer
 Total number of internal XDS errors in pilot.
 
 
-type: integer
+type: long
 
 --
 
@@ -19392,7 +19412,7 @@ type: integer
 Number of conflicting inbound listeners.
 
 
-type: integer
+type: long
 
 --
 
@@ -19402,7 +19422,7 @@ type: integer
 Number of conflicting wildcard http listeners with current wildcard tcp listener.
 
 
-type: integer
+type: long
 
 --
 
@@ -19412,7 +19432,7 @@ type: integer
 Number of conflicting HTTP listeners with well known HTTPS ports.
 
 
-type: integer
+type: long
 
 --
 
@@ -19422,7 +19442,7 @@ type: integer
 Number of conflicting wildcard tcp listeners with current wildcard http listener.
 
 
-type: integer
+type: long
 
 --
 
@@ -19432,7 +19452,7 @@ type: integer
 Number of conflicting tcp listeners with current tcp listener.
 
 
-type: integer
+type: long
 
 --
 
@@ -19456,30 +19476,30 @@ type: long
 
 --
 
-*`istio.pilot.services`*::
+*`istio.pilot.proxy.conv.ms.count`*::
 +
 --
-Total services known to pilot.
+Time needed by Pilot to push Envoy configurations, histogram count of times.
 
 
-type: integer
+type: long
 
 --
 
-*`istio.pilot.virt.services`*::
+*`istio.pilot.services`*::
 +
 --
-Total virtual services known to pilot.
+Total services known to pilot.
 
 
 type: integer
 
 --
 
-*`istio.pilot.proxy.conv.ms.count`*::
+*`istio.pilot.virt.services`*::
 +
 --
-Time needed by Pilot to push Envoy configurations, histogram count of times.
+Total virtual services known to pilot.
 
 
 type: long
@@ -19492,7 +19512,7 @@ type: long
 Pods not found in the endpoint table, possibly invalid.
 
 
-type: object
+type: long
 
 --
 

x-pack/metricbeat/module/istio/mixer/_meta/data.json

@@ -8,7 +8,8 @@
     "istio": {
         "mixer": {
             "handler": {
-                "daemons": 1
+                "daemons": 1,
+                "name": "prometheus.istio-system"
             }
         }
     },

x-pack/metricbeat/module/istio/mixer/_meta/fields.yml

@@ -88,11 +88,11 @@
       type: long
       description: >
         The number of handlers that were re-used during config transition.
-    - name: handler
-      type: long
+    - name: handler.name
+      type: keyword
       description: >
         The name of the daemon  handler
     - name: variety
-      type: long
+      type: keyword
       description: >
         The name of the variety

x-pack/metricbeat/module/istio/mixer/_meta/testdata/docs.plain-expected.json

@@ -8,7 +8,8 @@
         "istio": {
             "mixer": {
                 "handler": {
-                    "daemons": 1
+                    "daemons": 1,
+                    "name": "prometheus.istio-system"
                 }
             }
         },
@@ -42,6 +43,29 @@
             "type": "istio"
         }
     },
+    {
+        "event": {
+            "dataset": "istio.mixer",
+            "duration": 115000,
+            "module": "istio"
+        },
+        "istio": {
+            "mixer": {
+                "handler": {
+                    "daemons": 4,
+                    "name": "kubernetesenv.istio-system"
+                }
+            }
+        },
+        "metricset": {
+            "name": "mixer",
+            "period": 10000
+        },
+        "service": {
+            "address": "127.0.0.1:55555",
+            "type": "istio"
+        }
+    },
     {
         "event": {
             "dataset": "istio.mixer",
@@ -118,28 +142,6 @@
             "type": "istio"
         }
     },
-    {
-        "event": {
-            "dataset": "istio.mixer",
-            "duration": 115000,
-            "module": "istio"
-        },
-        "istio": {
-            "mixer": {
-                "handler": {
-                    "daemons": 4
-                }
-            }
-        },
-        "metricset": {
-            "name": "mixer",
-            "period": 10000
-        },
-        "service": {
-            "address": "127.0.0.1:55555",
-            "type": "istio"
-        }
-    },
     {
         "event": {
             "dataset": "istio.mixer",

x-pack/metricbeat/module/istio/mixer/mixer.go

@@ -48,7 +48,7 @@ var mapping = &prometheus.MetricsMapping{
 	},
 
 	Labels: map[string]prometheus.LabelMap{
-		"handler": prometheus.KeyLabel("handler"),
+		"handler": prometheus.KeyLabel("handler.name"),
 		"variety": prometheus.KeyLabel("variety"),
 	},
 }