From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Fri, 4 May 2018 19:26:06 +0000 (+0000)
Subject: Merge "nsPrefix changes in msb"
X-Git-Tag: 2.0.0-ONAP~185
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7d3dd562394cee0c9518bbc75c502c4456539f6b;hp=e3610e451bc7f63d6a299d0337f74035204f0891;p=oom.git

Merge "nsPrefix changes in msb"
---

diff --git a/kubernetes/msb/resources/config/log/filebeat/filebeat.yml b/kubernetes/msb/resources/config/log/filebeat/filebeat.yml
index 89c6932577..0bc14ea908 100644
--- a/kubernetes/msb/resources/config/log/filebeat/filebeat.yml
+++ b/kubernetes/msb/resources/config/log/filebeat/filebeat.yml
@@ -21,7 +21,7 @@ output.logstash:
   #List of logstash server ip addresses with port number.
   #But, in our case, this will be the loadbalancer IP address.
   #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately.
-  hosts: ["logstash.{{.Values.nsPrefix}}:5044"]
+  hosts: ["{{.Values.config.logstashServiceName}}:{{.Values.config.logstashPort}}"]
   #If enable will do load balancing among availabe Logstash, automatically.
   loadbalance: true
 
diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index 2a0dbe2ffa..d9de3fa97e 100644
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -20,3 +20,9 @@ global:
   repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
+
+# application configuration
+config:
+  logstashServiceName: log-ls
+  logstashPort: 5044
+