Update templates with valid fields (#1500)

Add field validation to generation script Add Nested document support
elastic · Apr 27, 2016 · 42dbe6d · 42dbe6d
1 parent 498a22f
commit 42dbe6d
Show file tree

Hide file tree

Showing 12 changed files with 219 additions and 80 deletions.
diff --git a/libbeat/scripts/generate_template.py b/libbeat/scripts/generate_template.py
@@ -156,15 +156,15 @@ def fill_field_properties(field, defaults, path):
         }
 
     elif field["type"] in ["geo_point", "date", "long", "integer",
-                           "double", "float", "keyword"]:
+                           "double", "float", "keyword", "boolean"]:
         properties[field["name"]] = {
             "type": field.get("type")
         }
         if field["type"] == "keyword":
             properties[field["name"]]["ignore_above"] = \
                 defaults.get("ignore_above", 1024)
 
-    elif field["type"] == "dict":
+    elif field["type"] in ["dict", "list"]:
         if field.get("dict-type") == "keyword":
             # add a dynamic template to set all members of
             # the dict as keywords
@@ -198,6 +198,21 @@ def fill_field_properties(field, defaults, path):
             properties[field.get("name")]["properties"] = prop
 
         dynamic_templates.extend(dynamic)
+    elif field.get("type") == "nested":
+        if len(path) > 0:
+            path = path + "." + field["name"]
+        else:
+            path = field["name"]
+        prop, dynamic = fill_section_properties(field, defaults, path)
+
+        # Only add properties if they have a content
+        if len(prop) is not 0:
+            properties[field.get("name")] = {"type": "nested", "properties": {}}
+            properties[field.get("name")]["properties"] = prop
+
+        dynamic_templates.extend(dynamic)
+    else:
+        raise ValueError("Unkown type found: " + field.get("type"))
 
     return properties, dynamic_templates
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -105,7 +105,7 @@ Apache HTTPD server metrics collected from the mod_status module.
 
 ==== apache-status.hostname
 
-type: string
+type: keyword
 
 Apache hostname
 
@@ -426,7 +426,7 @@ Redis cluster information
 
 ==== redis-info.cluster.cluster_enabled
 
-type: bool
+type: boolean
 
 Indicate Redis cluster is enabled
 

diff --git a/metricbeat/etc/fields.yml b/metricbeat/etc/fields.yml
@@ -84,7 +84,7 @@ apache:
         page.
       fields:
         - name: hostname
-          type: string
+          type: keyword
           description: >
             Apache hostname
         - name: totalAccesses
@@ -326,7 +326,7 @@ redis:
             Redis cluster information
           fields:
             - name: cluster_enabled
-              type: bool
+              type: boolean
               description: >
                 Indicate Redis cluster is enabled
 

diff --git a/metricbeat/metricbeat.template.json b/metricbeat/metricbeat.template.json
@@ -67,6 +67,10 @@
                 }
               }
             },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "idleWorkers": {
               "type": "integer"
             },
@@ -210,6 +214,13 @@
                 }
               }
             },
+            "cluster": {
+              "properties": {
+                "cluster_enabled": {
+                  "type": "boolean"
+                }
+              }
+            },
             "cpu": {
               "properties": {
                 "used_cpu_sys": {

diff --git a/metricbeat/module/apache/status/fields.yml b/metricbeat/module/apache/status/fields.yml
@@ -5,7 +5,7 @@
     page.
   fields:
     - name: hostname
-      type: string
+      type: keyword
       description: >
         Apache hostname
     - name: totalAccesses

diff --git a/metricbeat/module/redis/info/fields.yml b/metricbeat/module/redis/info/fields.yml
@@ -35,7 +35,7 @@
         Redis cluster information
       fields:
         - name: cluster_enabled
-          type: bool
+          type: boolean
           description: >
             Indicate Redis cluster is enabled