[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]}"
}
}
diff --git a/voltha/requirements.yaml b/voltha/requirements.yaml
index c3a9621..2f6a091 100644
--- a/voltha/requirements.yaml
+++ b/voltha/requirements.yaml
@@ -21,7 +21,3 @@
version: 1.3.5
repository: https://kubernetes-charts.storage.googleapis.com/
condition: consul.enabled
-- name: kafka
- version: 0.4.7
- repository: https://kubernetes-charts-incubator.storage.googleapis.com/
- condition: kafka.enabled
\ No newline at end of file
diff --git a/voltha/values.yaml b/voltha/values.yaml
index a6743fa..41b0e30 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -48,14 +48,6 @@
port: 50555
targetPort: 50555
-kafka:
- enabled: false
- persistence:
- enabled: false
- zookeeper:
- persistence:
- enabled: false
-
etcd:
operator:
enabled: true
@@ -64,7 +56,7 @@
size: 1
createEtcdClusterCRD: true
-kafkaReleaseName: voltha-kafka
+kafkaReleaseName: cord-kafka
etcdReleaseName: voltha-etcd
consul: