Merge pull request #2260 from jcantrill/log2972

LOG-2972: Update index templates to make labels/namespace_labels nested

Author: openshift-merge-robot

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

@@ -585,57 +585,25 @@ type: text
 The name of the container in Kubernetes.
 
 
+==== kubernetes.annotations
 
-'''
-[[exported-fields-kubernetes.annotations]]
-=== [big]*kubernetes.annotations Fields*
+type: nested
 
 Annotations associated with the OpenShift object
 
 
+==== kubernetes.labels
 
-'''
-[[exported-fields-kubernetes.labels]]
-=== [big]*kubernetes.labels Fields*
-
-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.
-
-
-
-==== kubernetes.labels.deployment
-
-type: keyword
-
-example: logging-kibana-3
-
-The deployment associated with this Kubernetes object
-
-
-==== kubernetes.labels.deploymentconfig
-
-type: keyword
-
-example: logging-kibana
-
-The deploymentconfig associated with this Kubernetes object
-
-
-==== kubernetes.labels.component
-
-type: keyword
-
-example: kibana
-
-The component associated with this Kubernetes object
+type: nested
 
+Labels attached to the OpenShift object Each label name is a subfield of labels field.
 
-==== kubernetes.labels.provider
 
-type: keyword
+==== kubernetes.namespace_labels
 
-example: openshift
+type: nested
 
-The provider associated with this Kubernetes object
+Labels attached to the namespace in which the openshift object is deployed Each label name is a subfield of labels field.
 
 
 

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

@@ -585,57 +585,25 @@ type: text
 The name of the container in Kubernetes.
 
 
+==== kubernetes.annotations
 
-'''
-[[exported-fields-kubernetes.annotations]]
-=== [big]*kubernetes.annotations Fields*
+type: nested
 
 Annotations associated with the OpenShift object
 
 
+==== kubernetes.labels
 
-'''
-[[exported-fields-kubernetes.labels]]
-=== [big]*kubernetes.labels Fields*
-
-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.
-
-
-
-==== kubernetes.labels.deployment
-
-type: keyword
-
-example: logging-kibana-3
-
-The deployment associated with this Kubernetes object
-
-
-==== kubernetes.labels.deploymentconfig
-
-type: keyword
-
-example: logging-kibana
-
-The deploymentconfig associated with this Kubernetes object
-
-
-==== kubernetes.labels.component
-
-type: keyword
-
-example: kibana
-
-The component associated with this Kubernetes object
+type: nested
 
+Labels attached to the OpenShift object Each label name is a subfield of labels field.
 
-==== kubernetes.labels.provider
 
-type: keyword
+==== kubernetes.namespace_labels
 
-example: openshift
+type: nested
 
-The provider associated with this Kubernetes object
+Labels attached to the namespace in which the openshift object is deployed Each label name is a subfield of labels field.
 
 
 

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

@@ -250,6 +250,9 @@
         },
         "kubernetes": {
           "properties": {
+            "annotations": {
+              "type": "nested"
+            },
             "container_name": {
               "doc_values": false,
               "fields": {
@@ -375,36 +378,7 @@
               "type": "keyword"
             },
             "labels": {
-              "properties": {
-                "component": {
-                  "doc_values": true,
-                  "index": true,
-                  "type": "keyword"
-                },
-                "deployment": {
-                  "doc_values": true,
-                  "index": true,
-                  "type": "keyword"
-                },
-                "deploymentconfig": {
-                  "doc_values": true,
-                  "fields": {
-                    "raw": {
-                      "doc_values": true,
-                      "ignore_above": 64,
-                      "index": true,
-                      "type": "keyword"
-                    }
-                  },
-                  "index": true,
-                  "type": "keyword"
-                },
-                "provider": {
-                  "doc_values": true,
-                  "index": true,
-                  "type": "keyword"
-                }
-              }
+              "type": "nested"
             },
             "master_url": {
               "doc_values": true,
@@ -417,6 +391,9 @@
               "norms": true,
               "type": "keyword"
             },
+            "namespace_labels": {
+              "type": "nested"
+            },
             "namespace_name": {
               "doc_values": true,
               "index": true,

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

@@ -249,6 +249,9 @@
         },
         "kubernetes": {
           "properties": {
+            "annotations": {
+              "type": "nested"
+            },
             "container_name": {
               "doc_values": false,
               "fields": {
@@ -374,36 +377,7 @@
               "type": "keyword"
             },
             "labels": {
-              "properties": {
-                "component": {
-                  "doc_values": true,
-                  "index": true,
-                  "type": "keyword"
-                },
-                "deployment": {
-                  "doc_values": true,
-                  "index": true,
-                  "type": "keyword"
-                },
-                "deploymentconfig": {
-                  "doc_values": true,
-                  "fields": {
-                    "raw": {
-                      "doc_values": true,
-                      "ignore_above": 64,
-                      "index": true,
-                      "type": "keyword"
-                    }
-                  },
-                  "index": true,
-                  "type": "keyword"
-                },
-                "provider": {
-                  "doc_values": true,
-                  "index": true,
-                  "type": "keyword"
-                }
-              }
+              "type": "nested"
             },
             "master_url": {
               "doc_values": true,
@@ -416,6 +390,9 @@
               "norms": true,
               "type": "keyword"
             },
+            "namespace_labels": {
+              "type": "nested"
+            },
             "namespace_name": {
               "doc_values": true,
               "index": true,