github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.14] [ES|QL] Remove version from _query requests (#184053) (#184228)

Browse source 
# Backport

This will backport the following commits from `main` to `8.14`:
- [[ES|QL] Remove version from _query requests
(#184053)](https://github.com/elastic/kibana/pull/184053)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Stratoula
Kalafateli","email":"efstratia.kalafateli@elastic.co"},"sourceCommit":{"committedDate":"2024-05-24T13:44:52Z","message":"[ES|QL]
Remove version from _query requests (#184053)\n\n##
Summary\r\n\r\nRemoves the versioning from the _query api
requests.\r\n\r\nThis ES PR removes the version from the _query
requests\r\nhttps://github.com/elastic/elasticsearch/pull/108919 and got
backported\r\nat 8.14 too. We need to also remove it from our side too
to be in sync\r\nwith ES
changes.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"5c78c0132163b10917ea68407d66bc4d70d09025","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:prev-minor","Team:Obs
AI
Assistant","Feature:ES|QL","ci:project-deploy-observability","v8.14.0","Team:ESQL","v8.15.0"],"number":184053,"url":"https://github.com/elastic/kibana/pull/184053","mergeCommit":{"message":"[ES|QL]
Remove version from _query requests (#184053)\n\n##
Summary\r\n\r\nRemoves the versioning from the _query api
requests.\r\n\r\nThis ES PR removes the version from the _query
requests\r\nhttps://github.com/elastic/elasticsearch/pull/108919 and got
backported\r\nat 8.14 too. We need to also remove it from our side too
to be in sync\r\nwith ES
changes.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"5c78c0132163b10917ea68407d66bc4d70d09025"}},"sourceBranch":"main","suggestedTargetBranches":["8.14"],"targetPullRequestStates":[{"branch":"8.14","label":"v8.14.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.15.0","labelRegex":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/184053","number":184053,"mergeCommit":{"message":"[ES|QL]
Remove version from _query requests (#184053)\n\n##
Summary\r\n\r\nRemoves the versioning from the _query api
requests.\r\n\r\nThis ES PR removes the version from the _query
requests\r\nhttps://github.com/elastic/elasticsearch/pull/108919 and got
backported\r\nat 8.14 too. We need to also remove it from our side too
to be in sync\r\nwith ES
changes.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"5c78c0132163b10917ea68407d66bc4d70d09025"}}]}]
BACKPORT-->

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Stratoula Kalafateli 2024-05-29 10:50:11 +02:00 • committed by GitHub
parent 569aa63e2f
commit 33a056bec6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 13 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

1
packages/kbn-es-types/src/search.ts
View file

@ -688,7 +688,6 @@ export interface ESQLSearchParams {
// https://github.com/elastic/elasticsearch/pull/102767
// time_zone?: string;
query: string;
version: string;
filter?: unknown;
locale?: string;
dropNullColumns?: boolean;

4
packages/kbn-esql-utils/constants.ts
View file

@ -5,8 +5,4 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
// we are expecting to retrieve this from an API instead
// https://github.com/elastic/elasticsearch/issues/107069
export const ESQL_LATEST_VERSION = '2024.04.01';
export const ENABLE_ESQL = 'enableESQL';

2
packages/kbn-esql-utils/index.ts
View file

@ -19,4 +19,4 @@ export {
TextBasedLanguages,
} from './src';
export { ESQL_LATEST_VERSION, ENABLE_ESQL } from './constants';
export { ENABLE_ESQL } from './constants';

6
packages/kbn-generate-csv/src/generate_csv_esql.test.ts
View file

@ -22,7 +22,6 @@ import { IKibanaSearchResponse } from '@kbn/data-plugin/common';
import { IScopedSearchClient } from '@kbn/data-plugin/server';
import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
import { CancellationToken } from '@kbn/reporting-common';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import type { ReportingConfigType } from '@kbn/reporting-server';
import type { ESQLSearchReponse as ESQLSearchResponse } from '@kbn/es-types';
import {
@ -312,7 +311,7 @@ describe('CsvESQLGenerator', () => {
);
expect(mockDataClientSearchFn).toBeCalledWith(
{ params: { filter: undefined, locale: 'en', query: '', version: ESQL_LATEST_VERSION } },
{ params: { filter: undefined, locale: 'en', query: '' } },
{
strategy: 'esql',
transport: {
@ -390,7 +389,7 @@ describe('CsvESQLGenerator', () => {
);
expect(mockDataClientSearchFn).toBeCalledWith(
{ params: { filter: undefined, locale: 'en', query: '', version: ESQL_LATEST_VERSION } },
{ params: { filter: undefined, locale: 'en', query: '' } },
{
strategy: 'esql',
transport: {
@ -486,7 +485,6 @@ describe('CsvESQLGenerator', () => {
},
locale: 'en',
query: '',
version: ESQL_LATEST_VERSION,
},
},
{

2
packages/kbn-generate-csv/src/generate_csv_esql.ts
View file

@ -8,7 +8,6 @@
import { lastValueFrom } from 'rxjs';
import type { Writable } from 'stream';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import { errors as esErrors } from '@elastic/elasticsearch';
import type { IScopedClusterClient, IUiSettingsClient, Logger } from '@kbn/core/server';
import {
@ -100,7 +99,6 @@ export class CsvESQLGenerator {
// we will need to add it back in once it is supported again.
// https://github.com/elastic/elasticsearch/pull/102767
// timezone
version: ESQL_LATEST_VERSION,
},
};

1
packages/kbn-generate-csv/tsconfig.json
View file

@ -28,6 +28,5 @@
"@kbn/reporting-export-types-csv-common",
"@kbn/es-query",
"@kbn/es-types",
"@kbn/esql-utils",
]
}

3
packages/kbn-unified-field-list/src/services/field_stats_text_based/load_field_stats_text_based.ts
View file

@ -15,7 +15,7 @@ import type {
} from '@kbn/data-plugin/public';
import type { ESQLSearchParams, ESQLSearchReponse } from '@kbn/es-types';
import type { AggregateQuery } from '@kbn/es-query';
import { ESQL_LATEST_VERSION, getESQLWithSafeLimit } from '@kbn/esql-utils';
import { getESQLWithSafeLimit } from '@kbn/esql-utils';
import type { FieldStatsResponse } from '../../types';
import {
buildSearchFilter,
@ -77,7 +77,6 @@ export const loadFieldStatsTextBased: LoadFieldStatsTextBasedHandler = async ({
params: {
...(filter ? { filter } : {}),
...body,
version: ESQL_LATEST_VERSION,
},
},
{

2
src/plugins/data/common/search/expressions/esql.ts
View file

@ -17,7 +17,6 @@ import { Observable, defer, throwError } from 'rxjs';
import { catchError, map, switchMap, tap } from 'rxjs';
import { buildEsQuery } from '@kbn/es-query';
import type { ESQLSearchReponse, ESQLSearchParams } from '@kbn/es-types';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import { getEsQueryConfig } from '../../es_query';
import { getTime } from '../../query';
import {
@ -151,7 +150,6 @@ export const getEsqlFn = ({ getStartDependencies }: EsqlFnArguments) => {
query,
// time_zone: timezone,
locale,
version: ESQL_LATEST_VERSION,
};
if (input) {
const esQueryConfigs = getEsQueryConfig(

12
src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.test.ts
View file

@ -8,7 +8,6 @@
import { firstValueFrom } from 'rxjs';
import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import { KbnSearchError } from '../../report_search_error';
import { errors } from '@elastic/elasticsearch';
import indexNotFoundException from '../../../../common/search/test_data/index_not_found_exception.json';
@ -67,7 +66,6 @@ describe('ES|QL async search strategy', () => {
const esSearch = await esqlAsyncSearchStrategyProvider(mockSearchConfig, mockLogger);
const params = {
query: 'from logs* | limit 10',
version: ESQL_LATEST_VERSION,
};
await esSearch
.search(
@ -91,7 +89,6 @@ describe('ES|QL async search strategy', () => {
const params = {
query: 'from logs* | limit 10',
version: ESQL_LATEST_VERSION,
};
const esSearch = await esqlAsyncSearchStrategyProvider(mockSearchConfig, mockLogger);
@ -111,7 +108,6 @@ describe('ES|QL async search strategy', () => {
query: 'from logs* | limit 10',
wait_for_completion_timeout: '10s',
keep_alive: '5m',
version: ESQL_LATEST_VERSION,
};
const esSearch = await esqlAsyncSearchStrategyProvider(mockSearchConfig, mockLogger);
@ -127,7 +123,7 @@ describe('ES|QL async search strategy', () => {
it('sets transport options on POST requests', async () => {
const transportOptions = { maxRetries: 1 };
mockApiCaller.mockResolvedValueOnce(mockAsyncResponse);
const params = { query: 'from logs', version: ESQL_LATEST_VERSION };
const params = { query: 'from logs' };
const esSearch = esqlAsyncSearchStrategyProvider(mockSearchConfig, mockLogger);
await firstValueFrom(
@ -144,7 +140,6 @@ describe('ES|QL async search strategy', () => {
wait_for_completion_timeout: '100ms',
keep_on_completion: false,
query: 'from logs',
version: ESQL_LATEST_VERSION,
},
}),
expect.objectContaining({ maxRetries: 1, meta: true, signal: undefined })
@ -155,7 +150,6 @@ describe('ES|QL async search strategy', () => {
mockApiCaller.mockResolvedValueOnce(mockAsyncResponse);
const params = {
query: 'from logs* | limit 10',
version: ESQL_LATEST_VERSION,
};
const esSearch = esqlAsyncSearchStrategyProvider(mockSearchConfig, mockLogger);
@ -181,7 +175,6 @@ describe('ES|QL async search strategy', () => {
const params = {
query: 'from logs* | limit 10',
version: ESQL_LATEST_VERSION,
};
const esSearch = await esqlAsyncSearchStrategyProvider(mockSearchConfig, mockLogger);
@ -204,7 +197,6 @@ describe('ES|QL async search strategy', () => {
const params = {
query: 'from logs* | limit 10',
version: ESQL_LATEST_VERSION,
};
const esSearch = await esqlAsyncSearchStrategyProvider(mockSearchConfig, mockLogger);
const abortController = new AbortController();
@ -238,7 +230,6 @@ describe('ES|QL async search strategy', () => {
const params = {
query: 'from logs* | limit 10',
version: ESQL_LATEST_VERSION,
};
const esSearch = await esqlAsyncSearchStrategyProvider(mockSearchConfig, mockLogger);
@ -262,7 +253,6 @@ describe('ES|QL async search strategy', () => {
const params = {
query: 'from logs* | limit 10',
version: ESQL_LATEST_VERSION,
};
const esSearch = await esqlAsyncSearchStrategyProvider(mockSearchConfig, mockLogger);

1
src/plugins/data/tsconfig.json
View file

@ -54,7 +54,6 @@
"@kbn/es-types",
"@kbn/code-editor",
"@kbn/core-test-helpers-model-versions",
"@kbn/esql-utils"
],
"exclude": [
"target/**/*",

2
test/api_integration/apis/esql/errors.ts
View file

@ -11,7 +11,6 @@ import Path from 'path';
import expect from '@kbn/expect';
import { MappingProperty } from '@elastic/elasticsearch/lib/api/types';
import { REPO_ROOT } from '@kbn/repo-info';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import uniqBy from 'lodash/uniqBy';
import { groupBy, mapValues } from 'lodash';
import { FtrProviderContext } from '../../ftr_provider_context';
@ -127,7 +126,6 @@ export default function ({ getService }: FtrProviderContext) {
path: '/_query',
body: {
query,
version: ESQL_LATEST_VERSION,
},
});
return { resp, error: undefined };

3
test/api_integration/apis/search/bsearch.ts
View file

@ -8,7 +8,6 @@
import expect from '@kbn/expect';
import request from 'superagent';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import { inflateResponse } from '@kbn/bfetch-plugin/public/streaming';
import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common';
import { BFETCH_ROUTE_VERSION_LATEST } from '@kbn/bfetch-plugin/common';
@ -414,7 +413,6 @@ export default function ({ getService }: FtrProviderContext) {
request: {
params: {
query: 'from .kibana | limit 1',
version: ESQL_LATEST_VERSION,
},
},
options: {
@ -443,7 +441,6 @@ export default function ({ getService }: FtrProviderContext) {
request: {
params: {
query: 'fro .kibana | limit 1',
version: ESQL_LATEST_VERSION,
},
},
options: {

1
test/tsconfig.json
View file

@ -73,6 +73,5 @@
"@kbn/links-plugin",
"@kbn/ftr-common-functional-ui-services",
"@kbn/monaco",
"@kbn/esql-utils",
]
}

5
x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/esql/use_esql_overall_stats_data.ts
View file

@ -14,7 +14,7 @@ import { type UseCancellableSearch, useCancellableSearch } from '@kbn/ml-cancell
import type { estypes } from '@elastic/elasticsearch';
import type { ISearchOptions } from '@kbn/data-plugin/common';
import type { TimeBucketsInterval } from '@kbn/ml-time-buckets';
import { getESQLWithSafeLimit, ESQL_LATEST_VERSION, appendToESQLQuery } from '@kbn/esql-utils';
import { getESQLWithSafeLimit, appendToESQLQuery } from '@kbn/esql-utils';
import { isDefined } from '@kbn/ml-is-defined';
import { OMIT_FIELDS } from '../../../../../common/constants';
import type {
@ -94,7 +94,6 @@ const getESQLDocumentCountStats = async (
params: {
query: aggQuery,
...(filter ? { filter } : {}),
version: ESQL_LATEST_VERSION,
},
};
try {
@ -140,7 +139,6 @@ const getESQLDocumentCountStats = async (
params: {
query: appendToESQLQuery(esqlBaseQuery, ' | STATS _count_ = COUNT(*) | LIMIT 1'),
...(filter ? { filter } : {}),
version: ESQL_LATEST_VERSION,
},
};
try {
@ -270,7 +268,6 @@ export const useESQLOverallStatsData = (
// Doing this to match with the default limit
query: esqlBaseQuery,
...(filter ? { filter } : {}),
version: ESQL_LATEST_VERSION,
dropNullColumns: true,
},
},

3
x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/esql_requests/get_boolean_field_stats.ts
View file

@ -9,7 +9,7 @@ import type { UseCancellableSearch } from '@kbn/ml-cancellable-search';
import type { QueryDslQueryContainer } from '@kbn/data-views-plugin/common/types';
import { ESQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
import pLimit from 'p-limit';
import { ESQL_LATEST_VERSION, appendToESQLQuery } from '@kbn/esql-utils';
import { appendToESQLQuery } from '@kbn/esql-utils';
import type { Column } from '../../hooks/esql/use_esql_overall_stats_data';
import { getSafeESQLName } from '../requests/esql_utils';
import { isFulfilled, isRejected } from '../../../common/util/promise_all_settled_utils';
@ -49,7 +49,6 @@ export const getESQLBooleanFieldStats = async ({
params: {
query,
...(filter ? { filter } : {}),
version: ESQL_LATEST_VERSION,
},
},
};

3
x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/esql_requests/get_count_and_cardinality.ts
View file

@ -9,7 +9,7 @@ import pLimit from 'p-limit';
import { chunk } from 'lodash';
import { isDefined } from '@kbn/ml-is-defined';
import type { ESQLSearchReponse } from '@kbn/es-types';
import { ESQL_LATEST_VERSION, appendToESQLQuery } from '@kbn/esql-utils';
import { appendToESQLQuery } from '@kbn/esql-utils';
import type { UseCancellableSearch } from '@kbn/ml-cancellable-search';
import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import { i18n } from '@kbn/i18n';
@ -109,7 +109,6 @@ const getESQLOverallStatsInChunk = async ({
params: {
query,
...(filter ? { filter } : {}),
version: ESQL_LATEST_VERSION,
},
};

3
x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/esql_requests/get_date_field_stats.ts
View file

@ -8,7 +8,7 @@
import type { UseCancellableSearch } from '@kbn/ml-cancellable-search';
import type { QueryDslQueryContainer } from '@kbn/data-views-plugin/common/types';
import { ESQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
import { ESQL_LATEST_VERSION, appendToESQLQuery } from '@kbn/esql-utils';
import { appendToESQLQuery } from '@kbn/esql-utils';
import type { Column } from '../../hooks/esql/use_esql_overall_stats_data';
import { getSafeESQLName } from '../requests/esql_utils';
import type { DateFieldStats, FieldStatsError } from '../../../../../common/types/field_stats';
@ -42,7 +42,6 @@ export const getESQLDateFieldStats = async ({
params: {
query,
...(filter ? { filter } : {}),
version: ESQL_LATEST_VERSION,
},
};
try {

3
x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/esql_requests/get_keyword_fields.ts
View file

@ -9,7 +9,7 @@ import type { UseCancellableSearch } from '@kbn/ml-cancellable-search';
import type { QueryDslQueryContainer } from '@kbn/data-views-plugin/common/types';
import { ESQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
import pLimit from 'p-limit';
import { ESQL_LATEST_VERSION, appendToESQLQuery } from '@kbn/esql-utils';
import { appendToESQLQuery } from '@kbn/esql-utils';
import type { Column } from '../../hooks/esql/use_esql_overall_stats_data';
import { getSafeESQLName } from '../requests/esql_utils';
import { isFulfilled, isRejected } from '../../../common/util/promise_all_settled_utils';
@ -47,7 +47,6 @@ export const getESQLKeywordFieldStats = async ({
params: {
query,
...(filter ? { filter } : {}),
version: ESQL_LATEST_VERSION,
},
},
};

3
x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/esql_requests/get_numeric_field_stats.ts
View file

@ -8,7 +8,7 @@
import type { UseCancellableSearch } from '@kbn/ml-cancellable-search';
import type { QueryDslQueryContainer } from '@kbn/data-views-plugin/common/types';
import { ESQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
import { ESQL_LATEST_VERSION, appendToESQLQuery } from '@kbn/esql-utils';
import { appendToESQLQuery } from '@kbn/esql-utils';
import { chunk } from 'lodash';
import pLimit from 'p-limit';
import type { Column } from '../../hooks/esql/use_esql_overall_stats_data';
@ -71,7 +71,6 @@ const getESQLNumericFieldStatsInChunk = async ({
params: {
query,
...(filter ? { filter } : {}),
version: ESQL_LATEST_VERSION,
},
};
try {

7
x-pack/plugins/maps/public/classes/sources/esql_source/esql_source.tsx
View file

@ -11,11 +11,7 @@ import { lastValueFrom } from 'rxjs';
import { tap } from 'rxjs';
import { v4 as uuidv4 } from 'uuid';
import { Adapters } from '@kbn/inspector-plugin/common/adapters';
import {
getIndexPatternFromESQLQuery,
getLimitFromESQLQuery,
ESQL_LATEST_VERSION,
} from '@kbn/esql-utils';
import { getIndexPatternFromESQLQuery, getLimitFromESQLQuery } from '@kbn/esql-utils';
import { buildEsQuery } from '@kbn/es-query';
import type { Filter, Query } from '@kbn/es-query';
import type { ESQLSearchParams, ESQLSearchReponse } from '@kbn/es-types';
@ -157,7 +153,6 @@ export class ESQLSource
const params: ESQLSearchParams = {
query: this._descriptor.esql,
dropNullColumns: true,
version: ESQL_LATEST_VERSION,
};
const query: Query[] = [];

7
x-pack/plugins/maps/public/classes/sources/esql_source/esql_utils.ts
View file

@ -8,11 +8,7 @@
import { i18n } from '@kbn/i18n';
import { lastValueFrom } from 'rxjs';
import type { DataView } from '@kbn/data-plugin/common';
import {
ESQL_LATEST_VERSION,
getESQLAdHocDataview,
getIndexPatternFromESQLQuery,
} from '@kbn/esql-utils';
import { getESQLAdHocDataview, getIndexPatternFromESQLQuery } from '@kbn/esql-utils';
import type { ESQLColumn, ESQLSearchReponse } from '@kbn/es-types';
import { ES_GEO_FIELD_TYPE } from '../../../../common/constants';
import { getData, getIndexPatternService } from '../../../kibana_services';
@ -90,7 +86,6 @@ export function getFieldType(column: ESQLColumn) {
async function getColumns(esql: string) {
const params = {
query: esql + ' | limit 0',
version: ESQL_LATEST_VERSION,
};
try {

4
x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/esql_docs/esql-api.txt
View file

@ -11,7 +11,6 @@ FROM library
| SORT year
| LIMIT 5
""",
"version": "2024.04.01"
```
}
@ -49,9 +48,6 @@ For syntax, refer to Returning localized results.
Passing parameters to a query.
`query`
(Required, string) ES|QL query to run. For syntax, refer to Syntax reference.
`version`
(Required, string) ES|QL language version. Can be sent in short or long form, e.g.
`2024.04.01` or `2024.04.01.🚀`. See Language versions for details.
Response bodyedit
`columns`
(array of objects)

2
x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/index.ts
View file

@ -11,7 +11,6 @@ import pLimit from 'p-limit';
import Path from 'path';
import { lastValueFrom, startWith } from 'rxjs';
import { promisify } from 'util';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import { FunctionVisibility, MessageRole } from '@kbn/observability-ai-assistant-plugin/common';
import {
VisualizeESQLUserIntention,
@ -127,7 +126,6 @@ export function registerQueryFunction({ functions, resources }: FunctionRegistra
path: '_query',
body: {
query,
version: ESQL_LATEST_VERSION,
},
})) as ESQLSearchReponse;

2
x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/validate_esql_query.ts
View file

@ -8,7 +8,6 @@
import { validateQuery } from '@kbn/esql-validation-autocomplete';
import { getAstAndSyntaxErrors } from '@kbn/esql-ast';
import type { ElasticsearchClient } from '@kbn/core/server';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import { ESQLSearchReponse } from '@kbn/es-types';
import { esFieldTypeToKibanaFieldType, type KBN_FIELD_TYPES } from '@kbn/field-types';
import { splitIntoCommands } from './correct_common_esql_mistakes';
@ -57,7 +56,6 @@ export async function validateEsqlQuery({
path: '_query',
body: {
query: performantQuery,
version: ESQL_LATEST_VERSION,
},
})
.then((res) => {

2
x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/esql/build_esql_search_request.ts
View file

@ -7,7 +7,6 @@
import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import type { Filter } from '@kbn/es-query';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import type {
RuleFilterArray,
TimestampOverride,
@ -57,7 +56,6 @@ export const buildEsqlSearchRequest = ({
// we limit size of the response to maxAlertNumber + 1
// ES|QL currently does not support pagination and returns 10,000 results
query: `${query} | limit ${size + 1}`,
version: ESQL_LATEST_VERSION,
filter: {
bool: {
filter: requestFilter,

2
x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_esql_query.test.ts
View file

@ -67,7 +67,6 @@ describe('fetchEsqlQuery', () => {
},
},
"query": "from test",
"version": "2024.04.01",
}
`);
});
@ -95,7 +94,6 @@ describe('fetchEsqlQuery', () => {
},
},
"query": "from test | limit 100",
"version": "2024.04.01",
}
`);
});

2
x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_esql_query.ts
View file

@ -6,7 +6,6 @@
*/
import { parseAggregationResults } from '@kbn/triggers-actions-ui-plugin/common';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import { SharePluginStart } from '@kbn/share-plugin/server';
import { IScopedClusterClient, Logger } from '@kbn/core/server';
import { OnlyEsqlQueryRuleParams } from '../types';
@ -91,7 +90,6 @@ export const getEsqlQuery = (
const query = {
query: alertLimit ? `${params.esqlQuery.esql} | limit ${alertLimit}` : params.esqlQuery.esql,
version: ESQL_LATEST_VERSION,
filter: {
bool: {
filter: rangeFilter,

3
x-pack/test/api_integration/apis/maps/bsearch.ts
View file

@ -8,7 +8,6 @@
import request from 'superagent';
import { inflateResponse } from '@kbn/bfetch-plugin/public/streaming';
import expect from '@kbn/expect';
import { ESQL_LATEST_VERSION } from '@kbn/esql-utils';
import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common';
import { BFETCH_ROUTE_VERSION_LATEST } from '@kbn/bfetch-plugin/common';
import type { FtrProviderContext } from '../../ftr_provider_context';
@ -38,7 +37,6 @@ export default function ({ getService }: FtrProviderContext) {
request: {
params: {
query: 'from logstash-* | keep geo.coordinates | limit 0',
version: ESQL_LATEST_VERSION,
},
},
options: {
@ -74,7 +72,6 @@ export default function ({ getService }: FtrProviderContext) {
dropNullColumns: true,
query:
'from logstash-* | keep geo.coordinates, @timestamp | sort @timestamp | limit 1',
version: ESQL_LATEST_VERSION,
},
},
options: {

1
x-pack/test/tsconfig.json
View file

@ -172,7 +172,6 @@
"@kbn/aiops-log-rate-analysis",
"@kbn/apm-data-view",
"@kbn/core-saved-objects-api-server",
"@kbn/esql-utils",
"@kbn/analytics-ftr-helpers-plugin",
]
}