Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add standardized helm chart for log
[oom.git]
/
kubernetes
/
log
/
charts
/
log-kibana
/
resources
/
config
/
kibana.yml
diff --git
a/kubernetes/log/resources/kibana/conf/kibana.yml
b/kubernetes/log/charts/log-kibana/resources/config/kibana.yml
similarity index 95%
rename from
kubernetes/log/resources/kibana/conf/kibana.yml
rename to
kubernetes/log/charts/log-kibana/resources/config/kibana.yml
index
df0d71a
..
5171ad4
100644
(file)
--- a/
kubernetes/log/resources/kibana/conf/kibana.yml
+++ b/
kubernetes/log/charts/log-kibana/resources/config/kibana.yml
@@
-11,7
+11,7
@@
xpack.security.enabled: false
xpack.watcher.enabled: false
#Set to false to disable Watcher.
# Kibana is served by a back end server. This setting specifies the port to use.
xpack.watcher.enabled: false
#Set to false to disable Watcher.
# Kibana is served by a back end server. This setting specifies the port to use.
-server.port:
5601
+server.port:
{{.Values.service.externalPort}}
# Specifies the address to which the Kibana server will bind. IP addresses and host names are both valid values.
# The default is 'localhost', which usually means remote machines will not be able to connect.
# Specifies the address to which the Kibana server will bind. IP addresses and host names are both valid values.
# The default is 'localhost', which usually means remote machines will not be able to connect.
@@
-30,10
+30,7
@@
server.host: "0"
server.name: "Kibana"
# The URL of the Elasticsearch instance to use for all your queries.
server.name: "Kibana"
# The URL of the Elasticsearch instance to use for all your queries.
-# OOM-427, OOM-441 hardcoded onap workspace to avoid helm upgrade past 2.3
-elasticsearch.url: "http://elasticsearch.{{.Values.nsPrefix}}:9200"
-#elasticsearch-service.{{.Values.nsPrefix}}:9200"
-#elasticsearch.url: "http://10.247.47.3:9200"
+elasticsearch.url: "http://{{.Values.config.elasticsearchServiceName}}.{{.Release.Namespace}}:{{.Values.config.elasticsearchPort}}"
# When this setting's value is true Kibana uses the hostname specified in the server.host
# setting. When the value of this setting is false, Kibana uses the hostname of the host
# that connects to this Kibana instance.
# When this setting's value is true Kibana uses the hostname specified in the server.host
# setting. When the value of this setting is false, Kibana uses the hostname of the host
# that connects to this Kibana instance.