Observability & APM do not use elasticsearch client provided via setu…

…p contract (#67263) (#67322) * dump prettier version to v2 * use elasticserch client provided via context * use es client provided from start contract
elastic · May 26, 2020 · 622c014 · 622c014
1 parent ce0e4f6
commit 622c014
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -57,7 +57,8 @@ export async function createApmTelemetry({
 
   const collectAndStore = async () => {
     const config = await config$.pipe(take(1)).toPromise();
-    const esClient = core.elasticsearch.dataClient;
+    const [{ elasticsearch }] = await core.getStartServices();
+    const esClient = elasticsearch.legacy.client;
 
     const indices = await getApmIndices({
       config,

diff --git a/x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts b/x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts
@@ -39,7 +39,7 @@ export async function bootstrapAnnotations({ index, core, context }: Params) {
     getScopedAnnotationsClient: (requestContext: RequestHandlerContext, request: KibanaRequest) => {
       return createAnnotationsClient({
         index,
-        apiCaller: core.elasticsearch.dataClient.asScoped(request).callAsCurrentUser,
+        apiCaller: requestContext.core.elasticsearch.dataClient.callAsCurrentUser,
         logger,
         license: requestContext.licensing?.license,
       });

diff --git a/x-pack/plugins/observability/server/lib/annotations/register_annotation_apis.ts b/x-pack/plugins/observability/server/lib/annotations/register_annotation_apis.ts
@@ -50,7 +50,7 @@ export function registerAnnotationAPIs({
         });
       }
 
-      const apiCaller = core.elasticsearch.dataClient.asScoped(request).callAsCurrentUser;
+      const apiCaller = context.core.elasticsearch.dataClient.callAsCurrentUser;
 
       const client = createAnnotationsClient({
         index,