diff options
| author |   Kerenj <keren.joseph@amdocs.com> | 2017-11-12 11:26:40 +0200 |
|---|---|---|
| committer | Kerenj <keren.joseph@amdocs.com> | 2017-11-12 11:26:40 +0200 |
| commit | 6b7eed0b201db46435b38d68eec3b84ba4fa4eba (patch) | |
| tree | 0b9431e1bd215f9b260a8a0d48e8db57fcf98645 | |
| parent | c5123229d9631aaf504a420be456ce2578fc8942 (diff) | |
fixed kibana and logstash connection to es
Change-Id: I21b3af541ee32c8231b4b5cc0db8c335586a33b0
Issue-ID: OOM-420
Signed-off-by: Kerenj <keren.joseph@amdocs.com>
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..51af3f6b22 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 }} |