[SEBA-220]

Merge kafka busses
Have logstash only read off cord-kafka bus
Include kafka key information in logstash output

Change-Id: Ic4b3adb88b5c886cd904ec20572b483cbb39b36a
diff --git a/logging/values.yaml b/logging/values.yaml
index a3c0690..b330443 100644
--- a/logging/values.yaml
+++ b/logging/values.yaml
@@ -81,19 +81,9 @@
           consumer_threads => 1
           decorate_events => true
           metadata_max_age_ms => 60000 # recheck for new topics every minute
-          topics_pattern => 'authentication.*|dhcp.*|onos.*|onu.*|xos.*'
+          topics_pattern => 'authentication.*|dhcp.*|onos.*|onu.*|voltha.*|xos.*'
           type => "cord-kafka"
         }
-        kafka {
-          bootstrap_servers => "voltha-kafka:9092"
-          client_id => "logstash_vk"
-          codec => json { charset => "UTF-8" }
-          consumer_threads => 1
-          decorate_events => true
-          metadata_max_age_ms => 60000 # recheck for new topics every minute
-          topics_pattern => 'voltha.*'
-          type => "voltha-kafka"
-        }
       }
 
   filters:
@@ -102,6 +92,7 @@
         mutate {
           add_field => {
             "kafka_topic" => "%{[@metadata][kafka][topic]}"
+            "kafka_key" => "%{[@metadata][kafka][key]}"
             "kafka_timestamp" => "%{[@metadata][kafka][timestamp]}"
           }
         }