fix some minor formatting issues; remove old asciidoc

The generate script should ignore the group name "Default" for the
purpose of generating the structure used in the index template and
pattern.
Rearranged the kubernetes fields to make more sense in the asciidoc.
Removed the old asciidoc from git.

Author: richm

namespaces/kubernetes.yml

@@ -12,14 +12,6 @@ namespace:
     description: >
       The name of the pod
 
-  - name: labels
-    type: group
-    description: >
-      Labels attached to the OpenShift object
-      Each label name is a subfield of labels field.
-      Each label name is de-dotted: dots in the name are replaced with
-      underscores.
-
   - name: pod_id
     type: string
     norms:
@@ -58,5 +50,13 @@ namespace:
     description: >
       Annotations associated with the OpenShift object
 
+  - name: labels
+    type: group
+    description: >
+      Labels attached to the OpenShift object
+      Each label name is a subfield of labels field.
+      Each label name is de-dotted: dots in the name are replaced with
+      underscores.
+
 doc_sections:
   - ["pod_log", "Openshift logging metadata"]

namespaces/systemd.yml

@@ -111,7 +111,7 @@ namespace:
 
     - name: SOURCE_REALTIME_TIMESTAMP
       type: string
-      description: >
+      description: |
         https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html#_SOURCE_REALTIME_TIMESTAMP=
         This is converted to RFC 3339 NS format
 

scripts/concat-index-pattern-fields.py

@@ -27,3 +27,4 @@ def removedupnames(fieldary):
             docfieldary = removedupnames(json.loads(doc['fields']))
             doc['fields'] = json.dumps(docfieldary)
 sys.stdout.write(json.dumps(doc, indent=4, sort_keys=True, separators=(',', ': ')))
+sys.stdout.write('\n')

scripts/generate_template.py

@@ -62,7 +62,7 @@ def object_types_to_template(template_definition, output, output_index_pattern,
     # in the group, and other settings applicable to groups such as
     # include_in_all, etc.
     skeleton['mappings']['_default_'].update(traverse_group_section(
-        default_mapping, default_mapping_yml['field_defaults'], process_leaf))
+        default_mapping, default_mapping_yml['field_defaults'], process_leaf, True))
 
     add_type_version(default_mapping_yml["version"],
                      skeleton['mappings']['_default_'])
@@ -90,7 +90,7 @@ def object_types_to_template(template_definition, output, output_index_pattern,
     skeleton_index_pattern["description"] = skeleton_index_pattern["description"].replace("<the_index_type>", template_definition['elasticsearch_template']['index_pattern'])
     # get fields
     index_pattern_fields = (traverse_group_section_index_pattern(
-        default_mapping, default_mapping_yml['field_defaults'], process_leaf_index_pattern))
+        default_mapping, default_mapping_yml['field_defaults'], process_leaf_index_pattern, None, True))
     skeleton_index_pattern["fields"] = json.dumps(index_pattern_fields)
     json.dump(
         skeleton_index_pattern, output_index_pattern, indent=2, separators=(',', ': '), sort_keys=True)
@@ -119,7 +119,7 @@ def add_index_template_fields(rec):
     return ret
 
 
-def traverse_group_section(group, leaf_defaults, leaf_handler):
+def traverse_group_section(group, leaf_defaults, leaf_handler, toplevel=False):
     """
     Traverse the sections tree and fill in the properties
     map.
@@ -135,10 +135,10 @@ def traverse_group_section(group, leaf_defaults, leaf_handler):
         parameters
     """
     field = add_index_template_fields(group)
-    if 'name' in group:
-        ret = {group['name']: field}
-    else:
+    if toplevel or not 'name' in group:
         ret = field
+    else:
+        ret = {group['name']: field}
     if group['type'] == 'group':
         fieldskey = 'properties'
         del field['type']
@@ -190,7 +190,7 @@ def process_leaf(field, defaults):
         print("Unknown field. Skipped adding field {}".format(field))
 
 
-def traverse_group_section_index_pattern(group, defaults, leaf_handler, groupname=None):
+def traverse_group_section_index_pattern(group, defaults, leaf_handler, groupname=None, toplevel=False):
     """
     Traverse the sections tree and fill in the index pattern fields
     map.
@@ -208,6 +208,8 @@ def traverse_group_section_index_pattern(group, defaults, leaf_handler, groupnam
         for field in group["fields"]:
             if groupname:
                 subgroupname = groupname + "." + group["name"]
+            elif toplevel:
+                subgroupname = None
             else:
                 subgroupname = group.get("name", None)
             if field.get("type") == "group":