summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKerenj <keren.joseph@amdocs.com>2017-11-12 11:08:28 +0200
committerKerenj <keren.joseph@amdocs.com>2017-11-12 11:33:23 +0200
commit353ce1d7bb77759ff916f96425493a0171c35cc3 (patch)
treed3cc2b1f9d5b7237fb2fe7ef34398fadc0bc6482
parentc2c4d76e70b24e9702419864d0ec422eddfae8d4 (diff)
fixed kibana and logstash connection to es
Change-Id: If140f2fb65a5668c8f71d4beeea086ab2c07999e Issue-ID: OOM-420 Signed-off-by: Kerenj <keren.joseph@amdocs.com>
-rw-r--r--kubernetes/log/resources/kibana/conf/kibana.yml2
-rw-r--r--kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf2
-rw-r--r--kubernetes/log/templates/kibana-deployment.yaml4
-rw-r--r--kubernetes/log/templates/logstash-deployment.yaml4
4 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/log/resources/kibana/conf/kibana.yml b/kubernetes/log/resources/kibana/conf/kibana.yml
index 0f72daa497..3bdb2febc7 100644
--- a/kubernetes/log/resources/kibana/conf/kibana.yml
+++ b/kubernetes/log/resources/kibana/conf/kibana.yml
@@ -30,7 +30,7 @@ server.host: "0"
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 ed634ed684..229bcc1466 100644
--- a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
+++ b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
@@ -224,7 +224,7 @@ output {
#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 9ff26da798..459ecfee09 100644
--- a/kubernetes/log/templates/kibana-deployment.yaml
+++ b/kubernetes/log/templates/kibana-deployment.yaml
@@ -69,5 +69,5 @@ metadata:
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 c4d46b7eff..f35c421e68 100644
--- a/kubernetes/log/templates/logstash-deployment.yaml
+++ b/kubernetes/log/templates/logstash-deployment.yaml
@@ -80,5 +80,5 @@ metadata:
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 }}