diff options
| author |   Alexis de Talhouët <adetalhouet89@gmail.com> | 2017-11-21 09:18:38 -0500 |
|---|---|---|
| committer | Alexis de Talhouët <adetalhouet89@gmail.com> | 2017-11-21 09:20:45 -0500 |
| commit | f730de57d22ecd618a71b6efa7e1558ccc0771da (patch) | |
| tree | 11b7f2b449361bceb239ab903da64469ed8d9354 /kubernetes | |
| parent | 6b7eed0b201db46435b38d68eec3b84ba4fa4eba (diff) | |
Revert fixed kibana and logstash connection to es
This reverts commit 6b7eed0b201db46435b38d68eec3b84ba4fa4eba.
Issue-ID: OOM-420
Change-Id: Ib78037089df6474a978134c0480d9169ab557795
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'kubernetes')
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 51af3f6b22..0f72daa497 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.{{.Values.nsPrefix}}-log:9200" +elasticsearch.url: "http://elasticsearch.onap-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 229bcc1466..ed634ed684 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.{{.Values.nsPrefix}}-log:9200"] + hosts => ["http://elasticsearch.onap-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 459ecfee09..9ff26da798 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: -{{ tpl (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig . | indent 2 }} -#{{ end }} +{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }} +#{{ end }}
\ No newline at end of file diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml index f35c421e68..c4d46b7eff 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 }} -{{ tpl (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig . | indent 2 }} -#{{ end }} +{{ (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig | indent 2 }} +#{{ end }}
\ No newline at end of file |