Change text fields to keyword for Metricbeat (#10318)

Searching for `type: text` revealed a few fields which were text but I think should be keyword.
elastic · Jan 29, 2019 · 0f3ea0d · 0f3ea0d
1 parent f6dbd52
commit 0f3ea0d
Show file tree

Hide file tree

Showing 22 changed files with 137 additions and 84 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -24,6 +24,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Docker and Kubernetes labels/annotations will be "dedoted" by default. {pull}10338[10338]
 
 *Auditbeat*
+
 - Rename `process.exe` to `process.executable` in auditd module to align with ECS. {pull}9949[9949]
 - Rename `process.cwd` to `process.working_directory` in auditd module to align with ECS. {pull}10195[10195]
 - Change data type of `process.pid` and `process.ppid` to number in JSON output
@@ -84,6 +85,15 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Rename http.request.body field to http.request.body.content. {pull}10315[10315]
 - Adjust php_fpm.process metricset fields to ECS. {pull}10366[10366]
 - Adjust mongodb.status metricset to to ECS. {pull}10368[10368]
+- Change the following fields from type text to keyword: {pull}10318[10318]
+  - ceph.osd_df.name
+  - ceph.osd_tree.name
+  - ceph.osd_tree.children
+  - kafka.consumergroup.meta
+  - kibana.stats.name
+  - mongodb.metrics.replication.executor.network_interface
+  - php_fpm.process.request_uri
+  - php_fpm.process.script
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -1587,7 +1587,7 @@ osd node id
 *`ceph.osd_df.name`*::
 +
 --
-type: text
+type: keyword
 
 osd node name
 
@@ -1682,7 +1682,7 @@ osd or bucket node id
 *`ceph.osd_tree.name`*::
 +
 --
-type: text
+type: keyword
 
 osd or bucket node name
 
@@ -1712,7 +1712,7 @@ osd or bucket node typeID
 *`ceph.osd_tree.children`*::
 +
 --
-type: text
+type: keyword
 
 bucket children list, separated by comma.
 
@@ -10779,7 +10779,7 @@ consumer offset into partition being read
 *`kafka.consumergroup.meta`*::
 +
 --
-type: text
+type: keyword
 
 custom consumer meta data string
 
@@ -11028,7 +11028,7 @@ Kibana instance UUID
 *`kibana.stats.name`*::
 +
 --
-type: text
+type: keyword
 
 Kibana instance name
 
@@ -14736,7 +14736,7 @@ type: boolean
 *`mongodb.metrics.replication.executor.network_interface`*::
 +
 --
-type: text
+type: keyword
 
 --
 
@@ -18967,7 +18967,7 @@ The user (PHP_AUTH_USER) (or - if not set) (for the current request)
 *`php_fpm.process.script`*::
 +
 --
-type: text
+type: keyword
 
 The main script called (or - if not set) (for the current request)
 

diff --git a/metricbeat/module/ceph/cluster_disk/_meta/data.json b/metricbeat/module/ceph/cluster_disk/_meta/data.json
@@ -1,26 +1,32 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "beat": {
+    "agent": {
         "hostname": "host.example.com",
         "name": "host.example.com"
     },
     "ceph": {
         "cluster_disk": {
             "available": {
-                "bytes": 50847313920
+                "bytes": 0
             },
             "total": {
-                "bytes": 67371577344
+                "bytes": 0
             },
             "used": {
-                "bytes": 13071564800
+                "bytes": 0
             }
         }
     },
+    "event": {
+        "dataset": "ceph.cluster_disk",
+        "duration": 115000,
+        "module": "ceph"
+    },
     "metricset": {
-        "host": "ceph:5000",
-        "module": "ceph",
-        "name": "cluster_disk",
-        "rtt": 115
+        "name": "cluster_disk"
+    },
+    "service": {
+        "address": "127.0.0.1:5000",
+        "type": "ceph"
     }
 }
diff --git a/metricbeat/module/ceph/cluster_health/_meta/data.json b/metricbeat/module/ceph/cluster_health/_meta/data.json
@@ -1,12 +1,12 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "beat": {
+    "agent": {
         "hostname": "host.example.com",
         "name": "host.example.com"
     },
     "ceph": {
         "cluster_health": {
-            "overall_status": "HEALTH_WARN",
+            "overall_status": "HEALTH_OK",
             "timechecks": {
                 "epoch": 3,
                 "round": {
@@ -16,10 +16,16 @@
             }
         }
     },
+    "event": {
+        "dataset": "ceph.cluster_health",
+        "duration": 115000,
+        "module": "ceph"
+    },
     "metricset": {
-        "host": "ceph:5000",
-        "module": "ceph",
-        "name": "cluster_health",
-        "rtt": 115
+        "name": "cluster_health"
+    },
+    "service": {
+        "address": "127.0.0.1:5000",
+        "type": "ceph"
     }
 }
diff --git a/metricbeat/module/ceph/cluster_status/_meta/data.json b/metricbeat/module/ceph/cluster_status/_meta/data.json
@@ -1,6 +1,6 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "beat": {
+    "agent": {
         "hostname": "host.example.com",
         "name": "host.example.com"
     },
@@ -17,33 +17,39 @@
                 "total": 0
             },
             "osd": {
-                "epoch": 18,
+                "epoch": 3,
                 "full": false,
-                "in_osd_count": 1,
+                "in_osd_count": 0,
                 "nearfull": false,
                 "osd_count": 1,
                 "remapped_pg_count": 0,
-                "up_osd_count": 1
+                "up_osd_count": 0
             },
             "pg": {
-                "avail_bytes": 50847313920,
-                "data_bytes": 3656,
-                "total_bytes": 67371577344,
-                "used_bytes": 13071564800
+                "avail_bytes": 0,
+                "data_bytes": 0,
+                "total_bytes": 0,
+                "used_bytes": 0
             },
             "traffic": {
                 "read_bytes": 0,
                 "read_op_per_sec": 0,
                 "write_bytes": 0,
                 "write_op_per_sec": 0
             },
-            "version": 32
+            "version": 4
         }
     },
