maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[kbn/es] disable geoip downloader at the root (#98372)

Browse source 
Co-authored-by: spalger <spalger@users.noreply.github.com>
This commit is contained in:
Spencer 2021-04-27 11:31:07 -07:00 committed by GitHub
parent 0b16688a24
commit 31660419ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/kbn-es/src/cluster.js
View file

@ -246,7 +246,10 @@ exports.Cluster = class Cluster {
this._log.info(chalk.bold('Starting'));
this._log.indent(4);
const esArgs = ['action.destructive_requires_name=true'].concat(options.esArgs || []);
const esArgs = [
'action.destructive_requires_name=true',
'ingest.geoip.downloader.enabled=false',
].concat(options.esArgs || []);
// Add to esArgs if ssl is enabled
if (this._ssl) {
@ -272,7 +275,7 @@ exports.Cluster = class Cluster {
// especially because we currently run many instances of ES on the same machine during CI
options.esEnvVars.ES_JAVA_OPTS =
(options.esEnvVars.ES_JAVA_OPTS ? `${options.esEnvVars.ES_JAVA_OPTS} ` : '') +
'-Xms2g -Xmx2g';
'-Xms1g -Xmx1g';
this._process = execa(ES_BIN, args, {
cwd: installPath,

2
packages/kbn-es/src/integration_tests/cluster.test.js
View file

@ -266,6 +266,7 @@ describe('#start(installPath)', () => {
Array [
Array [
"action.destructive_requires_name=true",
"ingest.geoip.downloader.enabled=false",
],
undefined,
Object {
@ -344,6 +345,7 @@ describe('#run()', () => {
Array [
Array [
"action.destructive_requires_name=true",
"ingest.geoip.downloader.enabled=false",
],
undefined,
Object {

2
test/common/config.js
View file

@ -21,7 +21,7 @@ export default function () {
servers,
esTestCluster: {
serverArgs: ['xpack.security.enabled=false', 'geoip.downloader.enabled=false'],
serverArgs: ['xpack.security.enabled=false'],
},
kbnTestServer: {