Use "address" func when it's possible

Change-Id: I8de5b5edcb4a2c78b8fd5d64bb2782ee807f6948
This commit is contained in:
Andrey Pavlov 2016-12-05 08:53:50 +00:00
parent 17741ea703
commit 5458369061
3 changed files with 3 additions and 3 deletions

View File

@ -14,7 +14,7 @@ curl -i -XPOST -H "Accept: application/json" -H "Content-Type: application/json"
"type": "influxdb",
"access": "proxy",
"isDefault": true,
"url": "'"http://{{ influxdb.host }}:{{ influxdb.port.cont }}"'",
"url": "'"{{ address('influxdb', influxdb.port, with_scheme=True) }}"'",
"password": "'"{{ influxdb.password }}"'",
"user": "'"{{ influxdb.user }}"'",
"database": "'"{{ influxdb.database }}"'"

View File

@ -6,7 +6,7 @@ fields = ["Timestamp", "Type", "Logger", "Severity", "Payload", "Pid", "Hostname
[elasticsearch_output]
type = "ElasticSearchOutput"
server = "http://elasticsearch:{{ elasticsearch.port.cont }}"
server = "{{ address('elasticsearch', elasticsearch.port, with_scheme=True) }}"
message_matcher = "Type == 'log'"
encoder = "elasticsearch_json_encoder"
use_buffering = true

View File

@ -5,7 +5,7 @@ port: {{ kibana.port.cont }}
host: "{{ network_topology["private"]["address"] }}"
# The Elasticsearch instance to use for all your queries.
elasticsearch_url: "http://elasticsearch:{{ elasticsearch.port.cont }}"
elasticsearch_url: "{{ address('elasticsearch', elasticsearch.port, with_scheme=True) }}"
# preserve_elasticsearch_host true will send the hostname specified in `elasticsearch`. If you set it to false,
# then the host you use to connect to *this* Kibana instance will be sent.