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] Refactor ESClient to allow other operations than search (#37334)

Browse source
This commit is contained in:
Søren Louv-Jansen 2019-05-30 16:24:52 +02:00 • committed by GitHub
parent e2ae24df10
commit e03b080a1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 248 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,127 +4,31 @@
* you may not use this file except in compliance with the Elastic License.
*/
/* eslint-disable no-console */
import {
AggregationSearchResponse,
ESFilter,
SearchParams
} from 'elasticsearch';
import { Legacy } from 'kibana';
import { cloneDeep, has, isString, set } from 'lodash';
import moment from 'moment';
import { OBSERVER_VERSION_MAJOR } from '../../../common/elasticsearch_fieldnames';
import { getESClient } from './es_client';
function decodeUiFiltersES(esQuery?: string) {
return esQuery ? JSON.parse(decodeURIComponent(esQuery)) : null;
}
export interface APMSearchParams extends SearchParams {
includeLegacyData?: boolean;
}
export type ESClient = <T = void, U = void>(
type: string,
params: APMSearchParams
) => Promise<AggregationSearchResponse<T, U>>;
export interface Setup {
start: number;
end: number;
uiFiltersES: ESFilter[];
client: ESClient;
config: Legacy.KibanaConfig;
}
interface APMRequestQuery {
export interface APMRequestQuery {
_debug: string;
start: string;
end: string;
uiFiltersES?: string;
}
function getApmIndices(config: Legacy.KibanaConfig) {
return [
config.get<string>('apm_oss.errorIndices'),
config.get<string>('apm_oss.metricsIndices'),
config.get<string>('apm_oss.onboardingIndices'),
config.get<string>('apm_oss.sourcemapIndices'),
config.get<string>('apm_oss.spanIndices'),
config.get<string>('apm_oss.transactionIndices')
];
}
export function isApmIndex(
apmIndices: string[],
indexParam: SearchParams['index']
) {
if (isString(indexParam)) {
return apmIndices.includes(indexParam);
} else if (Array.isArray(indexParam)) {
// return false if at least one of the indices is not an APM index
return indexParam.every(index => apmIndices.includes(index));
}
return false;
}
function addFilterForLegacyData(
apmIndices: string[],
{ includeLegacyData = false, ...params }: APMSearchParams
): SearchParams {
// search across all data (including data)
if (includeLegacyData || !isApmIndex(apmIndices, params.index)) {
return params;
}
const nextParams = cloneDeep(params);
if (!has(nextParams, 'body.query.bool.filter')) {
set(nextParams, 'body.query.bool.filter', []);
}
// add filter for omitting pre-7.x data
nextParams.body.query.bool.filter.push({
range: { [OBSERVER_VERSION_MAJOR]: { gte: 7 } }
});
return nextParams;
}
export function setupRequest(req: Legacy.Request): Setup {
export type Setup = ReturnType<typeof setupRequest>;
export function setupRequest(req: Legacy.Request) {
const query = (req.query as unknown) as APMRequestQuery;
const cluster = req.server.plugins.elasticsearch.getCluster('data');
const uiSettings = req.getUiSettingsService();
const config = req.server.config();
const apmIndices = getApmIndices(config);
const client: ESClient = async (type, params) => {
const includeFrozen = await uiSettings.get('search:includeFrozen');
const nextParams = {
...addFilterForLegacyData(apmIndices, params), // filter out pre-7.0 data
ignore_throttled: !includeFrozen, // whether to query frozen indices or not
rest_total_hits_as_int: true // ensure that ES returns accurate hits.total with pre-6.6 format
};
if (query._debug) {
console.log(`DEBUG ES QUERY:`);
console.log('includeFrozen: ', includeFrozen);
console.log(
`${req.method.toUpperCase()} ${req.url.pathname} ${JSON.stringify(
query
)}`
);
console.log(`GET ${nextParams.index}/_search`);
console.log(JSON.stringify(nextParams.body, null, 4));
}
return cluster.callWithRequest(req, type, nextParams);
};
return {
start: moment.utc(query.start).valueOf(),
end: moment.utc(query.end).valueOf(),
uiFiltersES: decodeUiFiltersES(query.uiFiltersES) || [],
client,
client: getESClient(req),
config
};
}