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

[ML] Fixing server side logger after new platform change (#39154)

Browse source
This commit is contained in:
James Gowdy 2019-06-18 15:18:44 +01:00 committed by GitHub
parent 78d0c0f75a
commit 89892ba097
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
x-pack/plugins/ml/server/client/log.js
View file

@ -1,11 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
export let mlLog = () => {};
export function initMlServerLog(log) {
mlLog = (level, message) => log(['ml', level], message);
}

33
x-pack/plugins/ml/server/client/log.ts Normal file
View file

@ -0,0 +1,33 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import { Logger } from '../../../../../src/core/server';
export interface LogInitialization {
log: Logger;
}
interface MlLog {
fatal: (message: string) => void;
error: (message: string) => void;
warn: (message: string) => void;
info: (message: string) => void;
debug: (message: string) => void;
trace: (message: string) => void;
}
export let mlLog: MlLog;
export function initMlServerLog(logInitialization: LogInitialization) {
mlLog = {
fatal: (message: string) => logInitialization.log.fatal(message),
error: (message: string) => logInitialization.log.error(message),
warn: (message: string) => logInitialization.log.warn(message),
info: (message: string) => logInitialization.log.info(message),
debug: (message: string) => logInitialization.log.debug(message),
trace: (message: string) => logInitialization.log.trace(message),
};
}

2
x-pack/plugins/ml/server/lib/check_annotations/index.js
View file

@ -40,7 +40,7 @@ export async function isAnnotationsFeatureAvailable(callWithRequest) {
if (!annotationsWriteAliasExists) return false;
} catch (err) {
mlLog('info', 'Disabling ML annotations feature because the index/alias integrity check failed.');
mlLog.info('Disabling ML annotations feature because the index/alias integrity check failed.');
return false;
}

12
x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.js
View file

@ -68,7 +68,7 @@ export class DataRecognizer {
try {
file = await this.readFile(`${this.modulesDir}/${dir}/manifest.json`);
} catch (error) {
mlLog('warning', `Data recognizer skipping folder ${dir} as manifest.json cannot be read`);
mlLog.warn(`Data recognizer skipping folder ${dir} as manifest.json cannot be read`);
}
if (file !== undefined) {
@ -78,7 +78,7 @@ export class DataRecognizer {
json: JSON.parse(file)
});
} catch (error) {
mlLog('warning', `Data recognizer error parsing ${dir}/manifest.json. ${error}`);
mlLog.warn(`Data recognizer error parsing ${dir}/manifest.json. ${error}`);
}
}
@ -104,7 +104,7 @@ export class DataRecognizer {
try {
match = await this.searchForFields(moduleConfig, indexPattern);
} catch (error) {
mlLog('warning', `Data recognizer error running query defined for module ${moduleConfig.id}. ${error}`);
mlLog.warn(`Data recognizer error running query defined for module ${moduleConfig.id}. ${error}`);
}
if (match === true) {
@ -194,7 +194,7 @@ export class DataRecognizer {
config: JSON.parse(jobConfig)
});
} catch (error) {
mlLog('warning', `Data recognizer error loading config for job ${job.id} for module ${id}. ${error}`);
mlLog.warn(`Data recognizer error loading config for job ${job.id} for module ${id}. ${error}`);
}
}));
@ -211,7 +211,7 @@ export class DataRecognizer {
config
});
} catch (error) {
mlLog('warning', `Data recognizer error loading config for datafeed ${datafeed.id} for module ${id}. ${error}`);
mlLog.warn(`Data recognizer error loading config for datafeed ${datafeed.id} for module ${id}. ${error}`);
}
}));
@ -232,7 +232,7 @@ export class DataRecognizer {
config
});
} catch (error) {
mlLog('warning', `Data recognizer error loading config for ${key} ${obj.id} for module ${id}. ${error}`);
mlLog.warn(`Data recognizer error loading config for ${key} ${obj.id} for module ${id}. ${error}`);
}
}));
}));

6
x-pack/plugins/ml/server/new_platform/plugin.ts
View file

@ -57,7 +57,7 @@ import { jobAuditMessagesRoutes } from '../routes/job_audit_messages';
// @ts-ignore: could not find declaration file for module
import { fileDataVisualizerRoutes } from '../routes/file_data_visualizer';
// @ts-ignore: could not find declaration file for module
import { initMlServerLog } from '../client/log';
import { initMlServerLog, LogInitialization } from '../client/log';
export interface MlHttpServiceSetup extends HttpServiceSetup {
route(route: ServerRoute | ServerRoute[]): void;
@ -108,9 +108,7 @@ export interface UsageInitialization {
};
savedObjects: SavedObjectsService;
}
export interface LogInitialization {
log: Logger;
}
export class Plugin {
private readonly pluginId: string = 'ml';
private config: any;

4
x-pack/plugins/ml/server/routes/system.js
View file

@ -54,9 +54,9 @@ export function systemRoutes({ commonRouteConfig, elasticsearchPlugin, route, xp
// most likely they do not have the ml_user role and therefore will be blocked from using
// ML at all. However, we need to catch this error so the privilege check doesn't fail.
if (error.status === 403) {
mlLog('info', 'Unable to determine whether upgrade is being performed due to insufficient user privileges');
mlLog.info('Unable to determine whether upgrade is being performed due to insufficient user privileges');
} else {
mlLog('warning', 'Unable to determine whether upgrade is being performed');
mlLog.warn('Unable to determine whether upgrade is being performed');
}
}