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

Use server basepath when creating reporting jobs (#72722)

Browse source 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
Poff Poffenberger 2020-07-22 08:05:53 -05:00 committed by GitHub
parent 4dcf719edb
commit 82dd173b2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
x-pack/plugins/reporting/server/export_types/png/create_job/index.ts
View file

@ -13,7 +13,6 @@ export const scheduleTaskFnFactory: ScheduleTaskFnFactory<ESQueueCreateJobFn<
JobParamsPNG
>> = function createJobFactoryFn(reporting) {
const config = reporting.getConfig();
const setupDeps = reporting.getPluginSetupDeps();
const crypto = cryptoFactory(config.get('encryptionKey'));
return async function scheduleTask(
@ -32,7 +31,7 @@ export const scheduleTaskFnFactory: ScheduleTaskFnFactory<ESQueueCreateJobFn<
headers: serializedEncryptedHeaders,
browserTimezone,
layout,
basePath: setupDeps.basePath(req),
basePath: config.kbnConfig.get('server', 'basePath'),
forceNow: new Date().toISOString(),
};
};

3
x-pack/plugins/reporting/server/export_types/printable_pdf/create_job/index.ts
View file

@ -13,7 +13,6 @@ export const scheduleTaskFnFactory: ScheduleTaskFnFactory<ESQueueCreateJobFn<
JobParamsPDF
>> = function createJobFactoryFn(reporting) {
const config = reporting.getConfig();
const setupDeps = reporting.getPluginSetupDeps();
const crypto = cryptoFactory(config.get('encryptionKey'));
return async function scheduleTaskFn(
@ -26,7 +25,7 @@ export const scheduleTaskFnFactory: ScheduleTaskFnFactory<ESQueueCreateJobFn<
validateUrls(relativeUrls);
return {
basePath: setupDeps.basePath(req),
basePath: config.kbnConfig.get('server', 'basePath'),
browserTimezone,
forceNow: new Date().toISOString(),
headers: serializedEncryptedHeaders,