Merge pull request #780 from richm/viaq-0.0.12

Automatic merge from submit-queue.

Bug 1494912 - metrics indexes should not save the _source

https://bugzilla.redhat.com/show_bug.cgi?id=1494912
Completely disable the _source and _all for ovirt-metrics-*
/test

docs/com.redhat.viaq-openshift-operations.asciidoc

@@ -822,6 +822,69 @@ type: string
 Docker container id
 
 
+==== docker.container_id_short
+
+type: string
+
+Short container id, assigned by the container engine
+
+
+==== docker.sauid
+
+type: string
+
+Sent login user id
+
+
+==== docker.container_image
+
+type: string
+
+Name of the image
+
+
+==== docker.pid
+
+type: string
+
+The process id
+
+
+==== docker.user
+
+type: string
+
+User under which the container process runs
+
+
+==== docker.command
+
+type: string
+
+Name of the command
+
+
+==== docker.reason
+
+type: string
+
+Action that triggered this event
+
+
+==== docker.operation
+
+type: string
+
+Operation carried out
+
+
+==== docker.result
+
+type: string
+
+Result of the action
+
+
 
 '''
 [[exported-fields-pipeline_metadata]]

docs/com.redhat.viaq-openshift-project.asciidoc

@@ -822,6 +822,69 @@ type: string
 Docker container id
 
 
+==== docker.container_id_short
+
+type: string
+
+Short container id, assigned by the container engine
+
+
+==== docker.sauid
+
+type: string
+
+Sent login user id
+
+
+==== docker.container_image
+
+type: string
+
+Name of the image
+
+
+==== docker.pid
+
+type: string
+
+The process id
+
+
+==== docker.user
+
+type: string
+
+User under which the container process runs
+
+
+==== docker.command
+
+type: string
+
+Name of the command
+
+
+==== docker.reason
+
+type: string
+
+Action that triggered this event
+
+
+==== docker.operation
+
+type: string
+
+Operation carried out
+
+
+==== docker.result
+
+type: string
+
+Result of the action
+
+
 
 '''
 [[exported-fields-pipeline_metadata]]

elasticsearch/index_templates/com.redhat.viaq-openshift-operations.template.json

@@ -3,7 +3,7 @@
   "mappings": {
     "_default_": {
       "_meta": {
-        "version": "2017.09.06.0"
+        "version": "2017.11.11.0"
       },
       "date_detection": false,
       "dynamic_templates": [
@@ -130,10 +130,55 @@
         },
         "docker": {
           "properties": {
+            "command": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
             "container_id": {
               "doc_values": true,
               "index": "not_analyzed",
               "type": "string"
+            },
+            "container_id_short": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "container_image": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "operation": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "pid": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "reason": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "result": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "sauid": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "user": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
             }
           }
         },

elasticsearch/index_templates/com.redhat.viaq-openshift-project.template.json

@@ -3,7 +3,7 @@
   "mappings": {
     "_default_": {
       "_meta": {
-        "version": "2017.09.06.0"
+        "version": "2017.11.11.0"
       },
       "date_detection": false,
       "dynamic_templates": [
@@ -130,10 +130,55 @@
         },
         "docker": {
           "properties": {
+            "command": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
             "container_id": {
               "doc_values": true,
               "index": "not_analyzed",
               "type": "string"
+            },
+            "container_id_short": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "container_image": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "operation": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "pid": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "reason": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "result": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "sauid": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
+            },
+            "user": {
+              "doc_values": true,
+              "index": "not_analyzed",
+              "type": "string"
             }
           }
         },

elasticsearch/index_templates/org.ovirt.viaq-collectd.template.json

@@ -2,13 +2,14 @@
   "aliases": {},
   "mappings": {
     "_default_": {
+      "_all": {
+        "enabled": false
+      },
       "_meta": {
-        "version": "2017.09.06.0"
+        "version": "2017.11.11.0"
       },
       "_source": {
-        "excludes": [
-          "collectd.*"
-        ]
+        "enabled": false
       },
       "date_detection": false,
       "dynamic_templates": [