github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-06-28 19:13:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

[APM] Use apmEventClient for querying APM event indices (#73449)

Browse source 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
Dario Gieselaar 2020-07-31 15:22:04 +02:00 • committed by GitHub
parent dbb603f979
commit c66ea65ec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
110 changed files with 1358 additions and 1588 deletions
Download patch file Download diff file Expand all files Collapse all files

33
x-pack/plugins/apm/server/lib/helpers/setup_request.ts
View file

@ -13,11 +13,17 @@ import {
ApmIndicesConfig,
} from '../settings/apm_indices/get_apm_indices';
import { ESFilter } from '../../../typings/elasticsearch';
import { ESClient } from './es_client';
import { getUiFiltersES } from './convert_ui_filters/get_ui_filters_es';
import { APMRequestHandlerContext } from '../../routes/typings';
import { getESClient } from './es_client';
import { ProcessorEvent } from '../../../common/processor_event';
import {
APMEventClient,
createApmEventClient,
} from './create_es_client/create_apm_event_client';
import {
APMInternalClient,
createInternalESClient,
} from './create_es_client/create_internal_es_client';
function decodeUiFilters(uiFiltersEncoded?: string) {
if (!uiFiltersEncoded) {
@ -30,8 +36,8 @@ function decodeUiFilters(uiFiltersEncoded?: string) {
// https://github.com/microsoft/TypeScript/issues/34933
export interface Setup {
client: ESClient;
internalClient: ESClient;
apmEventClient: APMEventClient;
internalClient: APMInternalClient;
ml?: ReturnType<typeof getMlSetup>;
config: APMConfig;
indices: ApmIndicesConfig;
@ -78,22 +84,19 @@ export async function setupRequest<TParams extends SetupRequestParams>(
context.core.uiSettings.client.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN),
]);
const createClientOptions = {
indices,
includeFrozen,
};
const uiFiltersES = decodeUiFilters(query.uiFilters);
const coreSetupRequest = {
indices,
client: getESClient(context, request, {
clientAsInternalUser: false,
...createClientOptions,
apmEventClient: createApmEventClient({
context,
request,
indices,
options: { includeFrozen },
}),
internalClient: getESClient(context, request, {
clientAsInternalUser: true,
...createClientOptions,
internalClient: createInternalESClient({
context,
request,
}),
ml: getMlSetup(context, request),
config,