X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2Flog%2Fcharts%2Flog-kibana%2Fresources%2Fconfig%2Fkibana.yml;fp=kubernetes%2Flog%2Fresources%2Fkibana%2Fconf%2Fkibana.yml;h=5171ad4cdbc17c764a0a8d8331a84bb2406ec05f;hp=df0d71ababc5558a9f0e43194625773bfd9719bc;hb=5f3b6196c84e31c76c5583b25549d50400fe63d3;hpb=4e4b97524ca8731bbb2b3080ca85b139f0096ce5

diff --git a/kubernetes/log/resources/kibana/conf/kibana.yml b/kubernetes/log/charts/log-kibana/resources/config/kibana.yml
similarity index 95%
rename from kubernetes/log/resources/kibana/conf/kibana.yml
rename to kubernetes/log/charts/log-kibana/resources/config/kibana.yml
index df0d71abab..5171ad4cdb 100644
--- a/kubernetes/log/resources/kibana/conf/kibana.yml
+++ b/kubernetes/log/charts/log-kibana/resources/config/kibana.yml
@@ -11,7 +11,7 @@ xpack.security.enabled: false
 xpack.watcher.enabled: false
 #Set to false to disable Watcher.
 # Kibana is served by a back end server. This setting specifies the port to use.
-server.port: 5601
+server.port: {{.Values.service.externalPort}}
 
 # Specifies the address to which the Kibana server will bind. IP addresses and host names are both valid values.
 # The default is 'localhost', which usually means remote machines will not be able to connect.
@@ -30,10 +30,7 @@ server.host: "0"
 server.name: "Kibana"
 
 # The URL of the Elasticsearch instance to use for all your queries.
-# OOM-427, OOM-441 hardcoded onap workspace to avoid helm upgrade past 2.3
-elasticsearch.url: "http://elasticsearch.{{.Values.nsPrefix}}:9200"
-#elasticsearch-service.{{.Values.nsPrefix}}:9200"
-#elasticsearch.url: "http://10.247.47.3:9200"
+elasticsearch.url: "http://{{.Values.config.elasticsearchServiceName}}.{{.Release.Namespace}}:{{.Values.config.elasticsearchPort}}"
 # When this setting's value is true Kibana uses the hostname specified in the server.host
 # setting. When the value of this setting is false, Kibana uses the hostname of the host
 # that connects to this Kibana instance.