From 6b5132bfeaa2b836367c5a5b9ff51b615289d46a Mon Sep 17 00:00:00 2001
From: d34dh0r53 <david.wilde@rackspace.com>
Date: Mon, 22 Sep 2014 15:26:51 -0500
Subject: [PATCH] Added filters and Kibana configuration for heat logs

---
 .../roles/kibana/templates/Next-Gen-RPC.json       | 14 ++++++++++++--
 .../roles/logstash/templates/03-generic.conf       | 11 +++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/rpc_deployment/roles/kibana/templates/Next-Gen-RPC.json b/rpc_deployment/roles/kibana/templates/Next-Gen-RPC.json
index da60e4a8ae..781f21160a 100644
--- a/rpc_deployment/roles/kibana/templates/Next-Gen-RPC.json
+++ b/rpc_deployment/roles/kibana/templates/Next-Gen-RPC.json
@@ -65,6 +65,15 @@
           "type": "lucene",
           "enable": true,
           "query": "tags:rsyslog*"
+        },
+        "7": {
+          "id": 7,
+          "color": "#BA43A9",
+          "alias": "",
+          "pin": false,
+          "type": "lucene",
+          "enable": true,
+          "query": "tags:heat*"
         }
       },
       "ids": [
@@ -74,7 +83,8 @@
         3,
         4,
         5,
-        6
+        6,
+        7
       ]
     },
     "filter": {
@@ -467,4 +477,4 @@
     "hide": false
   },
   "refresh": false
-}
\ No newline at end of file
+}
diff --git a/rpc_deployment/roles/logstash/templates/03-generic.conf b/rpc_deployment/roles/logstash/templates/03-generic.conf
index b3fb6defcf..9ba41d2568 100644
--- a/rpc_deployment/roles/logstash/templates/03-generic.conf
+++ b/rpc_deployment/roles/logstash/templates/03-generic.conf
@@ -93,8 +93,6 @@ filter {
         }
         #-----------------------------------------------------------------------
         # Parse & tag generic glance logs
-        # i.e.:
-        # 1) neutron.log: 2014-06-11 16:00:30.546 4131 INFO cinder.api.openstack.wsgi [-] http://10.127.26.62:8776/ returned with HTTP 200
         grok {
             match => ["os_program", "glance.%{GREEDYDATA:os_program_path}"]
             add_tag => [ "glance-generic" ]
@@ -102,6 +100,15 @@ filter {
             tag_on_failure => []
         }
 
+        #-----------------------------------------------------------------------
+        # Parse & tag generic heat logs
+        grok {
+            match => ["os_program", "heat.%{GREEDYDATA:os_program_path}"]
+            add_tag => [ "heat-generic" ]
+            break_on_match => false
+            tag_on_failure => []
+        }
+
         #-----------------------------------------------------------------------
         # Generic Apache log (primarily GET/POST requests as seen in keystone)
         # i.e.: