github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Allow default arguments to yarn es to be overwritten. (#130864)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Spencer <spencer@elastic.co>
This commit is contained in:
Martijn Laarman 2022-05-19 00:57:21 +02:00 • committed by GitHub
parent 27d96702ff
commit 9ebb269f13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -325,29 +325,41 @@ exports.Cluster = class Cluster {
this._log.info(chalk.bold('Starting'));
this._log.indent(4);
const esArgs = [
'action.destructive_requires_name=true',
'ingest.geoip.downloader.enabled=false',
'search.check_ccs_compatibility=true',
'cluster.routing.allocation.disk.threshold_enabled=false',
].concat(options.esArgs || []);
const esArgs = new Map([
['action.destructive_requires_name', 'true'],
['cluster.routing.allocation.disk.threshold_enabled', 'false'],
['ingest.geoip.downloader.enabled', 'false'],
['search.check_ccs_compatibility', 'true'],
]);
// options.esArgs overrides the default esArg values
for (const arg of [].concat(options.esArgs || [])) {
const [key, ...value] = arg.split('=');
esArgs.set(key.trim(), value.join('=').trim());
}
// Add to esArgs if ssl is enabled
if (this._ssl) {
esArgs.push('xpack.security.http.ssl.enabled=true');
// Include default keystore settings only if keystore isn't configured.
if (!esArgs.some((arg) => arg.startsWith('xpack.security.http.ssl.keystore'))) {
esArgs.push(`xpack.security.http.ssl.keystore.path=${ES_NOPASSWORD_P12_PATH}`);
esArgs.push(`xpack.security.http.ssl.keystore.type=PKCS12`);
esArgs.set('xpack.security.http.ssl.enabled', 'true');
// Include default keystore settings only if ssl isn't disabled by esArgs and keystore isn't configured.
if (!esArgs.get('xpack.security.http.ssl.keystore.path')) {
// We are explicitly using ES_NOPASSWORD_P12_PATH instead of ES_P12_PATH + ES_P12_PASSWORD. The reasoning for this is that setting
// the keystore password using environment variables causes Elasticsearch to emit deprecation warnings.
esArgs.set(`xpack.security.http.ssl.keystore.path`, ES_NOPASSWORD_P12_PATH);
esArgs.set(`xpack.security.http.ssl.keystore.type`, `PKCS12`);
}
}
const args = parseSettings(extractConfigFiles(esArgs, installPath, { log: this._log }), {
filter: SettingsFilter.NonSecureOnly,
}).reduce(
const args = parseSettings(
extractConfigFiles(
Array.from(esArgs).map((e) => e.join('=')),
installPath,
{ log: this._log }
),
{
filter: SettingsFilter.NonSecureOnly,
}
).reduce(
(acc, [settingName, settingValue]) => acc.concat(['-E', `${settingName}=${settingValue}`]),
[]
);

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

@ -304,9 +304,41 @@ describe('#start(installPath)', () => {
Array [
Array [
"action.destructive_requires_name=true",
"cluster.routing.allocation.disk.threshold_enabled=false",
"ingest.geoip.downloader.enabled=false",
"search.check_ccs_compatibility=true",
],
undefined,
Object {
"log": <ToolingLog>,
},
],
]
`);
});
it(`allows overriding search.check_ccs_compatibility`, async () => {
mockEsBin({ start: true });
extractConfigFiles.mockReturnValueOnce([]);
const cluster = new Cluster({
log,
ssl: false,
});
await cluster.start(undefined, {
esArgs: ['search.check_ccs_compatibility=false'],
});
expect(extractConfigFiles.mock.calls).toMatchInlineSnapshot(`
Array [
Array [
Array [
"action.destructive_requires_name=true",
"cluster.routing.allocation.disk.threshold_enabled=false",
"ingest.geoip.downloader.enabled=false",
"search.check_ccs_compatibility=false",
],
undefined,
Object {
@ -384,9 +416,9 @@ describe('#run()', () => {
Array [
Array [
"action.destructive_requires_name=true",
"cluster.routing.allocation.disk.threshold_enabled=false",
"ingest.geoip.downloader.enabled=false",
"search.check_ccs_compatibility=true",
"cluster.routing.allocation.disk.threshold_enabled=false",
],
undefined,
Object {