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

[7.x] [APM] Kuery bar gives invalid suggestions (#105132) (#105660)

Browse source 
* [APM] Kuery bar gives invalid suggestions (#105132)

* adding method to support terms_agg

* adding more filters to kuery bar

* addressing PR comments

* fixing docs

* addressing PR comments

* moving file to common

* addressing PR comments

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/server/lib/search_strategies/correlations/get_query_with_params.ts

* removing extra line

Co-authored-by: Cauê Marcondes <55978943+cauemarcondes@users.noreply.github.com>
Co-authored-by: cauemarcondes <caue.marcondes@elastic.co>
This commit is contained in:
Oliver Gupte 2021-07-14 18:03:19 -04:00 • committed by GitHub
parent 627449e114
commit 37c61092c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 162 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querysuggestiongetfnargs.md
View file

@ -19,6 +19,7 @@ export interface QuerySuggestionGetFnArgs
| [boolFilter](./kibana-plugin-plugins-data-public.querysuggestiongetfnargs.boolfilter.md) | <code>any</code> | |
| [indexPatterns](./kibana-plugin-plugins-data-public.querysuggestiongetfnargs.indexpatterns.md) | <code>IIndexPattern[]</code> | |
| [language](./kibana-plugin-plugins-data-public.querysuggestiongetfnargs.language.md) | <code>string</code> | |
| [method](./kibana-plugin-plugins-data-public.querysuggestiongetfnargs.method.md) | <code>ValueSuggestionsMethod</code> | |
| [query](./kibana-plugin-plugins-data-public.querysuggestiongetfnargs.query.md) | <code>string</code> | |
| [selectionEnd](./kibana-plugin-plugins-data-public.querysuggestiongetfnargs.selectionend.md) | <code>number</code> | |
| [selectionStart](./kibana-plugin-plugins-data-public.querysuggestiongetfnargs.selectionstart.md) | <code>number</code> | |

11
docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querysuggestiongetfnargs.method.md Normal file
View file

@ -0,0 +1,11 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [QuerySuggestionGetFnArgs](./kibana-plugin-plugins-data-public.querysuggestiongetfnargs.md) &gt; [method](./kibana-plugin-plugins-data-public.querysuggestiongetfnargs.method.md)
## QuerySuggestionGetFnArgs.method property
<b>Signature:</b>
```typescript
method?: ValueSuggestionsMethod;
```

2
src/plugins/data/common/constants.ts
View file

@ -12,6 +12,8 @@ export const KIBANA_USER_QUERY_LANGUAGE_KEY = 'kibana.userQueryLanguage';
/** @public **/
export const INDEX_PATTERN_SAVED_OBJECT_TYPE = 'index-pattern';
export type ValueSuggestionsMethod = 'terms_enum' | 'terms_agg';
export const UI_SETTINGS = {
META_FIELDS: 'metaFields',
DOC_HIGHLIGHT: 'doc_table:highlight',

3
src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts
View file

@ -35,7 +35,7 @@ export const setupGetValueSuggestions: KqlQuerySuggestionProvider = (
.getStartServices()
.then(([_, __, dataStart]) => dataStart.autocomplete);
return async (
{ indexPatterns, boolFilter, useTimeRange, signal },
{ indexPatterns, boolFilter, useTimeRange, signal, method },
{ start, end, prefix, suffix, fieldName, nestedPath }
): Promise<QuerySuggestion[]> => {
const fullFieldName = nestedPath ? `${nestedPath}.${fieldName}` : fieldName;
@ -59,6 +59,7 @@ export const setupGetValueSuggestions: KqlQuerySuggestionProvider = (
boolFilter,
useTimeRange,
signal,
method,
}).then((valueSuggestions) => {
const quotedValues = valueSuggestions.map((value) =>
typeof value === 'string' ? `"${escapeQuotes(value)}"` : `${value}`

2
src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
View file

@ -6,6 +6,7 @@
* Side Public License, v 1.
*/
import { ValueSuggestionsMethod } from '../../../common';
import { IFieldType, IIndexPattern } from '../../../common/index_patterns';
export enum QuerySuggestionTypes {
@ -30,6 +31,7 @@ export interface QuerySuggestionGetFnArgs {
signal?: AbortSignal;
useTimeRange?: boolean;
boolFilter?: any;
method?: ValueSuggestionsMethod;
}
/** @public **/

29
src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts
View file

@ -9,7 +9,13 @@
import dateMath from '@elastic/datemath';
import { memoize } from 'lodash';
import { CoreSetup } from 'src/core/public';
import { IIndexPattern, IFieldType, UI_SETTINGS, buildQueryFromFilters } from '../../../common';
import {
IIndexPattern,
IFieldType,
UI_SETTINGS,
buildQueryFromFilters,
ValueSuggestionsMethod,
} from '../../../common';
import { TimefilterSetup } from '../../query';
import { AutocompleteUsageCollector } from '../collectors';
@ -22,6 +28,7 @@ interface ValueSuggestionsGetFnArgs {
useTimeRange?: boolean;
boolFilter?: any[];
signal?: AbortSignal;
method?: ValueSuggestionsMethod;
}
const getAutocompleteTimefilter = (
@ -54,12 +61,25 @@ export const setupValueSuggestionProvider = (
}
const requestSuggestions = memoize(
(index: string, field: IFieldType, query: string, filters: any = [], signal?: AbortSignal) => {
(
index: string,
field: IFieldType,
query: string,
filters: any = [],
signal?: AbortSignal,
method?: ValueSuggestionsMethod
) => {
usageCollector?.trackRequest();
return core.http
.fetch(`/api/kibana/suggestions/values/${index}`, {
method: 'POST',
body: JSON.stringify({ query, field: field.name, fieldMeta: field?.toSpec?.(), filters }),
body: JSON.stringify({
query,
field: field.name,
fieldMeta: field?.toSpec?.(),
filters,
method,
}),
signal,
})
.then((r) => {
@ -77,6 +97,7 @@ export const setupValueSuggestionProvider = (
useTimeRange,
boolFilter,
signal,
method,
}: ValueSuggestionsGetFnArgs): Promise<any[]> => {
const shouldSuggestValues = core!.uiSettings.get<boolean>(
UI_SETTINGS.FILTERS_EDITOR_SUGGEST_VALUES
@ -98,7 +119,7 @@ export const setupValueSuggestionProvider = (
const filters = [...(boolFilter ? boolFilter : []), ...filterQuery];
try {
usageCollector?.trackCall();
return await requestSuggestions(title, field, query, filters, signal);
return await requestSuggestions(title, field, query, filters, signal, method);
} catch (e) {
if (!signal?.aborted) {
usageCollector?.trackError();

4
src/plugins/data/public/public.api.md
View file

@ -2184,6 +2184,10 @@ export interface QuerySuggestionGetFnArgs {
indexPatterns: IIndexPattern[];
// (undocumented)
language: string;
// Warning: (ae-forgotten-export) The symbol "ValueSuggestionsMethod" needs to be exported by the entry point index.d.ts
//
// (undocumented)
method?: ValueSuggestionsMethod;
// (undocumented)
query: string;
// (undocumented)

7
src/plugins/data/server/autocomplete/value_suggestions_route.ts
View file

@ -33,6 +33,9 @@ export function registerValueSuggestionsRoute(router: IRouter, config$: Observab
query: schema.string(),
filters: schema.maybe(schema.any()),
fieldMeta: schema.maybe(schema.any()),
method: schema.maybe(
schema.oneOf([schema.literal('terms_agg'), schema.literal('terms_enum')])
),
},
{ unknowns: 'allow' }
),
@ -40,13 +43,13 @@ export function registerValueSuggestionsRoute(router: IRouter, config$: Observab
},
async (context, request, response) => {
const config = await config$.pipe(first()).toPromise();
const { field: fieldName, query, filters, fieldMeta } = request.body;
const { field: fieldName, query, filters, fieldMeta, method } = request.body;
const { index } = request.params;
const abortSignal = getRequestAbortedSignal(request.events.aborted$);
try {
const fn =
config.autocomplete.valueSuggestions.method === 'terms_enum'
(method ?? config.autocomplete.valueSuggestions.method) === 'terms_enum'
? termsEnumSuggestions
: termsAggSuggestions;
const body = await fn(

6
x-pack/plugins/apm/server/utils/queries.test.ts → x-pack/plugins/apm/common/utils/environment_query.test.ts
View file

@ -5,9 +5,9 @@
* 2.0.
*/
import { SERVICE_ENVIRONMENT } from '../../common/elasticsearch_fieldnames';
import { ENVIRONMENT_NOT_DEFINED } from '../../common/environment_filter_values';
import { environmentQuery } from './queries';
import { SERVICE_ENVIRONMENT } from '../elasticsearch_fieldnames';
import { ENVIRONMENT_NOT_DEFINED } from '../environment_filter_values';
import { environmentQuery } from './environment_query';
describe('environmentQuery', () => {
describe('when environment is undefined', () => {

9
x-pack/plugins/apm/server/utils/queries.ts → x-pack/plugins/apm/common/utils/environment_query.ts
View file

@ -5,15 +5,12 @@
* 2.0.
*/
import { ESFilter } from '../../../../../src/core/types/elasticsearch';
import { SERVICE_ENVIRONMENT } from '../../common/elasticsearch_fieldnames';
import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import { SERVICE_ENVIRONMENT } from '../elasticsearch_fieldnames';
import {
ENVIRONMENT_ALL,
ENVIRONMENT_NOT_DEFINED,
} from '../../common/environment_filter_values';
export { kqlQuery, rangeQuery } from '../../../observability/server';
type QueryDslQueryContainer = ESFilter;
} from '../environment_filter_values';
export function environmentQuery(
environment?: string

9
x-pack/plugins/apm/public/components/shared/kuery_bar/get_bool_filter.ts
View file

@ -14,6 +14,7 @@ import {
TRANSACTION_TYPE,
} from '../../../../common/elasticsearch_fieldnames';
import { UIProcessorEvent } from '../../../../common/processor_event';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { IUrlParams } from '../../../context/url_params_context/types';
export function getBoolFilter({
@ -35,6 +36,14 @@ export function getBoolFilter({
});
}
boolFilter.push(...environmentQuery(urlParams.environment));
if (urlParams.transactionType) {
boolFilter.push({
term: { [TRANSACTION_TYPE]: urlParams.transactionType },
});
}
switch (processorEvent) {
case 'transaction':
boolFilter.push({

1
x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx
View file

@ -101,6 +101,7 @@ export function KueryBar(props: { prepend?: React.ReactNode | string }) {
selectionStart,
selectionEnd: selectionStart,
useTimeRange: true,
method: 'terms_agg',
})) || []
)
.filter((suggestion) => !startsWith(suggestion.text, 'span.'))

3
x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts
View file

@ -13,7 +13,8 @@ import {
TRANSACTION_TYPE,
} from '../../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../../common/processor_event';
import { environmentQuery, rangeQuery } from '../../../../server/utils/queries';
import { rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { AlertParams } from '../../../routes/alerts/chart_preview';
import { getBucketSize } from '../../helpers/get_bucket_size';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';

3
x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_error_count.ts
View file

@ -8,7 +8,8 @@
import { SERVICE_NAME } from '../../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../../common/processor_event';
import { AlertParams } from '../../../routes/alerts/chart_preview';
import { environmentQuery, rangeQuery } from '../../../../server/utils/queries';
import { rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { getBucketSize } from '../../helpers/get_bucket_size';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';

3
x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_error_rate.ts
View file

@ -12,7 +12,8 @@ import {
} from '../../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../../common/processor_event';
import { AlertParams } from '../../../routes/alerts/chart_preview';
import { environmentQuery, rangeQuery } from '../../../../server/utils/queries';
import { rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { getBucketSize } from '../../helpers/get_bucket_size';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';
import {

2
x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts
View file

@ -28,7 +28,7 @@ import {
SERVICE_NAME,
} from '../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../common/processor_event';
import { environmentQuery } from '../../../server/utils/queries';
import { environmentQuery } from '../../../common/utils/environment_query';
import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
import { apmActionVariables } from './action_variables';
import { alertingEsClient } from './alerting_es_client';

2
x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
View file

@ -30,7 +30,7 @@ import {
} from '../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../common/processor_event';
import { getDurationFormatter } from '../../../common/utils/formatters';
import { environmentQuery } from '../../../server/utils/queries';
import { environmentQuery } from '../../../common/utils/environment_query';
import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
import { apmActionVariables } from './action_variables';
import { alertingEsClient } from './alerting_es_client';

2
x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts
View file

@ -32,7 +32,7 @@ import {
import { EventOutcome } from '../../../common/event_outcome';
import { ProcessorEvent } from '../../../common/processor_event';
import { asDecimalOrInteger } from '../../../common/utils/formatters';
import { environmentQuery } from '../../../server/utils/queries';
import { environmentQuery } from '../../../common/utils/environment_query';
import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
import { apmActionVariables } from './action_variables';
import { alertingEsClient } from './alerting_es_client';

2
x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
View file

@ -11,7 +11,7 @@ import { snakeCase } from 'lodash';
import Boom from '@hapi/boom';
import { ML_ERRORS } from '../../../common/anomaly_detection';
import { ProcessorEvent } from '../../../common/processor_event';
import { environmentQuery } from '../../../server/utils/queries';
import { environmentQuery } from '../../../common/utils/environment_query';
import { Setup } from '../helpers/setup_request';
import {
TRANSACTION_DURATION,

3
x-pack/plugins/apm/server/lib/correlations/get_filters.ts
View file

@ -7,7 +7,8 @@
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import { ESFilter } from '../../../../../../src/core/types/elasticsearch';
import { environmentQuery, rangeQuery, kqlQuery } from '../../utils/queries';
import { rangeQuery, kqlQuery } from '../../../../observability/server';
import { environmentQuery } from '../../../common/utils/environment_query';
import {
SERVICE_NAME,
TRANSACTION_NAME,

2
x-pack/plugins/apm/server/lib/environments/get_environments.ts
View file

@ -11,7 +11,7 @@ import {
} from '../../../common/elasticsearch_fieldnames';
import { ENVIRONMENT_NOT_DEFINED } from '../../../common/environment_filter_values';
import { ProcessorEvent } from '../../../common/processor_event';
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';
import { Setup, SetupTimeRange } from '../helpers/setup_request';

7
x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts
View file

@ -11,11 +11,8 @@ import {
SERVICE_NAME,
} from '../../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../../common/processor_event';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';
export async function getBuckets({

7
x-pack/plugins/apm/server/lib/errors/get_error_group_sample.ts
View file

@ -12,11 +12,8 @@ import {
TRANSACTION_SAMPLED,
} from '../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../common/processor_event';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../../observability/server';
import { environmentQuery } from '../../../common/utils/environment_query';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import { getTransaction } from '../transactions/get_transaction';

2
x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts
View file

@ -6,7 +6,7 @@
*/
import { SearchAggregatedTransactionSetting } from '../../../../common/aggregated_transactions';
import { kqlQuery, rangeQuery } from '../../../../server/utils/queries';
import { kqlQuery, rangeQuery } from '../../../../../observability/server';
import { ProcessorEvent } from '../../../../common/processor_event';
import {
TRANSACTION_DURATION,

2
x-pack/plugins/apm/server/lib/observability_overview/get_service_count.ts
View file

@ -6,7 +6,7 @@
*/
import { ProcessorEvent } from '../../../common/processor_event';
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';

2
x-pack/plugins/apm/server/lib/observability_overview/get_transactions_per_minute.ts
View file

@ -10,7 +10,7 @@ import {
TRANSACTION_REQUEST,
} from '../../../common/transaction_types';
import { TRANSACTION_TYPE } from '../../../common/elasticsearch_fieldnames';
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';
import { calculateThroughput } from '../helpers/calculate_throughput';

2
x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts
View file

@ -11,7 +11,7 @@ import {
TRANSACTION_TYPE,
} from '../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../common/processor_event';
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { TRANSACTION_PAGE_LOAD } from '../../../common/transaction_types';
export async function hasRumData({

2
x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts
View file

@ -11,7 +11,7 @@ import {
} from '../../../../common/ux_ui_filter';
import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
import { UxUIFilters } from '../../../../typings/ui_filters';
import { environmentQuery } from '../../../utils/queries';
import { environmentQuery } from '../../../../common/utils/environment_query';
export function getEsFilter(uiFilters: UxUIFilters, exclude?: boolean) {
const localFilterValues = uiFilters;

2
x-pack/plugins/apm/server/lib/search_strategies/correlations/get_query_with_params.ts
View file

@ -13,7 +13,7 @@ import {
TRANSACTION_NAME,
} from '../../../../common/elasticsearch_fieldnames';
import type { SearchServiceParams } from '../../../../common/search_strategies/correlations/types';
import { environmentQuery as getEnvironmentQuery } from '../../../utils/queries';
import { environmentQuery as getEnvironmentQuery } from '../../../../common/utils/environment_query';
import { ProcessorEvent } from '../../../../common/processor_event';
const getPercentileThresholdValueQuery = (

2
x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { ProcessorEvent } from '../../../common/processor_event';
import { TRACE_ID } from '../../../common/elasticsearch_fieldnames';
import {

2
x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
View file

@ -18,7 +18,7 @@ import {
TRANSACTION_PAGE_LOAD,
TRANSACTION_REQUEST,
} from '../../../common/transaction_types';
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { withApmSpan } from '../../utils/with_apm_span';
import { getMlJobsWithAPMGroup } from '../anomaly_detection/get_ml_jobs_with_apm_group';
import { Setup, SetupTimeRange } from '../helpers/setup_request';

2
x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
View file

@ -15,7 +15,7 @@ import {
} from '../../../common/elasticsearch_fieldnames';
import { getServicesProjection } from '../../projections/services';
import { mergeProjection } from '../../projections/util/merge_projection';
import { environmentQuery } from '../../../server/utils/queries';
import { environmentQuery } from '../../../common/utils/environment_query';
import { withApmSpan } from '../../utils/with_apm_span';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import {

3
x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
View file

@ -19,7 +19,8 @@ import {
TRANSACTION_PAGE_LOAD,
TRANSACTION_REQUEST,
} from '../../../common/transaction_types';
import { environmentQuery, rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { environmentQuery } from '../../../common/utils/environment_query';
import { withApmSpan } from '../../utils/with_apm_span';
import {
getDocumentTypeFilterForAggregatedTransactions,

3
x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
View file

@ -17,7 +17,8 @@ import {
} from '../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../common/processor_event';
import { SERVICE_MAP_TIMEOUT_ERROR } from '../../../common/service_map';
import { environmentQuery, rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { environmentQuery } from '../../../common/utils/environment_query';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
const MAX_TRACES_TO_INSPECT = 1000;

3
x-pack/plugins/apm/server/lib/services/annotations/get_derived_service_annotations.ts
View file

@ -12,7 +12,8 @@ import {
SERVICE_NAME,
SERVICE_VERSION,
} from '../../../../common/elasticsearch_fieldnames';
import { environmentQuery, rangeQuery } from '../../../../server/utils/queries';
import { rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import {
getDocumentTypeFilterForAggregatedTransactions,
getProcessorEventForAggregatedTransactions,

3
x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts
View file

@ -7,7 +7,8 @@
import { ResponseError } from '@elastic/elasticsearch/lib/errors';
import { ElasticsearchClient, Logger } from 'kibana/server';
import { environmentQuery, rangeQuery } from '../../../../server/utils/queries';
import { rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import {
unwrapEsResponse,
WrappedElasticsearchClientError,

2
x-pack/plugins/apm/server/lib/services/get_service_agent_name.ts
View file

@ -10,7 +10,7 @@ import {
AGENT_NAME,
SERVICE_NAME,
} from '../../../common/elasticsearch_fieldnames';
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';

3
x-pack/plugins/apm/server/lib/services/get_service_alerts.ts
View file

@ -11,7 +11,8 @@ import {
SERVICE_NAME,
TRANSACTION_TYPE,
} from '../../../common/elasticsearch_fieldnames';
import { environmentQuery, rangeQuery } from '../../utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { environmentQuery } from '../../../common/utils/environment_query';
export async function getServiceAlerts({
ruleDataClient,

3
x-pack/plugins/apm/server/lib/services/get_service_dependencies/get_destination_map.ts
View file

@ -21,7 +21,8 @@ import {
SPAN_TYPE,
} from '../../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../../common/processor_event';
import { environmentQuery, rangeQuery } from '../../../../server/utils/queries';
import { rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { joinByKey } from '../../../../common/utils/join_by_key';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';
import { withApmSpan } from '../../../utils/with_apm_span';

3
x-pack/plugins/apm/server/lib/services/get_service_dependencies/get_metrics.ts
View file

@ -14,7 +14,8 @@ import {
SPAN_DESTINATION_SERVICE_RESPONSE_TIME_SUM,
} from '../../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../../common/processor_event';
import { environmentQuery, rangeQuery } from '../../../../server/utils/queries';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { rangeQuery } from '../../../../../observability/server';
import { getBucketSize } from '../../helpers/get_bucket_size';
import { EventOutcome } from '../../../../common/event_outcome';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';

7
x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_detailed_statistics.ts
View file

@ -13,11 +13,8 @@ import {
TRANSACTION_TYPE,
} from '../../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../../common/processor_event';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { getBucketSize } from '../../helpers/get_bucket_size';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';

7
x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_main_statistics.ts
View file

@ -14,11 +14,8 @@ import {
} from '../../../../common/elasticsearch_fieldnames';
import { NOT_AVAILABLE_LABEL } from '../../../../common/i18n';
import { ProcessorEvent } from '../../../../common/processor_event';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { getErrorName } from '../../helpers/get_error_name';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';

7
x-pack/plugins/apm/server/lib/services/get_service_error_groups/index.ts
View file

@ -9,11 +9,8 @@ import { ValuesType } from 'utility-types';
import { orderBy } from 'lodash';
import { NOT_AVAILABLE_LABEL } from '../../../../common/i18n';
import { PromiseReturnType } from '../../../../../observability/typings/common';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { ProcessorEvent } from '../../../../common/processor_event';
import {
ERROR_EXC_MESSAGE,

3
x-pack/plugins/apm/server/lib/services/get_service_instance_metadata_details.ts
View file

@ -10,7 +10,8 @@ import {
SERVICE_NODE_NAME,
TRANSACTION_TYPE,
} from '../../../common/elasticsearch_fieldnames';
import { environmentQuery, kqlQuery, rangeQuery } from '../../utils/queries';
import { kqlQuery, rangeQuery } from '../../../../observability/server';
import { environmentQuery } from '../../../common/utils/environment_query';
import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';
import { Setup, SetupTimeRange } from '../helpers/setup_request';

3
x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_system_metric_statistics.ts
View file

@ -17,7 +17,8 @@ import {
import { ProcessorEvent } from '../../../../common/processor_event';
import { SERVICE_NODE_NAME_MISSING } from '../../../../common/service_nodes';
import { Coordinate } from '../../../../typings/timeseries';
import { environmentQuery, kqlQuery, rangeQuery } from '../../../utils/queries';
import { kqlQuery, rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { getBucketSize } from '../../helpers/get_bucket_size';
import { Setup } from '../../helpers/setup_request';
import {

3
x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts
View file

@ -14,7 +14,8 @@ import { EventOutcome } from '../../../../common/event_outcome';
import { LatencyAggregationType } from '../../../../common/latency_aggregation_types';
import { SERVICE_NODE_NAME_MISSING } from '../../../../common/service_nodes';
import { Coordinate } from '../../../../typings/timeseries';
import { environmentQuery, kqlQuery, rangeQuery } from '../../../utils/queries';
import { kqlQuery, rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import {
getProcessorEventForAggregatedTransactions,
getTransactionDurationFieldForAggregatedTransactions,

2
x-pack/plugins/apm/server/lib/services/get_service_metadata_details.ts
View file

@ -20,7 +20,7 @@ import {
SERVICE_VERSION,
} from '../../../common/elasticsearch_fieldnames';
import { ContainerType } from '../../../common/service_metadata';
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { TransactionRaw } from '../../../typings/es_schemas/raw/transaction_raw';
import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';
import { Setup, SetupTimeRange } from '../helpers/setup_request';

2
x-pack/plugins/apm/server/lib/services/get_service_metadata_icons.ts
View file

@ -16,7 +16,7 @@ import {
HOST_OS_PLATFORM,
} from '../../../common/elasticsearch_fieldnames';
import { ContainerType } from '../../../common/service_metadata';
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { TransactionRaw } from '../../../typings/es_schemas/raw/transaction_raw';
import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';
import { Setup, SetupTimeRange } from '../helpers/setup_request';

7
x-pack/plugins/apm/server/lib/services/get_service_transaction_group_detailed_statistics.ts
View file

@ -15,11 +15,8 @@ import {
import { EventOutcome } from '../../../common/event_outcome';
import { LatencyAggregationType } from '../../../common/latency_aggregation_types';
import { offsetPreviousPeriodCoordinates } from '../../../common/utils/offset_previous_period_coordinate';
import {
environmentQuery,
kqlQuery,
rangeQuery,
} from '../../../server/utils/queries';
import { kqlQuery, rangeQuery } from '../../../../observability/server';
import { environmentQuery } from '../../../common/utils/environment_query';
import { Coordinate } from '../../../typings/timeseries';
import {
getDocumentTypeFilterForAggregatedTransactions,

7
x-pack/plugins/apm/server/lib/services/get_service_transaction_groups.ts
View file

@ -13,11 +13,8 @@ import {
} from '../../../common/elasticsearch_fieldnames';
import { EventOutcome } from '../../../common/event_outcome';
import { LatencyAggregationType } from '../../../common/latency_aggregation_types';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../../observability/server';
import { environmentQuery } from '../../../common/utils/environment_query';
import {
getDocumentTypeFilterForAggregatedTransactions,
getProcessorEventForAggregatedTransactions,

2
x-pack/plugins/apm/server/lib/services/get_service_transaction_types.ts
View file

@ -9,7 +9,7 @@ import {
SERVICE_NAME,
TRANSACTION_TYPE,
} from '../../../common/elasticsearch_fieldnames';
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import {
getDocumentTypeFilterForAggregatedTransactions,

2
x-pack/plugins/apm/server/lib/services/get_services/get_legacy_data_status.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { rangeQuery } from '../../../../server/utils/queries';
import { rangeQuery } from '../../../../../observability/server';
import { ProcessorEvent } from '../../../../common/processor_event';
import { OBSERVER_VERSION_MAJOR } from '../../../../common/elasticsearch_fieldnames';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';

7
x-pack/plugins/apm/server/lib/services/get_services/get_service_transaction_stats.ts
View file

@ -15,11 +15,8 @@ import {
TRANSACTION_PAGE_LOAD,
TRANSACTION_REQUEST,
} from '../../../../common/transaction_types';
import {
environmentQuery,
kqlQuery,
rangeQuery,
} from '../../../../server/utils/queries';
import { kqlQuery, rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
import {
getDocumentTypeFilterForAggregatedTransactions,

3
x-pack/plugins/apm/server/lib/services/get_services/get_services_from_metric_documents.ts
View file

@ -11,7 +11,8 @@ import {
SERVICE_ENVIRONMENT,
SERVICE_NAME,
} from '../../../../common/elasticsearch_fieldnames';
import { environmentQuery, kqlQuery, rangeQuery } from '../../../utils/queries';
import { kqlQuery, rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { ProcessorEvent } from '../../../../common/processor_event';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';

7
x-pack/plugins/apm/server/lib/services/get_throughput.ts
View file

@ -10,11 +10,8 @@ import {
SERVICE_NAME,
TRANSACTION_TYPE,
} from '../../../common/elasticsearch_fieldnames';
import {
environmentQuery,
kqlQuery,
rangeQuery,
} from '../../../server/utils/queries';
import { kqlQuery, rangeQuery } from '../../../../observability/server';
import { environmentQuery } from '../../../common/utils/environment_query';
import {
getDocumentTypeFilterForAggregatedTransactions,
getProcessorEventForAggregatedTransactions,

7
x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_statistics.ts
View file

@ -21,11 +21,8 @@ import {
PROFILE_TOP_ID,
SERVICE_NAME,
} from '../../../../common/elasticsearch_fieldnames';
import {
rangeQuery,
environmentQuery,
kqlQuery,
} from '../../../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { APMEventClient } from '../../helpers/create_es_client/create_apm_event_client';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';
import { withApmSpan } from '../../../utils/with_apm_span';

4
x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_timeline.ts
View file

@ -5,7 +5,6 @@
* 2.0.
*/
import { mapKeys, mapValues } from 'lodash';
import { rangeQuery, environmentQuery } from '../../../../server/utils/queries';
import { ProcessorEvent } from '../../../../common/processor_event';
import {
PROFILE_ID,
@ -17,7 +16,8 @@ import {
} from '../../../../common/profiling';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';
import { getBucketSize } from '../../helpers/get_bucket_size';
import { kqlQuery } from '../../../utils/queries';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { kqlQuery, rangeQuery } from '../../../../../observability/server';
const configMap = mapValues(
mapKeys(ProfilingValueType, (val, key) => val),

2
x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
View file

@ -16,7 +16,7 @@ import {
ERROR_LOG_LEVEL,
} from '../../../common/elasticsearch_fieldnames';
import { APMError } from '../../../typings/es_schemas/ui/apm_error';
import { rangeQuery } from '../../../server/utils/queries';
import { rangeQuery } from '../../../../observability/server';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import { PromiseValueType } from '../../../typings/common';

7
x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts
View file

@ -13,11 +13,8 @@ import {
} from '../../../common/elasticsearch_fieldnames';
import { EventOutcome } from '../../../common/event_outcome';
import { offsetPreviousPeriodCoordinates } from '../../../common/utils/offset_previous_period_coordinate';
import {
environmentQuery,
kqlQuery,
rangeQuery,
} from '../../../server/utils/queries';
import { kqlQuery, rangeQuery } from '../../../../observability/server';
import { environmentQuery } from '../../../common/utils/environment_query';
import { Coordinate } from '../../../typings/timeseries';
import {
getDocumentTypeFilterForAggregatedTransactions,

7
x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
View file

@ -18,11 +18,8 @@ import {
TRANSACTION_BREAKDOWN_COUNT,
} from '../../../../common/elasticsearch_fieldnames';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { getMetricsDateHistogramParams } from '../../helpers/metrics';
import { MAX_KPIS } from './constants';
import { getVizColorForIndex } from '../../../../common/viz_colors';

7
x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
View file

@ -17,11 +17,8 @@ import {
} from '../../../../../common/elasticsearch_fieldnames';
import { ProcessorEvent } from '../../../../../common/processor_event';
import { joinByKey } from '../../../../../common/utils/join_by_key';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../../../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../../../../observability/server';
import { environmentQuery } from '../../../../../common/utils/environment_query';
import {
getDocumentTypeFilterForAggregatedTransactions,
getProcessorEventForAggregatedTransactions,

7
x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts
View file

@ -15,11 +15,8 @@ import {
getProcessorEventForAggregatedTransactions,
getTransactionDurationFieldForAggregatedTransactions,
} from '../../helpers/aggregated_transactions';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
export async function getDistributionMax({
environment,

2
x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts
View file

@ -8,7 +8,7 @@
import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import { ESSearchResponse } from '../../../../../../../src/core/types/elasticsearch';
import { PromiseReturnType } from '../../../../../observability/typings/common';
import { rangeQuery } from '../../../../server/utils/queries';
import { rangeQuery } from '../../../../../observability/server';
import { asMutableArray } from '../../../../common/utils/as_mutable_array';
import { withApmSpan } from '../../../utils/with_apm_span';
import { Setup } from '../../helpers/setup_request';

7
x-pack/plugins/apm/server/lib/transactions/get_latency_charts/index.ts
View file

@ -14,11 +14,8 @@ import {
} from '../../../../common/elasticsearch_fieldnames';
import { LatencyAggregationType } from '../../../../common/latency_aggregation_types';
import { offsetPreviousPeriodCoordinates } from '../../../../common/utils/offset_previous_period_coordinate';
import {
environmentQuery,
kqlQuery,
rangeQuery,
} from '../../../../server/utils/queries';
import { kqlQuery, rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import {
getDocumentTypeFilterForAggregatedTransactions,
getProcessorEventForAggregatedTransactions,

7
x-pack/plugins/apm/server/lib/transactions/get_throughput_charts/index.ts
View file

@ -13,11 +13,8 @@ import {
TRANSACTION_RESULT,
TRANSACTION_TYPE,
} from '../../../../common/elasticsearch_fieldnames';
import {
environmentQuery,
kqlQuery,
rangeQuery,
} from '../../../../server/utils/queries';
import { kqlQuery, rangeQuery } from '../../../../../observability/server';
import { environmentQuery } from '../../../../common/utils/environment_query';
import {
getDocumentTypeFilterForAggregatedTransactions,
getProcessorEventForAggregatedTransactions,

2
x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts
View file

@ -9,7 +9,7 @@ import {
TRACE_ID,
TRANSACTION_ID,
} from '../../../../common/elasticsearch_fieldnames';
import { rangeQuery } from '../../../../server/utils/queries';
import { rangeQuery } from '../../../../../observability/server';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';
import { ProcessorEvent } from '../../../../common/processor_event';
import { asMutableArray } from '../../../../common/utils/as_mutable_array';

7
x-pack/plugins/apm/server/projections/errors.ts
View file

@ -10,11 +10,8 @@ import {
SERVICE_NAME,
ERROR_GROUP_ID,
} from '../../common/elasticsearch_fieldnames';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../observability/server';
import { environmentQuery } from '../../common/utils/environment_query';
import { ProcessorEvent } from '../../common/processor_event';
export function getErrorGroupsProjection({

7
x-pack/plugins/apm/server/projections/metrics.ts
View file

@ -11,11 +11,8 @@ import {
SERVICE_NAME,
SERVICE_NODE_NAME,
} from '../../common/elasticsearch_fieldnames';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../observability/server';
import { environmentQuery } from '../../common/utils/environment_query';
import { SERVICE_NODE_NAME_MISSING } from '../../common/service_nodes';
import { ProcessorEvent } from '../../common/processor_event';

2
x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts
View file

@ -11,7 +11,7 @@ import {
TRANSACTION_TYPE,
SERVICE_LANGUAGE_NAME,
} from '../../common/elasticsearch_fieldnames';
import { rangeQuery } from '../../server/utils/queries';
import { rangeQuery } from '../../../observability/server';
import { ProcessorEvent } from '../../common/processor_event';
import { TRANSACTION_PAGE_LOAD } from '../../common/transaction_types';
import { getEsFilter } from '../lib/rum_client/ui_filters/get_es_filter';

2
x-pack/plugins/apm/server/projections/services.ts
View file

@ -7,7 +7,7 @@
import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
import { SERVICE_NAME } from '../../common/elasticsearch_fieldnames';
import { rangeQuery, kqlQuery } from '../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../observability/server';
import { ProcessorEvent } from '../../common/processor_event';
import { getProcessorEventForAggregatedTransactions } from '../lib/helpers/aggregated_transactions';

7
x-pack/plugins/apm/server/projections/transactions.ts
View file

@ -12,11 +12,8 @@ import {
TRANSACTION_TYPE,
TRANSACTION_NAME,
} from '../../common/elasticsearch_fieldnames';
import {
environmentQuery,
rangeQuery,
kqlQuery,
} from '../../server/utils/queries';
import { rangeQuery, kqlQuery } from '../../../observability/server';
import { environmentQuery } from '../../common/utils/environment_query';
import {
getProcessorEventForAggregatedTransactions,
getDocumentTypeFilterForAggregatedTransactions,