Minor update on beat specs.

Adapted scripts to work with ES 2.2.

Author: altenhof

cf-java-logging-support-core/beats/app-logs/docs/fields.asciidoc

@@ -232,7 +232,7 @@ type: string
 required: True
 
 To make the message self-contained this is the type tag.
-As we're talking about log messages, it's always "app-logs".
+As we're talking about log messages, it's always "logs".
 
 
 [[exported-fields-app-logs]]

cf-java-logging-support-core/beats/app-logs/etc/app-logs.template.json

@@ -2,7 +2,8 @@
   "mappings": {
     "_default_": {
       "_all": {
-        "enabled": false
+        "enabled": true,
+        "omit_norms": true
       },
       "dynamic_templates": [
         {

cf-java-logging-support-core/beats/app-logs/etc/fields.yml

@@ -176,7 +176,7 @@ ctx:
       required: true
       description: |
         To make the message self-contained this is the type tag.
-        As we're talking about log messages, it's always "app-logs".
+        As we're talking about log messages, it's always "logs".
 
 app-logs:
   type: group

cf-java-logging-support-core/beats/request-metrics/docs/fields.asciidoc

@@ -255,7 +255,7 @@ type: string
 required: True
 
 To make the message self-contained this is the type tag.
-As we're talking about request metrics messages, it's always "request-metrics".
+As we're talking about request metrics messages, it's always "request".
 
 
 [[exported-fields-request-metrics]]

cf-java-logging-support-core/beats/request-metrics/etc/fields.yml

@@ -194,7 +194,7 @@ ctx:
       required: true
       description: |
         To make the message self-contained this is the type tag.
-        As we're talking about request metrics messages, it's always "request-metrics".
+        As we're talking about request metrics messages, it's always "request".
 
 request-metrics:
   type: group

cf-java-logging-support-core/beats/request-metrics/etc/request-metrics.template.json

@@ -2,7 +2,8 @@
   "mappings": {
     "_default_": {
       "_all": {
-        "enabled": false
+        "enabled": true,
+        "omit_norms": true
       },
       "dynamic_templates": [
         {

cf-java-logging-support-core/beats/scripts/generate_template.py

@@ -49,7 +49,8 @@ def fields_to_es_template(input, output, index):
         "mappings": {
             "_default_": {
                 "_all": {
-                    "enabled": False
+                    "omit_norms": True,
+                    "enabled": True
                 },
                 "properties": {},
                 "dynamic_templates": [{
@@ -78,7 +79,7 @@ def fields_to_es_template(input, output, index):
     template["mappings"]["_default_"]["properties"] = properties
     #
     # Add these two "defaults"
-    # THIS IS SUPER IMPORTANT FOR US, OTHERWISE ES MAY CHOKE 
+    # THIS IS SUPER IMPORTANT FOR US, OTHERWISE ES MAY CHOKE
     #
     template["mappings"]["_default_"]["properties"]["@message"] = {
         "type": "string",