From dad051d1824904c6fc8000fa8c0c5cd51db68286 Mon Sep 17 00:00:00 2001 From: Sonja Krause-Harder Date: Mon, 11 May 2020 15:06:33 +0200 Subject: [PATCH 1/3] Add logger to app context. --- x-pack/plugins/ingest_manager/server/plugin.ts | 5 +++++ .../plugins/ingest_manager/server/services/app_context.ts | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts index 24f3a11789dc7f..cd44b61974b035 100644 --- a/x-pack/plugins/ingest_manager/server/plugin.ts +++ b/x-pack/plugins/ingest_manager/server/plugin.ts @@ -8,6 +8,7 @@ import { first } from 'rxjs/operators'; import { CoreSetup, CoreStart, + Logger, Plugin, PluginInitializerContext, SavedObjectsServiceStart, @@ -73,6 +74,7 @@ export interface IngestManagerAppContext { isProductionMode: boolean; kibanaVersion: string; cloud?: CloudSetup; + logger?: Logger; httpSetup?: HttpServiceSetup; } @@ -108,6 +110,7 @@ export class IngestManagerPlugin private config$: Observable; private security: SecurityPluginSetup | undefined; private cloud: CloudSetup | undefined; + private logger: Logger | undefined; private isProductionMode: boolean; private kibanaVersion: string; @@ -117,6 +120,7 @@ export class IngestManagerPlugin this.config$ = this.initializerContext.config.create(); this.isProductionMode = this.initializerContext.env.mode.prod; this.kibanaVersion = this.initializerContext.env.packageInfo.version; + this.logger = this.initializerContext.logger.get(); } public async setup(core: CoreSetup, deps: IngestManagerSetupDeps) { @@ -208,6 +212,7 @@ export class IngestManagerPlugin kibanaVersion: this.kibanaVersion, httpSetup: this.httpSetup, cloud: this.cloud, + logger: this.logger, }); licenseService.start(this.licensing$); return { diff --git a/x-pack/plugins/ingest_manager/server/services/app_context.ts b/x-pack/plugins/ingest_manager/server/services/app_context.ts index 6da0a137fa087e..e5bc082f6f0fc7 100644 --- a/x-pack/plugins/ingest_manager/server/services/app_context.ts +++ b/x-pack/plugins/ingest_manager/server/services/app_context.ts @@ -5,7 +5,7 @@ */ import { BehaviorSubject, Observable } from 'rxjs'; import { first } from 'rxjs/operators'; -import { SavedObjectsServiceStart, HttpServiceSetup } from 'src/core/server'; +import { SavedObjectsServiceStart, HttpServiceSetup, Logger } from 'src/core/server'; import { EncryptedSavedObjectsPluginStart } from '../../../encrypted_saved_objects/server'; import { SecurityPluginSetup } from '../../../security/server'; import { IngestManagerConfigType } from '../../common'; @@ -21,6 +21,7 @@ class AppContextService { private isProductionMode: boolean = false; private kibanaVersion: string | undefined; private cloud?: CloudSetup; + private logger?: Logger; private httpSetup?: HttpServiceSetup; public async start(appContext: IngestManagerAppContext) { @@ -29,6 +30,7 @@ class AppContextService { this.savedObjects = appContext.savedObjects; this.isProductionMode = appContext.isProductionMode; this.cloud = appContext.cloud; + this.logger = appContext.logger; this.kibanaVersion = appContext.kibanaVersion; this.httpSetup = appContext.httpSetup; @@ -60,6 +62,10 @@ class AppContextService { return this.cloud; } + public getLogger() { + return this.logger; + } + public getConfig() { return this.configSubject$?.value; } From d31c8905be513449a11e01468c6459102df0c28b Mon Sep 17 00:00:00 2001 From: Sonja Krause-Harder Date: Mon, 11 May 2020 15:07:58 +0200 Subject: [PATCH 2/3] Use logger in package install handler. --- .../ingest_manager/server/routes/epm/handlers.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts index fd3a9c520b90a4..6855f56bf7706b 100644 --- a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts +++ b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts @@ -27,6 +27,7 @@ import { installPackage, removeInstallation, } from '../../services/epm/packages'; +import { appContextService } from '../../services'; export const getCategoriesHandler: RequestHandler = async (context, request, response) => { try { @@ -121,10 +122,12 @@ export const getInfoHandler: RequestHandler> = async (context, request, response) => { + const logger = appContextService.getLogger(); + const { pkgkey } = request.params; + const savedObjectsClient = context.core.savedObjects.client; + const callCluster = context.core.elasticsearch.adminClient.callAsCurrentUser; + if (logger) logger.info(`Attempting installation of package ${pkgkey}.`); try { - const { pkgkey } = request.params; - const savedObjectsClient = context.core.savedObjects.client; - const callCluster = context.core.elasticsearch.adminClient.callAsCurrentUser; const res = await installPackage({ savedObjectsClient, pkgkey, @@ -136,6 +139,7 @@ export const installPackageHandler: RequestHandler Date: Mon, 11 May 2020 15:24:08 +0200 Subject: [PATCH 3/3] Revert "Use logger in package install handler." This reverts commit d31c8905be513449a11e01468c6459102df0c28b. --- .../ingest_manager/server/routes/epm/handlers.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts index 6855f56bf7706b..fd3a9c520b90a4 100644 --- a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts +++ b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts @@ -27,7 +27,6 @@ import { installPackage, removeInstallation, } from '../../services/epm/packages'; -import { appContextService } from '../../services'; export const getCategoriesHandler: RequestHandler = async (context, request, response) => { try { @@ -122,12 +121,10 @@ export const getInfoHandler: RequestHandler> = async (context, request, response) => { - const logger = appContextService.getLogger(); - const { pkgkey } = request.params; - const savedObjectsClient = context.core.savedObjects.client; - const callCluster = context.core.elasticsearch.adminClient.callAsCurrentUser; - if (logger) logger.info(`Attempting installation of package ${pkgkey}.`); try { + const { pkgkey } = request.params; + const savedObjectsClient = context.core.savedObjects.client; + const callCluster = context.core.elasticsearch.adminClient.callAsCurrentUser; const res = await installPackage({ savedObjectsClient, pkgkey, @@ -139,7 +136,6 @@ export const installPackageHandler: RequestHandler