Skip to content

Commit

Permalink
Add --ssl flag to make resolver generator use ssl with kbn and elasti…
Browse files Browse the repository at this point in the history
…csearch clients (#89873) (#90364)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
  • Loading branch information
kqualters-elastic and kibanamachine authored Feb 9, 2021
1 parent 1dccab3 commit da38f0d
Showing 1 changed file with 35 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@

/* eslint-disable no-console */
import yargs from 'yargs';
import fs from 'fs';
import { Client, ClientOptions } from '@elastic/elasticsearch';
import { ResponseError } from '@elastic/elasticsearch/lib/errors';
import { KbnClient, ToolingLog } from '@kbn/dev-utils';
import { KbnClient, ToolingLog, CA_CERT_PATH } from '@kbn/dev-utils';
import { AxiosResponse } from 'axios';
import { indexHostsAndAlerts } from '../../common/endpoint/index_data';
import { ANCESTRY_LIMIT, EndpointDocGenerator } from '../../common/endpoint/generate_data';
Expand Down Expand Up @@ -204,15 +205,41 @@ async function main() {
type: 'boolean',
default: false,
},
ssl: {
alias: 'ssl',
describe: 'Use https for elasticsearch and kbn clients',
type: 'boolean',
default: false,
},
}).argv;
let ca: Buffer;
let kbnClient: KbnClientWithApiKeySupport;
let clientOptions: ClientOptions;

const kbnClient = new KbnClientWithApiKeySupport({
log: new ToolingLog({
level: 'info',
writeTo: process.stdout,
}),
url: argv.kibana,
});
if (argv.ssl) {
ca = fs.readFileSync(CA_CERT_PATH);
const url = argv.kibana.replace('http:', 'https:');
const node = argv.node.replace('http:', 'https:');
kbnClient = new KbnClientWithApiKeySupport({
log: new ToolingLog({
level: 'info',
writeTo: process.stdout,
}),
url,
certificateAuthorities: [ca],
});
clientOptions = { node, ssl: { ca: [ca] } };
} else {
kbnClient = new KbnClientWithApiKeySupport({
log: new ToolingLog({
level: 'info',
writeTo: process.stdout,
}),
url: argv.kibana,
});
clientOptions = { node: argv.node };
}
const client = new Client(clientOptions);

try {
await doIngestSetup(kbnClient);
Expand All @@ -221,9 +248,6 @@ async function main() {
process.exit(1);
}

const clientOptions: ClientOptions = { node: argv.node };
const client = new Client(clientOptions);

if (argv.delete) {
await deleteIndices(
[argv.eventIndex, argv.metadataIndex, argv.policyIndex, argv.alertIndex],
Expand Down

0 comments on commit da38f0d

Please sign in to comment.