+    "event": {
+        "dataset": "ceph.cluster_status",
+        "duration": 115000,
+        "module": "ceph"
+    },
     "metricset": {
-        "host": "ceph:5000",
-        "module": "ceph",
-        "name": "cluster_status",
-        "rtt": 115
+        "name": "cluster_status"
+    },
+    "service": {
+        "address": "127.0.0.1:5000",
+        "type": "ceph"
     }
 }
diff --git a/metricbeat/module/ceph/fields.go b/metricbeat/module/ceph/fields.go
diff --git a/metricbeat/module/ceph/monitor_health/_meta/data.json b/metricbeat/module/ceph/monitor_health/_meta/data.json
@@ -1,18 +1,18 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "beat": {
+    "agent": {
         "hostname": "host.example.com",
         "name": "host.example.com"
     },
     "ceph": {
         "monitor_health": {
             "available": {
-                "kb": 49653688,
-                "pct": 75
+                "kb": 46814916,
+                "pct": 76
             },
             "health": "HEALTH_OK",
-            "last_updated": "2017-12-07T07:26:33.344939Z",
-            "name": "93c038136d94",
+            "last_updated": "2019-01-25T12:37:24.921587Z",
+            "name": "f0e2841bb524",
             "store_stats": {
                 "last_updated": "0.000000",
                 "log": {
@@ -22,24 +22,30 @@
                     "bytes": 65552
                 },
                 "sst": {
-                    "bytes": 726
+                    "bytes": 1087
                 },
                 "total": {
-                    "bytes": 2097894
+                    "bytes": 2098255
                 }
             },
             "total": {
-                "kb": 65792556
+                "kb": 61255492
             },
             "used": {
-                "kb": 12767092
+                "kb": 11299252
             }
         }
     },
+    "event": {
+        "dataset": "ceph.monitor_health",
+        "duration": 115000,
+        "module": "ceph"
+    },
     "metricset": {
-        "host": "ceph:5000",
-        "module": "ceph",
-        "name": "monitor_health",
-        "rtt": 115
+        "name": "monitor_health"
+    },
+    "service": {
+        "address": "127.0.0.1:5000",
+        "type": "ceph"
     }
 }
diff --git a/metricbeat/module/ceph/osd_df/_meta/data.json b/metricbeat/module/ceph/osd_df/_meta/data.json
@@ -1,25 +1,30 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "beat": {
+    "agent": {
         "hostname": "host.example.com",
         "name": "host.example.com"
     },
     "ceph": {
         "osd_df": {
-            "available.byte": 49655580,
+            "available.byte": 0,
             "device_class": "",
             "id": 0,
             "name": "osd.0",
-            "pg_num": 120,
-            "total.byte": 65792556,
-            "used.byte": 12765200,
-            "used.pct": 0.1940219498388237
+            "pg_num": 0,
+            "total.byte": 0,
+            "used.byte": 0
         }
     },
+    "event": {
+        "dataset": "ceph.osd_df",
+        "duration": 115000,
+        "module": "ceph"
+    },
     "metricset": {
-        "host": "ceph:5000",
-        "module": "ceph",
-        "name": "osd_df",
-        "rtt": 115
+        "name": "osd_df"
+    },
+    "service": {
+        "address": "127.0.0.1:5000",
+        "type": "ceph"
     }
 }
diff --git a/metricbeat/module/ceph/osd_df/_meta/fields.yml b/metricbeat/module/ceph/osd_df/_meta/fields.yml
@@ -9,7 +9,7 @@
       description: >
         osd node id
     - name: name
-      type: text
+      type: keyword
       description: >
         osd node name
     - name: device_class

diff --git a/metricbeat/module/ceph/osd_tree/_meta/data.json b/metricbeat/module/ceph/osd_tree/_meta/data.json
@@ -1,23 +1,31 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "beat": {
+    "agent": {
         "hostname": "host.example.com",
         "name": "host.example.com"
     },
     "ceph": {
         "osd_tree": {
-            "children": "-2",
+            "children": [
+                "-2"
+            ],
             "father": "",
             "id": -1,
             "name": "default",
             "type": "root",
             "type_id": 10
         }
     },
+    "event": {
+        "dataset": "ceph.osd_tree",
+        "duration": 115000,
+        "module": "ceph"
+    },
     "metricset": {
-        "host": "ceph:5000",
-        "module": "ceph",
-        "name": "osd_tree",
-        "rtt": 115
+        "name": "osd_tree"
+    },
+    "service": {
+        "address": "127.0.0.1:5000",
+        "type": "ceph"
     }
 }