mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 01:13:23 -04:00
* Added the search.check_ccs_compatibility flag
* Moved up the level on the logging statements for ES Args so we can debug locally.
* Updated snapshots to reflect new flag that was added.
(cherry picked from commit 68ab355dc3
)
This commit is contained in:
parent
74441bb591
commit
4194b8f2e5
2 changed files with 5 additions and 2 deletions
|
@ -260,6 +260,7 @@ exports.Cluster = class Cluster {
|
|||
const esArgs = [
|
||||
'action.destructive_requires_name=true',
|
||||
'ingest.geoip.downloader.enabled=false',
|
||||
'search.check_ccs_compatibility=true',
|
||||
].concat(options.esArgs || []);
|
||||
|
||||
// Add to esArgs if ssl is enabled
|
||||
|
@ -282,7 +283,7 @@ exports.Cluster = class Cluster {
|
|||
[]
|
||||
);
|
||||
|
||||
this._log.debug('%s %s', ES_BIN, args.join(' '));
|
||||
this._log.info('%s %s', ES_BIN, args.join(' '));
|
||||
|
||||
let esJavaOpts = `${options.esJavaOpts || ''} ${process.env.ES_JAVA_OPTS || ''}`;
|
||||
|
||||
|
@ -295,7 +296,7 @@ exports.Cluster = class Cluster {
|
|||
esJavaOpts += ' -Xms1536m -Xmx1536m';
|
||||
}
|
||||
|
||||
this._log.debug('ES_JAVA_OPTS: %s', esJavaOpts.trim());
|
||||
this._log.info('ES_JAVA_OPTS: %s', esJavaOpts.trim());
|
||||
|
||||
this._process = execa(ES_BIN, args, {
|
||||
cwd: installPath,
|
||||
|
|
|
@ -309,6 +309,7 @@ describe('#start(installPath)', () => {
|
|||
Array [
|
||||
"action.destructive_requires_name=true",
|
||||
"ingest.geoip.downloader.enabled=false",
|
||||
"search.check_ccs_compatibility=true",
|
||||
],
|
||||
undefined,
|
||||
Object {
|
||||
|
@ -387,6 +388,7 @@ describe('#run()', () => {
|
|||
Array [
|
||||
"action.destructive_requires_name=true",
|
||||
"ingest.geoip.downloader.enabled=false",
|
||||
"search.check_ccs_compatibility=true",
|
||||
],
|
||||
undefined,
|
||||
Object {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue