fixed kibana and logstash connection to es
Change-Id: If140f2fb65a5668c8f71d4beeea086ab2c07999e
Issue-ID: OOM-420
Signed-off-by: Kerenj <keren.joseph@amdocs.com>
diff --git a/kubernetes/log/resources/kibana/conf/kibana.yml b/kubernetes/log/resources/kibana/conf/kibana.yml
index 0f72daa..3bdb2fe 100644
--- a/kubernetes/log/resources/kibana/conf/kibana.yml
+++ b/kubernetes/log/resources/kibana/conf/kibana.yml
@@ -30,7 +30,7 @@
server.name: "Kibana"
# The URL of the Elasticsearch instance to use for all your queries.
-elasticsearch.url: "http://elasticsearch.onap-log:9200"
+elasticsearch.url: "http://elasticsearch.{{ .Values.nsPrefix }}-log:9200"
#elasticsearch-service.onap-log:9200"
#elasticsearch.url: "http://10.247.47.3:9200"
# When this setting's value is true Kibana uses the hostname specified in the server.host
diff --git a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
index ed634ed..229bcc1 100644
--- a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
+++ b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
@@ -224,7 +224,7 @@
#can specify one or a list of hosts. If sniffing is set, one is enough and others will be auto-discovered
##Also protocol can be specified like ["http://10.247.186.12:9200"]
- hosts => ["http://elasticsearch.onap-log:9200"]
+ hosts => ["http://elasticsearch.{{.Values.nsPrefix}}-log:9200"]
## This setting asks Elasticsearch for the list of all cluster nodes and adds them to the hosts list. Default is false.
diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml
index 9ff26da..459ecfe 100644
--- a/kubernetes/log/templates/kibana-deployment.yaml
+++ b/kubernetes/log/templates/kibana-deployment.yaml
@@ -69,5 +69,5 @@
name: kibana-configmap
namespace: {{ .Values.nsPrefix }}-log
data:
-{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }}
-#{{ end }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig . | indent 2 }}
+#{{ end }}
diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml
index c4d46b7..f35c421 100644
--- a/kubernetes/log/templates/logstash-deployment.yaml
+++ b/kubernetes/log/templates/logstash-deployment.yaml
@@ -80,5 +80,5 @@
namespace: {{ .Values.nsPrefix }}-log
data:
{{ (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig | indent 2 }}
-{{ (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig | indent 2 }}
-#{{ end }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig . | indent 2 }}
+#{{ end }}