diff options
| author |   Michael O'Brien <frank.obrien@amdocs.com> | 2017-11-17 20:20:24 -0500 |
|---|---|---|
| committer |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2017-11-27 16:10:03 +0000 |
| commit | c71456f1fc98b5adb170c04e5aca21bf13796bbb (patch) | |
| tree | 80a57c4afee5be5d5b991aa5bc80c82fef1b9999 | |
| parent | 1cee1a3eb985815da8d55ca7bcfa2bf3ac092d34 (diff) | |
revert OOM-420 to avoid helm 2.3+ upgrade
Issue-ID: OOM-441
Change-Id: I657b9c169dcfc9a8320277f14b5b7908dd2cdf2a
Signed-off-by: Michael O'Brien <frank.obrien@amdocs.com>
4 files changed, 6 insertions, 4 deletions
diff --git a/kubernetes/log/resources/kibana/conf/kibana.yml b/kubernetes/log/resources/kibana/conf/kibana.yml index 3bdb2febc7..3b96bd33c2 100644 --- a/kubernetes/log/resources/kibana/conf/kibana.yml +++ b/kubernetes/log/resources/kibana/conf/kibana.yml @@ -30,7 +30,8 @@ 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" +# OOM-427, OOM-441 hardcoded onap workspace to avoid helm upgrade past 2.3 +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..b425550f5b 100644 --- a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf +++ b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf @@ -224,7 +224,8 @@ 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"] +## OOM-427, OOM-441 hardcoded onap workspace to avoid helm upgrade past 2.3 + 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..e48cbb4ac4 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 }} +{{ (.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 f35c421e68..d25793e178 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 }} +{{ (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig | indent 2 }} #{{ end }} |