;
+ context: CasesRequestHandlerContext;
+ response: KibanaResponseFactory;
+ logger: Logger;
+ kibanaVersion: PluginInitializerContext['env']['packageInfo']['version'];
+}
+
+export interface CaseRoute {
+ method: 'get' | 'post' | 'put' | 'delete' | 'patch';
+ path: string;
+ params?: RouteValidatorConfig;
+ handler: (args: CaseRouteHandlerArguments) => Promise;
+}
diff --git a/x-pack/plugins/cases/server/routes/api/user_actions/get_all_user_actions.ts b/x-pack/plugins/cases/server/routes/api/user_actions/get_all_user_actions.ts
index 2e38ac8b4ebc79..b9b6ce43a9fdfd 100644
--- a/x-pack/plugins/cases/server/routes/api/user_actions/get_all_user_actions.ts
+++ b/x-pack/plugins/cases/server/routes/api/user_actions/get_all_user_actions.ts
@@ -7,50 +7,44 @@
import { schema } from '@kbn/config-schema';
-import { RouteDeps } from '../types';
-import { getWarningHeader, logDeprecatedEndpoint, wrapError } from '../utils';
+import { getWarningHeader, logDeprecatedEndpoint } from '../utils';
import { CASE_USER_ACTIONS_URL } from '../../../../common/constants';
+import { createCaseError } from '../../../common/error';
+import { createCasesRoute } from '../create_cases_route';
/**
* @deprecated since version 8.1.0
*/
-export function initGetAllCaseUserActionsApi({ router, logger, kibanaVersion }: RouteDeps) {
- router.get(
- {
- path: CASE_USER_ACTIONS_URL,
- validate: {
- params: schema.object({
- case_id: schema.string(),
- }),
- },
- },
- async (context, request, response) => {
- try {
- if (!context.cases) {
- return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
- }
+export const getUserActionsRoute = createCasesRoute({
+ method: 'get',
+ path: CASE_USER_ACTIONS_URL,
+ params: {
+ params: schema.object({
+ case_id: schema.string(),
+ }),
+ },
+ handler: async ({ context, request, response, logger, kibanaVersion }) => {
+ try {
+ logDeprecatedEndpoint(
+ logger,
+ request.headers,
+ `The get all cases user actions API '${CASE_USER_ACTIONS_URL}' is deprecated.`
+ );
- logDeprecatedEndpoint(
- logger,
- request.headers,
- `The get all cases user actions API '${CASE_USER_ACTIONS_URL}' is deprecated.`
- );
+ const casesClient = await context.cases.getCasesClient();
+ const caseId = request.params.case_id;
- const casesClient = await context.cases.getCasesClient();
- const caseId = request.params.case_id;
-
- return response.ok({
- headers: {
- ...getWarningHeader(kibanaVersion),
- },
- body: await casesClient.userActions.getAll({ caseId }),
- });
- } catch (error) {
- logger.error(
- `Failed to retrieve case user actions in route case id: ${request.params.case_id}: ${error}`
- );
- return response.customError(wrapError(error));
- }
+ return response.ok({
+ headers: {
+ ...getWarningHeader(kibanaVersion),
+ },
+ body: await casesClient.userActions.getAll({ caseId }),
+ });
+ } catch (error) {
+ throw createCaseError({
+ message: `Failed to retrieve case user actions in route case id: ${request.params.case_id}: ${error}`,
+ error,
+ });
}
- );
-}
+ },
+});
diff --git a/x-pack/plugins/cases/server/routes/api/utils.ts b/x-pack/plugins/cases/server/routes/api/utils.ts
index 532a316e9a7b84..3536e4db346679 100644
--- a/x-pack/plugins/cases/server/routes/api/utils.ts
+++ b/x-pack/plugins/cases/server/routes/api/utils.ts
@@ -52,10 +52,10 @@ export const getWarningHeader = (
* https://github.com/elastic/kibana/blob/ec30f2aeeb10fb64b507935e558832d3ef5abfaa/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts#L113-L118
*/
-const getIsKibanaRequest = (headers?: Headers) => {
+export const getIsKibanaRequest = (headers?: Headers): boolean => {
// The presence of these two request headers gives us a good indication that this is a first-party request from the Kibana client.
// We can't be 100% certain, but this is a reasonable attempt.
- return headers && headers['kbn-version'] && headers.referer;
+ return !!(headers && headers['kbn-version'] && headers.referer);
};
export const logDeprecatedEndpoint = (logger: Logger, headers: Headers, msg: string) => {
diff --git a/x-pack/plugins/cases/server/services/cases/index.ts b/x-pack/plugins/cases/server/services/cases/index.ts
index 832d12071b4662..684edcc077f8e2 100644
--- a/x-pack/plugins/cases/server/services/cases/index.ts
+++ b/x-pack/plugins/cases/server/services/cases/index.ts
@@ -39,7 +39,7 @@ import {
} from '../../../common/api';
import { SavedObjectFindOptionsKueryNode } from '../../common/types';
import { defaultSortField, flattenCaseSavedObject } from '../../common/utils';
-import { defaultPage, defaultPerPage } from '../../routes/api';
+import { DEFAULT_PAGE, DEFAULT_PER_PAGE } from '../../routes/api';
import { combineFilters } from '../../client/utils';
import { includeFieldsRequiredForAuthentication } from '../../authorization/utils';
import {
@@ -420,8 +420,8 @@ export class CasesService {
return {
saved_objects: [],
total: 0,
- per_page: options?.perPage ?? defaultPerPage,
- page: options?.page ?? defaultPage,
+ per_page: options?.perPage ?? DEFAULT_PER_PAGE,
+ page: options?.page ?? DEFAULT_PAGE,
};
}
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts
index 303d54c9d45ccf..e7ad239e0c9801 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts
@@ -6,7 +6,6 @@
*/
import moment from 'moment';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import { TimefilterContract } from 'src/plugins/data/public';
import dateMath from '@elastic/datemath';
import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
@@ -27,8 +26,7 @@ export async function setFullTimeRange(
query?: QueryDslQueryContainer,
excludeFrozenData?: boolean
): Promise {
- const runtimeMappings = indexPattern.getComputedFields()
- .runtimeFields as estypes.MappingRuntimeFields;
+ const runtimeMappings = indexPattern.getRuntimeMappings();
const resp = await getTimeFieldRange({
index: indexPattern.title,
timeFieldName: indexPattern.timeFieldName,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts
index a6176b8e3c1ce7..c4e9e898454d51 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts
@@ -198,7 +198,7 @@ export const useDataVisualizerGridData = (
sessionId: searchSessionId,
index: currentIndexPattern.title,
timeFieldName: currentIndexPattern.timeFieldName,
- runtimeFieldMap: currentIndexPattern.getComputedFields().runtimeFields,
+ runtimeFieldMap: currentIndexPattern.getRuntimeMappings(),
aggregatableFields,
nonAggregatableFields,
fieldsToFetch,
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
index 5ff3b6c481d746..22898ac54db5ac 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
@@ -393,7 +393,9 @@ describe('setIndexToHidden', () => {
expect(clusterClient.indices.putSettings).toHaveBeenCalledWith({
index: 'foo-bar-000001',
body: {
- 'index.hidden': true,
+ index: {
+ hidden: true,
+ },
},
});
});
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
index 010d162c62ea13..bb958c3ce2b54f 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -178,7 +178,6 @@ export class ClusterClientAdapter;
+
+export interface PostLogstashApiKeyResponse {
+ api_key: string;
+}
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_select_create.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_select_create.tsx
index a8354237bbcb7c..655875d0448938 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_select_create.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_select_create.tsx
@@ -70,6 +70,11 @@ export const SelectCreateAgentPolicy: React.FC = ({
[onAgentPolicyChange]
);
+ const onClickCreatePolicy = () => {
+ setCreateState({ status: CREATE_STATUS.INITIAL });
+ setShowCreatePolicy(true);
+ };
+
return (
<>
{showCreatePolicy ? (
@@ -86,7 +91,7 @@ export const SelectCreateAgentPolicy: React.FC = ({
onKeyChange={onKeyChange}
onAgentPolicyChange={onAgentPolicyChange}
excludeFleetServer={excludeFleetServer}
- onClickCreatePolicy={() => setShowCreatePolicy(true)}
+ onClickCreatePolicy={onClickCreatePolicy}
selectedAgentPolicy={selectedAgentPolicy}
isFleetServerPolicy={isFleetServerPolicy}
/>
diff --git a/x-pack/plugins/fleet/server/routes/output/handler.ts b/x-pack/plugins/fleet/server/routes/output/handler.ts
index 6de9fe1204f1c0..d4372c22f32de7 100644
--- a/x-pack/plugins/fleet/server/routes/output/handler.ts
+++ b/x-pack/plugins/fleet/server/routes/output/handler.ts
@@ -18,10 +18,12 @@ import type {
DeleteOutputResponse,
GetOneOutputResponse,
GetOutputsResponse,
+ PostLogstashApiKeyResponse,
} from '../../../common';
import { outputService } from '../../services/output';
-import { defaultIngestErrorHandler } from '../../errors';
+import { defaultIngestErrorHandler, FleetUnauthorizedError } from '../../errors';
import { agentPolicyService } from '../../services';
+import { generateLogstashApiKey, canCreateLogstashApiKey } from '../../services/api_keys';
export const getOutputsHandler: RequestHandler = async (context, request, response) => {
const soClient = context.core.savedObjects.client;
@@ -142,3 +144,24 @@ export const deleteOutputHandler: RequestHandler<
return defaultIngestErrorHandler({ error, response });
}
};
+
+export const postLogstashApiKeyHandler: RequestHandler = async (context, request, response) => {
+ const esClient = context.core.elasticsearch.client.asCurrentUser;
+ try {
+ const hasCreatePrivileges = await canCreateLogstashApiKey(esClient);
+ if (!hasCreatePrivileges) {
+ throw new FleetUnauthorizedError('Missing permissions to create logstash API key');
+ }
+
+ const apiKey = await generateLogstashApiKey(esClient);
+
+ const body: PostLogstashApiKeyResponse = {
+ // Logstash expect the key to be formatted like this id:key
+ api_key: `${apiKey.id}:${apiKey.api_key}`,
+ };
+
+ return response.ok({ body });
+ } catch (error) {
+ return defaultIngestErrorHandler({ error, response });
+ }
+};
diff --git a/x-pack/plugins/fleet/server/routes/output/index.ts b/x-pack/plugins/fleet/server/routes/output/index.ts
index b9dfb1f7f742bf..f74c1bb88aeb03 100644
--- a/x-pack/plugins/fleet/server/routes/output/index.ts
+++ b/x-pack/plugins/fleet/server/routes/output/index.ts
@@ -21,6 +21,7 @@ import {
getOutputsHandler,
postOuputHandler,
putOuputHandler,
+ postLogstashApiKeyHandler,
} from './handler';
export const registerRoutes = (router: FleetAuthzRouter) => {
@@ -76,4 +77,15 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
},
deleteOutputHandler
);
+
+ router.post(
+ {
+ path: OUTPUT_API_ROUTES.LOGSTASH_API_KEY_PATTERN,
+ validate: false,
+ fleetAuthz: {
+ fleet: { all: true },
+ },
+ },
+ postLogstashApiKeyHandler
+ );
};
diff --git a/x-pack/plugins/fleet/server/services/api_keys/index.ts b/x-pack/plugins/fleet/server/services/api_keys/index.ts
index c781b2d01943fc..7b96d71c7ac9cd 100644
--- a/x-pack/plugins/fleet/server/services/api_keys/index.ts
+++ b/x-pack/plugins/fleet/server/services/api_keys/index.ts
@@ -5,36 +5,6 @@
* 2.0.
*/
-import type { KibanaRequest } from 'src/core/server';
-
export { invalidateAPIKeys } from './security';
+export { generateLogstashApiKey, canCreateLogstashApiKey } from './logstash_api_keys';
export * from './enrollment_api_key';
-
-export function parseApiKeyFromHeaders(headers: KibanaRequest['headers']) {
- const authorizationHeader = headers.authorization;
-
- if (!authorizationHeader) {
- throw new Error('Authorization header must be set');
- }
-
- if (Array.isArray(authorizationHeader)) {
- throw new Error('Authorization header must be `string` not `string[]`');
- }
-
- if (!authorizationHeader.startsWith('ApiKey ')) {
- throw new Error('Authorization header is malformed');
- }
-
- const apiKey = authorizationHeader.split(' ')[1];
-
- return parseApiKey(apiKey);
-}
-
-export function parseApiKey(apiKey: string) {
- const apiKeyId = Buffer.from(apiKey, 'base64').toString('utf8').split(':')[0];
-
- return {
- apiKey,
- apiKeyId,
- };
-}
diff --git a/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts b/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
new file mode 100644
index 00000000000000..d55aa37fd5150d
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ElasticsearchClient } from 'src/core/server';
+
+/**
+ * Check if an esClient has enought permission to create a valid API key for logstash
+ *
+ * @param esClient
+ */
+export async function canCreateLogstashApiKey(esClient: ElasticsearchClient) {
+ const res = await esClient.security.hasPrivileges({
+ cluster: ['monitor', 'manage_own_api_key'],
+ index: [
+ {
+ names: [
+ 'logs-*-*',
+ 'metrics-*-*',
+ 'traces-*-*',
+ 'synthetics-*-*',
+ '.logs-endpoint.diagnostic.collection-*',
+ '.logs-endpoint.action.responses-*',
+ ],
+ privileges: ['auto_configure', 'create_doc'],
+ },
+ ],
+ });
+
+ return res.has_all_requested;
+}
+
+/**
+ * Generate an Elasticsearch API key to use in logstash ES output
+ *
+ * @param esClient
+ */
+export async function generateLogstashApiKey(esClient: ElasticsearchClient) {
+ const apiKey = await esClient.security.createApiKey({
+ name: 'Fleet Logstash output',
+ metadata: {
+ managed_by: 'fleet',
+ managed: true,
+ type: 'logstash',
+ },
+ role_descriptors: {
+ 'logstash-output': {
+ cluster: ['monitor'],
+ index: [
+ {
+ names: [
+ 'logs-*-*',
+ 'metrics-*-*',
+ 'traces-*-*',
+ 'synthetics-*-*',
+ '.logs-endpoint.diagnostic.collection-*',
+ '.logs-endpoint.action.responses-*',
+ ],
+ privileges: ['auto_configure', 'create_doc'],
+ },
+ ],
+ },
+ },
+ });
+
+ return apiKey;
+}
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts
index e5c96bea871818..52951377c6e2e7 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts
@@ -74,13 +74,20 @@ async function handleMlModelInstall({
try {
await retryTransientEsErrors(
() =>
- esClient.ml.putTrainedModel({
- model_id: mlModel.installationName,
- defer_definition_decompression: true,
- timeout: '45s',
- // @ts-expect-error expects an object not a string
- body: mlModel.content,
- }),
+ esClient.ml.putTrainedModel(
+ {
+ model_id: mlModel.installationName,
+ defer_definition_decompression: true,
+ timeout: '45s',
+ // @ts-expect-error expects an object not a string
+ body: mlModel.content,
+ },
+ {
+ headers: {
+ 'content-type': 'application/json',
+ },
+ }
+ ),
{ logger }
);
} catch (err) {
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
index 5d144435bbee11..7650caf73d7145 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
@@ -714,42 +714,53 @@ describe('EPM template', () => {
expect(mappings).toEqual(expectedMapping);
});
- it('processes meta fields', () => {
- const metaFieldLiteralYaml = `
-- name: fieldWithMetas
- type: integer
- unit: byte
+ it('tests processing metric_type field', () => {
+ const literalYml = `
+- name: total.norm.pct
+ type: scaled_float
metric_type: gauge
- `;
- const metaFieldMapping = {
+ unit: percent
+ format: percent
+`;
+ const expectedMapping = {
properties: {
- fieldWithMetas: {
- type: 'long',
- meta: {
- metric_type: 'gauge',
- unit: 'byte',
+ total: {
+ properties: {
+ norm: {
+ properties: {
+ pct: {
+ scaling_factor: 1000,
+ type: 'scaled_float',
+ meta: {
+ metric_type: 'gauge',
+ unit: 'percent',
+ },
+ time_series_metric: 'gauge',
+ },
+ },
+ },
},
},
},
};
- const fields: Field[] = safeLoad(metaFieldLiteralYaml);
+ const fields: Field[] = safeLoad(literalYml);
const processedFields = processFields(fields);
const mappings = generateMappings(processedFields);
- expect(JSON.stringify(mappings)).toEqual(JSON.stringify(metaFieldMapping));
+ expect(mappings).toEqual(expectedMapping);
});
- it('processes meta fields with only one meta value', () => {
+ it('processes meta fields', () => {
const metaFieldLiteralYaml = `
- name: fieldWithMetas
type: integer
- metric_type: gauge
+ unit: byte
`;
const metaFieldMapping = {
properties: {
fieldWithMetas: {
type: 'long',
meta: {
- metric_type: 'gauge',
+ unit: 'byte',
},
},
},
@@ -765,16 +776,13 @@ describe('EPM template', () => {
- name: groupWithMetas
type: group
unit: byte
- metric_type: gauge
fields:
- name: fieldA
type: integer
unit: byte
- metric_type: gauge
- name: fieldB
type: integer
unit: byte
- metric_type: gauge
`;
const metaFieldMapping = {
properties: {
@@ -783,14 +791,12 @@ describe('EPM template', () => {
fieldA: {
type: 'long',
meta: {
- metric_type: 'gauge',
unit: 'byte',
},
},
fieldB: {
type: 'long',
meta: {
- metric_type: 'gauge',
unit: 'byte',
},
},
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
index f88f5aeb1c727b..73ad218d1a9fd0 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
@@ -132,6 +132,9 @@ export function generateMappings(fields: Field[]): IndexTemplateMappings {
case 'scaled_float':
fieldProps.type = 'scaled_float';
fieldProps.scaling_factor = field.scaling_factor || DEFAULT_SCALING_FACTOR;
+ if (field.metric_type) {
+ fieldProps.time_series_metric = field.metric_type;
+ }
break;
case 'text':
const textMapping = generateTextMapping(field);
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
index 6a2284e0df742a..07748c1635b3a6 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
@@ -46,7 +46,6 @@ export const deleteTransforms = async (esClient: ElasticsearchClient, transformI
await esClient.transport.request(
{
method: 'DELETE',
- // @ts-expect-error @elastic/elasticsearch Transform is empty interface
path: `/${transform?.dest?.index}`,
},
{
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts
index 879c7614fedbf4..4a1909cc813e7a 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts
@@ -106,6 +106,7 @@ describe('test transform install', () => {
esClient.transform.getTransform.mockResponseOnce({
count: 1,
transforms: [
+ // @ts-expect-error incomplete data
{
dest: {
index: 'index',
@@ -394,6 +395,7 @@ describe('test transform install', () => {
esClient.transform.getTransform.mockResponseOnce({
count: 1,
transforms: [
+ // @ts-expect-error incomplete data
{
dest: {
index: 'index',
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index 1acbce4f22cd1d..546ae9c6fb9acf 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -28,6 +28,7 @@ import {
doesAgentPolicyAlreadyIncludePackage,
validatePackagePolicy,
validationHasErrors,
+ SO_SEARCH_LIMIT,
} from '../../common';
import type {
DeletePackagePoliciesResponse,
@@ -369,9 +370,10 @@ class PackagePolicyService implements PackagePolicyServiceInterface {
}
// Check that the name does not exist already but exclude the current package policy
const existingPoliciesWithName = await this.list(soClient, {
- perPage: 1,
- kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.name: "${packagePolicy.name}"`,
+ perPage: SO_SEARCH_LIMIT,
+ kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.name:"${packagePolicy.name}"`,
});
+
const filtered = (existingPoliciesWithName?.items || []).filter((p) => p.id !== id);
if (filtered.length > 0) {
diff --git a/x-pack/plugins/index_management/server/lib/fetch_indices.ts b/x-pack/plugins/index_management/server/lib/fetch_indices.ts
index 9e8a8b23a7d9d0..cec763a247ed7e 100644
--- a/x-pack/plugins/index_management/server/lib/fetch_indices.ts
+++ b/x-pack/plugins/index_management/server/lib/fetch_indices.ts
@@ -51,9 +51,7 @@ async function fetchIndicesCall(
const indexStats = indicesStats[indexName];
const aliases = Object.keys(indexData.aliases!);
return {
- // @ts-expect-error new property https://github.com/elastic/elasticsearch-specification/issues/1253
health: indexStats?.health,
- // @ts-expect-error new property https://github.com/elastic/elasticsearch-specification/issues/1253
status: indexStats?.status,
name: indexName,
uuid: indexStats?.uuid,
diff --git a/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts b/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
index 03d3ec757bf552..46f961d6de4725 100644
--- a/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
+++ b/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
@@ -5,15 +5,17 @@
* 2.0.
*/
+import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import { from, of } from 'rxjs';
import { delay } from 'rxjs/operators';
import { DataView, DataViewsContract } from '../../../../../src/plugins/data_views/common';
-import { fieldList, FieldSpec, RuntimeField } from '../../../../../src/plugins/data/common';
+import { fieldList, FieldSpec } from '../../../../../src/plugins/data/common';
type IndexPatternMock = Pick<
DataView,
| 'fields'
| 'getComputedFields'
+ | 'getRuntimeMappings'
| 'getFieldByName'
| 'getTimeField'
| 'id'
@@ -23,6 +25,7 @@ type IndexPatternMock = Pick<
>;
type IndexPatternMockSpec = Pick & {
fields: FieldSpec[];
+ runtimeFields?: estypes.MappingRuntimeFields;
};
export const createIndexPatternMock = ({
@@ -30,6 +33,7 @@ export const createIndexPatternMock = ({
title,
type = undefined,
fields,
+ runtimeFields,
timeFieldName,
}: IndexPatternMockSpec): IndexPatternMock => {
const indexPatternFieldList = fieldList(fields);
@@ -43,21 +47,12 @@ export const createIndexPatternMock = ({
isTimeBased: () => timeFieldName != null,
getFieldByName: (fieldName) => indexPatternFieldList.find(({ name }) => name === fieldName),
getComputedFields: () => ({
- runtimeFields: indexPatternFieldList.reduce>(
- (accumulatedFields, { name, runtimeField }) => ({
- ...accumulatedFields,
- ...(runtimeField != null
- ? {
- [name]: runtimeField,
- }
- : {}),
- }),
- {}
- ),
+ runtimeFields: runtimeFields ?? {},
scriptFields: {},
storedFields: [],
docvalueFields: [],
}),
+ getRuntimeMappings: () => runtimeFields ?? {},
};
};
diff --git a/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts b/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts
index 70f8e1cebabfe5..914c55824373a4 100644
--- a/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts
+++ b/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts
@@ -7,7 +7,6 @@
import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import { DataView, DataViewsContract } from '../../../../../src/plugins/data_views/common';
-import { ObjectEntries } from '../utility_types';
import { TIMESTAMP_FIELD, TIEBREAKER_FIELD } from '../constants';
import { ResolveLogSourceConfigurationError } from './errors';
import {
@@ -106,27 +105,5 @@ const resolveKibanaIndexPatternReference = async (
// this might take other sources of runtime fields into account in the future
const resolveRuntimeMappings = (indexPattern: DataView): estypes.MappingRuntimeFields => {
- const { runtimeFields } = indexPattern.getComputedFields();
-
- const runtimeMappingsFromIndexPattern = (
- Object.entries(runtimeFields) as ObjectEntries
- ).reduce(
- (accumulatedMappings, [runtimeFieldName, runtimeFieldSpec]) => ({
- ...accumulatedMappings,
- [runtimeFieldName]: {
- type: runtimeFieldSpec.type,
- ...(runtimeFieldSpec.script != null
- ? {
- script: {
- lang: 'painless', // required in the es types
- source: runtimeFieldSpec.script.source,
- },
- }
- : {}),
- },
- }),
- {}
- );
-
- return runtimeMappingsFromIndexPattern;
+ return indexPattern.getRuntimeMappings();
};
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
index 33fe3c7af30c78..c0a475ea8029b6 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
@@ -34,7 +34,7 @@ export const AlertFlyout = ({ options, nodeType, filter, visible, setVisible }:
consumer: 'infrastructure',
onClose: onCloseFlyout,
canChangeTrigger: false,
- alertTypeId: METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID,
+ ruleTypeId: METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID,
metadata: {
options,
nodeType,
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_flyout.tsx
index bee7f93a538be9..d7270aa0ef0e58 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_flyout.tsx
@@ -25,7 +25,7 @@ export const AlertFlyout = (props: Props) => {
consumer: 'logs',
onClose: onCloseFlyout,
canChangeTrigger: false,
- alertTypeId: LOG_DOCUMENT_COUNT_RULE_TYPE_ID,
+ ruleTypeId: LOG_DOCUMENT_COUNT_RULE_TYPE_ID,
metadata: {
isInternal: true,
},
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx
index 9d467e1df7e36a..e0e9946b1c7898 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx
@@ -32,7 +32,7 @@ export const AlertFlyout = ({ metric, nodeType, visible, setVisible }: Props) =>
consumer: 'infrastructure',
onClose: onCloseFlyout,
canChangeTrigger: false,
- alertTypeId: METRIC_ANOMALY_ALERT_TYPE_ID,
+ ruleTypeId: METRIC_ANOMALY_ALERT_TYPE_ID,
metadata: {
metric,
nodeType,
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
index e7e4ade5257fc1..642b7dbf079c03 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
@@ -30,7 +30,7 @@ export const AlertFlyout = (props: Props) => {
consumer: 'infrastructure',
onClose: onCloseFlyout,
canChangeTrigger: false,
- alertTypeId: METRIC_THRESHOLD_ALERT_TYPE_ID,
+ ruleTypeId: METRIC_THRESHOLD_ALERT_TYPE_ID,
metadata: {
currentOptions: props.options,
series: props.series,
diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
index 66abef53f021e5..8aaac2f1b9a46c 100644
--- a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
@@ -6,10 +6,10 @@
*/
import { i18n } from '@kbn/i18n';
-import { flowRight } from 'lodash';
import React from 'react';
import { Redirect, RouteComponentProps } from 'react-router-dom';
import useMount from 'react-use/lib/useMount';
+import { flowRight } from 'lodash';
import { findInventoryFields } from '../../../common/inventory_models';
import { InventoryItemType } from '../../../common/inventory_models/types';
import { LoadingPage } from '../../components/loading_page';
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts
index 744fd80134aec9..81c714b30cb0d9 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts
@@ -6,8 +6,8 @@
*/
import { ElasticsearchClient } from 'kibana/server';
-import { difference, first, has, isNaN, isNumber, isObject, last, mapValues } from 'lodash';
import moment from 'moment';
+import { difference, first, has, isNaN, isNumber, isObject, last, mapValues } from 'lodash';
import {
Aggregators,
Comparator,
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
index 73f832e834c610..cfa9e84fb3651a 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
@@ -80,7 +80,6 @@ describe('LogEntries search strategy', () => {
runtime_field: {
type: 'keyword',
script: {
- lang: 'painless',
source: 'emit("runtime value")',
},
},
@@ -359,6 +358,14 @@ const createDataPluginMock = (esSearchStrategyMock: ISearchStrategy): any => ({
searchable: true,
},
],
+ runtimeFields: {
+ runtime_field: {
+ type: 'keyword',
+ script: {
+ source: 'emit("runtime value")',
+ },
+ },
+ },
}),
]),
});
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
index 20f3e41cef159a..c2f3c70580040f 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
@@ -79,7 +79,6 @@ describe('LogEntry search strategy', () => {
runtime_field: {
type: 'keyword',
script: {
- lang: 'painless',
source: 'emit("runtime value")',
},
},
@@ -314,6 +313,14 @@ const createDataPluginMock = (esSearchStrategyMock: ISearchStrategy): any => ({
searchable: true,
},
],
+ runtimeFields: {
+ runtime_field: {
+ type: 'keyword',
+ script: {
+ source: 'emit("runtime value")',
+ },
+ },
+ },
}),
]),
});
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx
index 5f1230f004684a..d6a5b4e01a9b70 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx
@@ -66,7 +66,7 @@ describe('', () => {
expect(find('pageTitle').text()).toEqual('Create pipeline from CSV');
expect(exists('documentationLink')).toBe(true);
- expect(find('documentationLink').text()).toBe('Create pipeline docs');
+ expect(find('documentationLink').text()).toBe('CSV to pipeline docs');
});
describe('form validation', () => {
diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create/pipelines_create.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create/pipelines_create.tsx
index 097ec3d98e162b..a7fbf6afaebf83 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create/pipelines_create.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create/pipelines_create.tsx
@@ -85,7 +85,7 @@ export const PipelinesCreate: React.FunctionComponent
,
]}
diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_edit/pipelines_edit.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_edit/pipelines_edit.tsx
index a902f4a34af293..c927a324b0774d 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_edit/pipelines_edit.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_edit/pipelines_edit.tsx
@@ -134,7 +134,7 @@ export const PipelinesEdit: React.FunctionComponent
- {
- const newMode = id.replace(idPrefix, '') as LineStyle;
- setConfig({ forAccessor: accessor, lineStyle: newMode });
- }}
- />
-
-
- {
- setConfig({ forAccessor: accessor, lineWidth: value });
- }}
- />
+
+
+ {
+ setConfig({ forAccessor: accessor, lineWidth: value });
+ }}
+ />
+
+
+ {
+ const newMode = id.replace(idPrefix, '') as LineStyle;
+ setConfig({ forAccessor: accessor, lineStyle: newMode });
+ }}
+ isIconOnly
+ />
+
+
);
@@ -108,11 +116,10 @@ const LineThicknessSlider = ({
const [unsafeValue, setUnsafeValue] = useState(String(value));
return (
- f.isScript);
- const runtimeFields = fields.filter((f) => f.runtimeField);
const result = await client.search(
{
index,
@@ -242,11 +246,7 @@ async function fetchIndexPatternStats({
sort: timeFieldName && fromDate && toDate ? [{ [timeFieldName]: 'desc' }] : [],
fields: ['*'],
_source: false,
- runtime_mappings: runtimeFields.reduce((acc, field) => {
- if (!field.runtimeField) return acc;
- acc[field.name] = field.runtimeField;
- return acc;
- }, {} as Record),
+ runtime_mappings: runtimeMappings,
script_fields: scriptedFields.reduce((acc, field) => {
acc[field.name] = {
script: {
diff --git a/x-pack/plugins/lens/server/routes/field_stats.ts b/x-pack/plugins/lens/server/routes/field_stats.ts
index 6c1a93759030a6..127d798cb76c2f 100644
--- a/x-pack/plugins/lens/server/routes/field_stats.ts
+++ b/x-pack/plugins/lens/server/routes/field_stats.ts
@@ -84,6 +84,7 @@ export async function initFieldsRoute(setup: CoreSetup) {
.filter((f) => f.runtimeField)
.reduce((acc, f) => {
if (!f.runtimeField) return acc;
+ // @ts-expect-error The MappingRuntimeField from @elastic/elasticsearch does not expose the "composite" runtime type yet
acc[f.name] = f.runtimeField;
return acc;
}, {} as Record);
diff --git a/x-pack/plugins/license_management/server/lib/license.ts b/x-pack/plugins/license_management/server/lib/license.ts
index 12f831f3d780a3..915d3a8b50a3d9 100644
--- a/x-pack/plugins/license_management/server/lib/license.ts
+++ b/x-pack/plugins/license_management/server/lib/license.ts
@@ -18,6 +18,7 @@ interface PutLicenseArg {
export async function putLicense({ acknowledge, client, licensing, license }: PutLicenseArg) {
try {
const response = await client.asCurrentUser.license.post({
+ // @ts-expect-error license is not typed in LM code
body: license,
acknowledge,
});
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx
index 9079390cb301a4..206b1a5dd6f85f 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx
@@ -43,7 +43,7 @@ import { getEmptyValue } from '../../../common/empty_value';
import * as i18n from './translations';
-const MyValuesInput = styled(EuiFlexItem)`
+const FieldFlexItem = styled(EuiFlexItem)`
overflow: hidden;
`;
@@ -166,19 +166,22 @@ export const BuilderEntryItem: React.FC = ({
isDisabled={isDisabled || indexPattern == null}
onChange={handleFieldChange}
data-test-subj="exceptionBuilderEntryField"
- fieldInputWidth={275}
/>
);
if (isFirst) {
return (
-
+
{comboBox}
);
} else {
return (
-
+
{comboBox}
);
@@ -319,14 +322,14 @@ export const BuilderEntryItem: React.FC = ({
className="exceptionItemEntryContainer"
data-test-subj="exceptionItemEntryContainer"
>
- {renderFieldInput(showLabel)}
+ {renderFieldInput(showLabel)}
{renderOperatorInput(showLabel)}
-
+
{renderFieldValueInput(
showLabel,
entry.nested === 'parent' ? OperatorTypeEnum.EXISTS : entry.operator.type
)}
-
+