Skip to content

Commit 7bf9ce2

Browse files
colinsurprenantcolinsurprenant
authored
rename config option .url and .ca to .hosts and .certificate_authority (#10391)
[6.x backport of #10380] minor conflict in docs
1 parent 804b247 commit 7bf9ce2

22 files changed

+47
-48
lines changed

‎config/logstash.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@
219219
#xpack.monitoring.enabled: false
220220
#xpack.monitoring.elasticsearch.username: logstash_system
221221
#xpack.monitoring.elasticsearch.password: password
222-
#xpack.monitoring.elasticsearch.url: ["https://es1:9200", "https://es2:9200"]
223-
#xpack.monitoring.elasticsearch.ssl.ca: [ "/path/to/ca.crt" ]
222+
#xpack.monitoring.elasticsearch.hosts: ["https://es1:9200", "https://es2:9200"]
223+
#xpack.monitoring.elasticsearch.ssl.certificate_authority: [ "/path/to/ca.crt" ]
224224
#xpack.monitoring.elasticsearch.ssl.truststore.path: path/to/file
225225
#xpack.monitoring.elasticsearch.ssl.truststore.password: password
226226
#xpack.monitoring.elasticsearch.ssl.keystore.path: /path/to/file
@@ -236,8 +236,8 @@
236236
#xpack.management.pipeline.id: ["main", "apache_logs"]
237237
#xpack.management.elasticsearch.username: logstash_admin_user
238238
#xpack.management.elasticsearch.password: password
239-
#xpack.management.elasticsearch.url: ["https://es1:9200", "https://es2:9200"]
240-
#xpack.management.elasticsearch.ssl.ca: [ "/path/to/ca.crt" ]
239+
#xpack.management.elasticsearch.hosts: ["https://es1:9200", "https://es2:9200"]
240+
#xpack.management.elasticsearch.ssl.certificate_authority: [ "/path/to/ca.crt" ]
241241
#xpack.management.elasticsearch.ssl.truststore.path: /path/to/file
242242
#xpack.management.elasticsearch.ssl.truststore.password: password
243243
#xpack.management.elasticsearch.ssl.keystore.path: /path/to/file

‎docs/static/docker.asciidoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ images:
170170

171171
[horizontal]
172172
`http.host`:: `0.0.0.0`
173-
`xpack.monitoring.elasticsearch.url`:: `http://elasticsearch:9200`
173+
`xpack.monitoring.elasticsearch.hosts`:: `http://elasticsearch:9200`
174174

175-
NOTE: The setting `xpack.monitoring.elasticsearch.url` is not
175+
NOTE: The setting `xpack.monitoring.elasticsearch.hosts` is not
176176
defined in the `-oss` image.
177177

178178
These settings are defined in the default `logstash.yml`. They can be overridden

‎docs/static/management/configuring-centralized-pipelines.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ minimum, set:
2323
+
2424
* `xpack.management.enabled: true` to enable centralized configuration
2525
management.
26-
* `xpack.management.elasticsearch.url` to specify the Elasticsearch
26+
* `xpack.management.elasticsearch.hosts` to specify the Elasticsearch
2727
instance that will store the Logstash pipeline configurations and metadata.
2828
* `xpack.management.pipeline.id` to register the pipelines that you want to
2929
centrally manage.

‎docs/static/monitoring/configuring-logstash.asciidoc

+4-5
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ production cluster. If that setting is `false`, the collection of monitoring dat
2323
is disabled in {es} and data is ignored from all other sources.
2424

2525
. Configure your Logstash nodes to send metrics by setting the
26-
`xpack.monitoring.elasticsearch.url` in `logstash.yml`. If {security} is enabled,
26+
`xpack.monitoring.elasticsearch.hosts` in `logstash.yml`. If {security} is enabled,
2727
you also need to specify the credentials for the
2828
{stack-ov}/built-in-users.html[built-in `logstash_system` user]. For more information about these settings, see <<monitoring-settings>>.
2929
+
3030
--
3131
[source,yaml]
3232
--------------------------------------------------
33-
xpack.monitoring.elasticsearch.url:
34-
["http://es-prod-node-1:9200", "http://es-prod-node-2:9200"] <1>
33+
xpack.monitoring.elasticsearch.hosts: ["http://es-prod-node-1:9200", "http://es-prod-node-2:9200"] <1>
3534
xpack.monitoring.elasticsearch.username: "logstash_system" <2>
3635
xpack.monitoring.elasticsearch.password: "changeme"
3736
--------------------------------------------------
@@ -50,11 +49,11 @@ in the cluster.
5049
--
5150
To add a CA certificate to a Logstash node's trusted certificates, you
5251
can specify the location of the PEM encoded certificate with the
53-
`ca` setting:
52+
`certificate_authority` setting:
5453

5554
[source,yaml]
5655
--------------------------------------------------
57-
xpack.monitoring.elasticsearch.ssl.ca: /path/to/ca.crt
56+
xpack.monitoring.elasticsearch.ssl.certificate_authority: /path/to/ca.crt
5857
--------------------------------------------------
5958

6059
Alternatively, you can configure trusted certificates using a truststore

‎docs/static/monitoring/monitoring-output.asciidoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ the following default configuration is used:
2323

2424
[source,yaml]
2525
---------------------------------------------------
26-
xpack.monitoring.elasticsearch.url: [ "http://localhost:9200" ]
26+
xpack.monitoring.elasticsearch.hosts: [ "http://localhost:9200" ]
2727
---------------------------------------------------
2828

2929
All data produced by {monitoring} for Logstash is indexed in the monitoring
@@ -36,7 +36,7 @@ necessary to properly configure Logstash. For more information, see
3636

3737
IMPORTANT: When discussing security relative to the `elasticsearch` output, it
3838
is critical to remember that all users are managed on the production cluster,
39-
which is identified in the `xpack.monitoring.elasticsearch.url` setting.
39+
which is identified in the `xpack.monitoring.elasticsearch.hosts` setting.
4040
This is particularly important to remember when you move from development
4141
environments to production environments, where you often have dedicated
4242
monitoring clusters.

‎docs/static/settings/configuration-management-settings.asciidoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SSL, you need to specify additional SSL settings.
1717
[source,shell]
1818
-----
1919
xpack.management.enabled: true
20-
xpack.management.elasticsearch.url: "http://localhost:9200/"
20+
xpack.management.elasticsearch.hosts: "http://localhost:9200/"
2121
xpack.management.elasticsearch.username: logstash_admin_user
2222
xpack.management.elasticsearch.password: t0p.s3cr3t
2323
xpack.management.logstash.poll_interval: 5s
@@ -41,7 +41,7 @@ Specify a comma-separated list of pipeline IDs to register for centralized
4141
pipeline management. After changing this setting, you need to restart Logstash
4242
to pick up changes.
4343

44-
`xpack.management.elasticsearch.url`::
44+
`xpack.management.elasticsearch.hosts`::
4545

4646
The {es} instance that will store the Logstash pipeline configurations and
4747
metadata. This might be the same {es} instance specified in the `outputs`
@@ -56,7 +56,7 @@ authenticate for accessing the configuration data. The username you specify here
5656
should have the `logstash_admin` role, which provides access to `.logstash-*`
5757
indices for managing configurations.
5858

59-
`xpack.management.elasticsearch.ssl.ca`::
59+
`xpack.management.elasticsearch.ssl.certificate_authority`::
6060

6161
Optional setting that enables you to specify a path to the `.pem` file for the
6262
certificate authority for your {es} instance.

‎docs/static/settings/monitoring-settings.asciidoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Logstash, see <<logstash-settings-file>>.
1818

1919
Monitoring is disabled by default. Set to `true` to enable {xpack} monitoring.
2020

21-
`xpack.monitoring.elasticsearch.url`::
21+
`xpack.monitoring.elasticsearch.hosts`::
2222

2323
The {es} instances that you want to ship your Logstash metrics to. This might be
2424
the same {es} instance specified in the `outputs` section in your Logstash
@@ -53,7 +53,7 @@ You can configure the following Transport Layer Security (TLS) or
5353
Secure Sockets Layer (SSL) settings. For more information, see
5454
<<ls-monitoring-user>>.
5555

56-
`xpack.monitoring.elasticsearch.ssl.ca`::
56+
`xpack.monitoring.elasticsearch.ssl.certificate_authority`::
5757

5858
Optional setting that enables you to specify a path to the `.pem` file for the
5959
certificate authority for your {es} instance.

‎x-pack/lib/config_management/extension.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ def additionals_settings(settings)
2626
settings.register(LogStash::Setting::ArrayCoercible.new("xpack.management.pipeline.id", String, ["main"]))
2727
settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.username", "logstash_system"))
2828
settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.password"))
29-
settings.register(LogStash::Setting::ArrayCoercible.new("xpack.management.elasticsearch.url", String, [ "https://localhost:9200" ] ))
30-
settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.ssl.ca"))
29+
settings.register(LogStash::Setting::ArrayCoercible.new("xpack.management.elasticsearch.hosts", String, [ "https://localhost:9200" ] ))
30+
settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.ssl.certificate_authority"))
3131
settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.ssl.truststore.path"))
3232
settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.ssl.truststore.password"))
3333
settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.ssl.keystore.path"))

‎x-pack/lib/helpers/elasticsearch_options.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module LogStash module Helpers
66
module ElasticsearchOptions
77
extend self
88

9-
ES_SETTINGS =%w(ssl.ca ssl.truststore.path ssl.keystore.path url username password)
9+
ES_SETTINGS =%w(ssl.certificate_authority ssl.truststore.path ssl.keystore.path hosts username password)
1010

1111
# Retrieve elasticsearch options from either specific settings, or modules if the setting is not there and the
1212
# feature supports falling back to modules if the feature is not specified in logstash.yml
@@ -19,13 +19,13 @@ def es_options_from_settings_or_modules(feature, settings)
1919
def es_options_from_settings(feature, settings)
2020
opts = {}
2121

22-
opts['hosts'] = settings.get("xpack.#{feature}.elasticsearch.url")
22+
opts['hosts'] = settings.get("xpack.#{feature}.elasticsearch.hosts")
2323
opts['user'] = settings.get("xpack.#{feature}.elasticsearch.username")
2424
opts['password'] = settings.get("xpack.#{feature}.elasticsearch.password")
2525
opts['sniffing'] = settings.get("xpack.#{feature}.elasticsearch.sniffing")
2626
opts['ssl_certificate_verification'] = settings.get("xpack.#{feature}.elasticsearch.ssl.verification_mode") == 'certificate'
2727

28-
if cacert = settings.get("xpack.#{feature}.elasticsearch.ssl.ca")
28+
if cacert = settings.get("xpack.#{feature}.elasticsearch.ssl.certificate_authority")
2929
opts['cacert'] = cacert
3030
opts['ssl'] = true
3131
end

‎x-pack/lib/monitoring/monitoring.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ def after_agent(runner)
104104

105105
# For versions prior to 6.3 the default value of "xpack.monitoring.enabled" was true
106106
# For versions 6.3+ the default of "xpack.monitoring.enabled" is false.
107-
# To help keep passivity, assume that if "xpack.monitoring.elasticsearch.url" has been set that monitoring should be enabled.
108-
# return true if xpack.monitoring.enabled=true (explicitly) or xpack.monitoring.elasticsearch.url is configured
107+
# To help keep passivity, assume that if "xpack.monitoring.elasticsearch.hosts" has been set that monitoring should be enabled.
108+
# return true if xpack.monitoring.enabled=true (explicitly) or xpack.monitoring.elasticsearch.hosts is configured
109109
def monitoring_enabled?(settings)
110110
return settings.get_value("xpack.monitoring.enabled") if settings.set?("xpack.monitoring.enabled")
111111

112-
if settings.set?("xpack.monitoring.elasticsearch.url")
112+
if settings.set?("xpack.monitoring.elasticsearch.hosts")
113113
logger.warn("xpack.monitoring.enabled has not been defined, but found elasticsearch configuration. Please explicitly set `xpack.monitoring.enabled: true` in logstash.yml")
114114
true
115115
else
@@ -169,12 +169,12 @@ def additionals_settings(settings)
169169
logger.trace("registering additionals_settings")
170170

171171
settings.register(LogStash::Setting::Boolean.new("xpack.monitoring.enabled", false))
172-
settings.register(LogStash::Setting::ArrayCoercible.new("xpack.monitoring.elasticsearch.url", String, [ "http://localhost:9200" ] ))
172+
settings.register(LogStash::Setting::ArrayCoercible.new("xpack.monitoring.elasticsearch.hosts", String, [ "http://localhost:9200" ] ))
173173
settings.register(LogStash::Setting::TimeValue.new("xpack.monitoring.collection.interval", "10s"))
174174
settings.register(LogStash::Setting::TimeValue.new("xpack.monitoring.collection.timeout_interval", "10m"))
175175
settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.username", "logstash_system"))
176176
settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.password"))
177-
settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.ssl.ca"))
177+
settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.ssl.certificate_authority"))
178178
settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.ssl.truststore.path"))
179179
settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.ssl.truststore.password"))
180180
settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.ssl.keystore.path"))

‎x-pack/qa/integration/management/multiple_pipelines_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"xpack.management.enabled" => true,
3030
"xpack.management.pipeline.id" => @pipelines.keys,
3131
"xpack.management.logstash.poll_interval" => "1s",
32-
"xpack.management.elasticsearch.url" => ["http://localhost:9200"],
32+
"xpack.management.elasticsearch.hosts" => ["http://localhost:9200"],
3333
"xpack.management.elasticsearch.username" => "elastic",
3434
"xpack.management.elasticsearch.password" => elastic_password,
3535
"xpack.monitoring.elasticsearch.username" => "elastic",

‎x-pack/qa/integration/management/read_configuration_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def logstash_options(pipeline_id, wait_condition)
1515
"xpack.management.enabled" => true,
1616
"xpack.management.pipeline.id" => pipeline_id,
1717
"xpack.management.logstash.poll_interval" => "1s",
18-
"xpack.management.elasticsearch.url" => ["http://localhost:9200"],
18+
"xpack.management.elasticsearch.hosts" => ["http://localhost:9200"],
1919
"xpack.management.elasticsearch.username" => "elastic",
2020
"xpack.management.elasticsearch.password" => elastic_password,
2121
"xpack.monitoring.elasticsearch.username" => "elastic",

‎x-pack/qa/integration/monitoring/multiple_host_defined_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@logstash_service = logstash("bin/logstash -e '#{config}' -w 1", {
1616
:settings => {
17-
"xpack.monitoring.elasticsearch.url" => ["http://localhost:9200", "http://localhost:9200"],
17+
"xpack.monitoring.elasticsearch.hosts" => ["http://localhost:9200", "http://localhost:9200"],
1818
"xpack.monitoring.collection.interval" => "1s",
1919
"xpack.monitoring.elasticsearch.username" => "elastic",
2020
"xpack.monitoring.elasticsearch.password" => elastic_password

‎x-pack/qa/integration/monitoring/persisted_queue_is_enabled_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@logstash_service = logstash("bin/logstash -e '#{config}' -w 1", {
1616
:settings => {
17-
"xpack.monitoring.elasticsearch.url" => ["http://localhost:9200", "http://localhost:9200"],
17+
"xpack.monitoring.elasticsearch.hosts" => ["http://localhost:9200", "http://localhost:9200"],
1818
"xpack.monitoring.collection.interval" => "1s",
1919
"queue.type" => "persisted",
2020
"xpack.monitoring.elasticsearch.username" => "elastic",

‎x-pack/spec/config_management/elasticsearch_source_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
{
8888
"xpack.management.enabled" => true,
8989
"xpack.management.pipeline.id" => "main",
90-
"xpack.management.elasticsearch.url" => elasticsearch_url,
90+
"xpack.management.elasticsearch.hosts" => elasticsearch_url,
9191
"xpack.management.elasticsearch.username" => elasticsearch_username,
9292
"xpack.management.elasticsearch.password" => elasticsearch_password,
9393
}
@@ -109,7 +109,7 @@
109109
{
110110
"xpack.management.enabled" => true,
111111
"xpack.management.pipeline.id" => "main",
112-
"xpack.management.elasticsearch.url" => elasticsearch_url,
112+
"xpack.management.elasticsearch.hosts" => elasticsearch_url,
113113
"xpack.management.elasticsearch.username" => elasticsearch_username,
114114
#"xpack.management.elasticsearch.password" => elasticsearch_password,
115115
}

‎x-pack/spec/config_management/extension_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
"xpack.management.enabled" => [LogStash::Setting::Boolean, false],
3232
"xpack.management.logstash.poll_interval" => [LogStash::Setting::TimeValue, 5000000000],
3333
"xpack.management.pipeline.id" => [LogStash::Setting::ArrayCoercible, ["main"]],
34-
"xpack.management.elasticsearch.url" => [LogStash::Setting::ArrayCoercible, ["https://localhost:9200"]],
34+
"xpack.management.elasticsearch.hosts" => [LogStash::Setting::ArrayCoercible, ["https://localhost:9200"]],
3535
"xpack.management.elasticsearch.username" => [LogStash::Setting::String, "logstash_system"],
3636
"xpack.management.elasticsearch.password" => [LogStash::Setting::String, nil],
37-
"xpack.management.elasticsearch.ssl.ca" => [LogStash::Setting::NullableString, nil],
37+
"xpack.management.elasticsearch.ssl.certificate_authority" => [LogStash::Setting::NullableString, nil],
3838
"xpack.management.elasticsearch.ssl.truststore.path" => [LogStash::Setting::NullableString, nil],
3939
"xpack.management.elasticsearch.ssl.truststore.password" => [LogStash::Setting::NullableString, nil],
4040
"xpack.management.elasticsearch.ssl.keystore.path" => [LogStash::Setting::NullableString, nil],

‎x-pack/spec/helpers/elasticsearch_options_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
shared_examples 'elasticsearch options hash is populated with secure options' do
2323
context "with ca" do
2424
let(:elasticsearch_ca) { Stud::Temporary.file.path }
25-
let(:settings) { super.merge({ "xpack.monitoring.elasticsearch.ssl.ca" => elasticsearch_ca })}
25+
let(:settings) { super.merge({ "xpack.monitoring.elasticsearch.ssl.certificate_authority" => elasticsearch_ca })}
2626

2727
it "creates the elasticsearch output options hash" do
2828
expect(test_class.es_options_from_settings('monitoring', system_settings)).to include(
@@ -101,7 +101,7 @@
101101
let(:settings) do
102102
{
103103
"xpack.monitoring.enabled" => true,
104-
"xpack.monitoring.elasticsearch.url" => elasticsearch_url,
104+
"xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
105105
"xpack.monitoring.elasticsearch.username" => elasticsearch_username,
106106
"xpack.monitoring.elasticsearch.password" => elasticsearch_password,
107107
}
@@ -116,7 +116,7 @@
116116
let(:settings) do
117117
{
118118
"xpack.monitoring.enabled" => true,
119-
"xpack.monitoring.elasticsearch.url" => elasticsearch_url,
119+
"xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
120120
"xpack.monitoring.elasticsearch.username" => elasticsearch_username,
121121
"xpack.monitoring.elasticsearch.password" => elasticsearch_password,
122122
}
@@ -223,7 +223,7 @@
223223
"cloud.id" => cloud_id,
224224
"cloud.auth" => "#{cloud_username}:#{cloud_password}",
225225
"xpack.monitoring.enabled" => true,
226-
"xpack.monitoring.elasticsearch.url" => elasticsearch_url,
226+
"xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
227227
"xpack.monitoring.elasticsearch.username" => elasticsearch_username,
228228
"xpack.monitoring.elasticsearch.password" => elasticsearch_password,
229229
}

‎x-pack/spec/license_checker/license_info_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def update(license)
4141
let(:settings) do
4242
{
4343
"xpack.monitoring.enabled" => true,
44-
"xpack.monitoring.elasticsearch.url" => elasticsearch_url,
44+
"xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
4545
"xpack.monitoring.elasticsearch.username" => elasticsearch_username,
4646
"xpack.monitoring.elasticsearch.password" => elasticsearch_password,
4747
}

‎x-pack/spec/license_checker/license_manager_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def update(xpack_info)
8383
let(:settings) do
8484
{
8585
"xpack.monitoring.enabled" => true,
86-
"xpack.monitoring.elasticsearch.url" => elasticsearch_url,
86+
"xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
8787
"xpack.monitoring.elasticsearch.username" => elasticsearch_username,
8888
"xpack.monitoring.elasticsearch.password" => elasticsearch_password,
8989
}

‎x-pack/spec/license_checker/license_reader_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
let(:settings) do
2626
{
2727
"xpack.monitoring.enabled" => true,
28-
"xpack.monitoring.elasticsearch.url" => elasticsearch_url,
28+
"xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
2929
"xpack.monitoring.elasticsearch.username" => elasticsearch_username,
3030
"xpack.monitoring.elasticsearch.password" => elasticsearch_password,
3131
}

‎x-pack/spec/monitoring/inputs/metrics_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
let(:settings) do
2525
{
2626
"xpack.monitoring.enabled" => true,
27-
"xpack.monitoring.elasticsearch.url" => elasticsearch_url,
27+
"xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
2828
"xpack.monitoring.elasticsearch.username" => elasticsearch_username,
2929
"xpack.monitoring.elasticsearch.password" => elasticsearch_password,
3030
}
3131
end
3232

3333
let(:es_options) do
3434
{
35-
'url' => elasticsearch_url,
35+
'hosts' => elasticsearch_url,
3636
'user' => elasticsearch_username,
3737
'password' => elasticsearch_password
3838
}

0 commit comments

Comments
 (0)