mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
(cherry picked from commit 49ad5846ae
)
# Conflicts:
# packages/kbn-es/src/cluster.js
# packages/kbn-es/src/integration_tests/cluster.test.js
This commit is contained in:
parent
1929b2dae2
commit
b2e85d7a03
2 changed files with 3 additions and 0 deletions
|
@ -260,6 +260,7 @@ exports.Cluster = class Cluster {
|
|||
const esArgs = [
|
||||
'action.destructive_requires_name=true',
|
||||
'ingest.geoip.downloader.enabled=false',
|
||||
'cluster.routing.allocation.disk.threshold_enabled=false',
|
||||
].concat(options.esArgs || []);
|
||||
|
||||
// Add to esArgs if ssl is enabled
|
||||
|
|
|
@ -309,6 +309,7 @@ describe('#start(installPath)', () => {
|
|||
Array [
|
||||
"action.destructive_requires_name=true",
|
||||
"ingest.geoip.downloader.enabled=false",
|
||||
"cluster.routing.allocation.disk.threshold_enabled=false",
|
||||
],
|
||||
undefined,
|
||||
Object {
|
||||
|
@ -387,6 +388,7 @@ describe('#run()', () => {
|
|||
Array [
|
||||
"action.destructive_requires_name=true",
|
||||
"ingest.geoip.downloader.enabled=false",
|
||||
"cluster.routing.allocation.disk.threshold_enabled=false",
|
||||
],
|
||||
undefined,
|
||||
Object {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue