From d6eba5f8fa979e29e434225e98bc046d42dfb526 Mon Sep 17 00:00:00 2001
From: Swann Croiset <scroiset@mirantis.com>
Date: Wed, 22 Feb 2017 17:56:03 +0100
Subject: [PATCH] Fix index template for log messages

Change-Id: I7c00d4acf999709551076a918bb1956d1ce4b973
---
 elasticsearch/files/es_template_log.json | 49 ++++++++++--------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/elasticsearch/files/es_template_log.json b/elasticsearch/files/es_template_log.json
index 1c3e7fb..7ea2124 100644
--- a/elasticsearch/files/es_template_log.json
+++ b/elasticsearch/files/es_template_log.json
@@ -38,22 +38,10 @@
                     "index": "not_analyzed",
                     "type": "string"
                 },
-                "openstack_roles": {
-                    "type": "string",
-                    "analyzer": "ost_roles"
-                },
                 "openstack_region": {
                     "index": "not_analyzed",
                     "type": "string"
                 },
-                "openstack_release": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
-                "deployment_id": {
-                    "index": "not_analyzed",
-                    "type": "string"
-                },
                 "request_id": {
                     "index": "not_analyzed",
                     "type": "string"
@@ -84,6 +72,26 @@
                     "index": "not_analyzed",
                     "type": "string"
                 },
+                "http_client_ip_address": {
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "remote_addr": {
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "user_agent_browser": {
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "http_referer": {
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
+                "user_agent_os": {
+                    "index": "not_analyzed",
+                    "type": "string"
+                },
                 "http_version": {
                     "index": "not_analyzed",
                     "type": "string"
@@ -91,22 +99,5 @@
             }
         }
     },
-    "settings": {
-        "analysis": {
-            "tokenizer": {
-                 "comma" : {
-                     "type": "pattern",
-                     "pattern": ","
-                 }
-            },
-            "analyzer": {
-                 "ost_roles": {
-                     "type": "custom",
-                     "tokenizer": "comma",
-                     "filter": ["lowercase"]
-                 }
-            }
-        }
-    },
     "template": "log-*"
 }
-- 
2.32.7