Merge branch 'master' into fix/olm-hide_content_while_checking_if_ent…

…ries_exists-100137

packages/elastic-eslint-config-kibana/.eslintrc.js

@@ -70,6 +70,11 @@ module.exports = {
           to: '@kbn/tinymath',
           disallowedMessage: `Don't use 'tinymath', use '@kbn/tinymath'`
         },
+        {
+          from: '@kbn/test/types/ftr',
+          to: '@kbn/test',
+          disallowedMessage: `import from the root of @kbn/test instead`
+        },
       ],
     ],
   },

packages/kbn-optimizer/limits.yml

@@ -68,7 +68,7 @@ pageLoadAssetSize:
   searchprofiler: 67080
   security: 95864
   securityOss: 30806
-  securitySolution: 187863
+  securitySolution: 76000
   share: 99061
   snapshotRestore: 79032
   spaces: 57868

x-pack/plugins/security_solution/server/lib/detection_engine/index/get_index_aliases.ts → packages/kbn-securitysolution-es-utils/src/get_index_aliases/index.ts

@@ -1,11 +1,12 @@
 /*
  * 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.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '../elasticsearch_client';
 
 interface AliasesResponse {
   [indexName: string]: {

x-pack/plugins/security_solution/server/lib/detection_engine/index/get_index_count.ts → packages/kbn-securitysolution-es-utils/src/get_index_count/index.ts

@@ -1,11 +1,12 @@
 /*
  * 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.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '../elasticsearch_client';
 
 /**
  * Retrieves the count of documents in a given index

packages/kbn-securitysolution-es-utils/src/index.ts

@@ -12,9 +12,12 @@ export * from './delete_all_index';
 export * from './delete_policy';
 export * from './delete_template';
 export * from './elasticsearch_client';
+export * from './get_index_aliases';
+export * from './get_index_count';
 export * from './get_index_exists';
 export * from './get_policy_exists';
 export * from './get_template_exists';
+export * from './read_index';
 export * from './read_privileges';
 export * from './set_policy';
 export * from './set_template';

x-pack/plugins/security_solution/server/lib/detection_engine/index/read_index.ts → packages/kbn-securitysolution-es-utils/src/read_index/index.ts

@@ -1,11 +1,12 @@
 /*
  * 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.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '../elasticsearch_client';
 
 export const readIndex = async (esClient: ElasticsearchClient, index: string): Promise<unknown> => {
   return esClient.indices.get({

packages/kbn-securitysolution-io-ts-alerting-types/src/from/index.ts

@@ -24,3 +24,6 @@ export const from = new t.Type<string, string, unknown>(
   t.identity
 );
 export type From = t.TypeOf<typeof from>;
+
+export const fromOrUndefined = t.union([from, t.undefined]);
+export type FromOrUndefined = t.TypeOf<typeof fromOrUndefined>;

packages/kbn-securitysolution-io-ts-alerting-types/src/index.ts

@@ -24,6 +24,7 @@ export * from './default_to_string';
 export * from './default_uuid';
 export * from './from';
 export * from './language';
+export * from './machine_learning_job_id';
 export * from './max_signals';
 export * from './normalized_ml_job_id';
 export * from './references_default_array';
@@ -38,3 +39,4 @@ export * from './threat_subtechnique';
 export * from './threat_tactic';
 export * from './threat_technique';
 export * from './throttle';
+export * from './type';

packages/kbn-securitysolution-io-ts-alerting-types/src/language/index.ts

@@ -10,3 +10,6 @@ import * as t from 'io-ts';
 
 export const language = t.keyof({ eql: null, kuery: null, lucene: null });
 export type Language = t.TypeOf<typeof language>;
+
+export const languageOrUndefined = t.union([language, t.undefined]);
+export type LanguageOrUndefined = t.TypeOf<typeof languageOrUndefined>;

packages/kbn-securitysolution-io-ts-alerting-types/src/machine_learning_job_id/index.ts

@@ -0,0 +1,19 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import * as t from 'io-ts';
+
+import { machine_learning_job_id_normalized } from '../normalized_ml_job_id';
+
+export const machine_learning_job_id = t.union([t.string, machine_learning_job_id_normalized]);
+export type MachineLearningJobId = t.TypeOf<typeof machine_learning_job_id>;
+
+export const machineLearningJobIdOrUndefined = t.union([machine_learning_job_id, t.undefined]);
+export type MachineLearningJobIdOrUndefined = t.TypeOf<typeof machineLearningJobIdOrUndefined>;

packages/kbn-securitysolution-io-ts-alerting-types/src/max_signals/index.ts

@@ -13,3 +13,6 @@ import { PositiveIntegerGreaterThanZero } from '@kbn/securitysolution-io-ts-type
 
 export const max_signals = PositiveIntegerGreaterThanZero;
 export type MaxSignals = t.TypeOf<typeof max_signals>;
+
+export const maxSignalsOrUndefined = t.union([max_signals, t.undefined]);
+export type MaxSignalsOrUndefined = t.TypeOf<typeof maxSignalsOrUndefined>;

packages/kbn-securitysolution-io-ts-alerting-types/src/risk_score/index.ts

@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+/* eslint-disable @typescript-eslint/naming-convention */
+
 import * as t from 'io-ts';
 import { Either } from 'fp-ts/lib/Either';
 
@@ -26,3 +28,9 @@ export const RiskScore = new t.Type<number, number, unknown>(
 );
 
 export type RiskScoreC = typeof RiskScore;
+
+export const risk_score = RiskScore;
+export type RiskScore = t.TypeOf<typeof risk_score>;
+
+export const riskScoreOrUndefined = t.union([risk_score, t.undefined]);
+export type RiskScoreOrUndefined = t.TypeOf<typeof riskScoreOrUndefined>;

packages/kbn-securitysolution-io-ts-alerting-types/src/risk_score_mapping/index.ts

@@ -10,10 +10,7 @@
 
 import * as t from 'io-ts';
 import { operator } from '@kbn/securitysolution-io-ts-types';
-import { RiskScore } from '../risk_score';
-
-export const riskScoreOrUndefined = t.union([RiskScore, t.undefined]);
-export type RiskScoreOrUndefined = t.TypeOf<typeof riskScoreOrUndefined>;
+import { riskScoreOrUndefined } from '../risk_score';
 
 export const risk_score_mapping_field = t.string;
 export const risk_score_mapping_value = t.string;
@@ -28,3 +25,6 @@ export const risk_score_mapping_item = t.exact(
 
 export const risk_score_mapping = t.array(risk_score_mapping_item);
 export type RiskScoreMapping = t.TypeOf<typeof risk_score_mapping>;
+
+export const riskScoreMappingOrUndefined = t.union([risk_score_mapping, t.undefined]);
+export type RiskScoreMappingOrUndefined = t.TypeOf<typeof riskScoreMappingOrUndefined>;

packages/kbn-securitysolution-io-ts-alerting-types/src/threat/index.ts

@@ -32,3 +32,6 @@ export type Threat = t.TypeOf<typeof threat>;
 
 export const threats = t.array(threat);
 export type Threats = t.TypeOf<typeof threats>;
+
+export const threatsOrUndefined = t.union([threats, t.undefined]);
+export type ThreatsOrUndefined = t.TypeOf<typeof threatsOrUndefined>;

packages/kbn-securitysolution-io-ts-alerting-types/src/threat_subtechnique/index.ts

@@ -21,3 +21,5 @@ export const threat_subtechnique = t.type({
 });
 
 export const threat_subtechniques = t.array(threat_subtechnique);
+
+export type ThreatSubtechnique = t.TypeOf<typeof threat_subtechnique>;

packages/kbn-securitysolution-io-ts-alerting-types/src/threat_technique/index.ts

@@ -30,3 +30,5 @@ export const threat_technique = t.intersection([
   ),
 ]);
 export const threat_techniques = t.array(threat_technique);
+
+export type ThreatTechnique = t.TypeOf<typeof threat_technique>;

packages/kbn-securitysolution-io-ts-alerting-types/src/type/index.ts

@@ -0,0 +1,22 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as t from 'io-ts';
+
+export const type = t.keyof({
+  eql: null,
+  machine_learning: null,
+  query: null,
+  saved_query: null,
+  threshold: null,
+  threat_match: null,
+});
+export type Type = t.TypeOf<typeof type>;
+
+export const typeOrUndefined = t.union([type, t.undefined]);
+export type TypeOrUndefined = t.TypeOf<typeof typeOrUndefined>;

packages/kbn-securitysolution-io-ts-list-types/src/index.ts

@@ -16,7 +16,6 @@ export * from './default_create_comments_array';
 export * from './default_namespace';
 export * from './default_namespace_array';
 export * from './default_update_comments_array';
-export * from './default_version_number';
 export * from './description';
 export * from './endpoint';
 export * from './entries';
@@ -43,4 +42,3 @@ export * from './type';
 export * from './update_comment';
 export * from './updated_at';
 export * from './updated_by';
-export * from './version';

packages/kbn-securitysolution-io-ts-list-types/src/type/index.ts

@@ -40,3 +40,4 @@ export const type = t.keyof({
 
 export const typeOrUndefined = t.union([type, t.undefined]);
 export type Type = t.TypeOf<typeof type>;
+export type TypeOrUndefined = t.TypeOf<typeof typeOrUndefined>;

packages/kbn-securitysolution-io-ts-types/src/index.ts

@@ -13,6 +13,7 @@ export * from './default_empty_string';
 export * from './default_string_array';
 export * from './default_string_boolean_false';
 export * from './default_uuid';
+export * from './default_version_number';
 export * from './empty_string_array';
 export * from './iso_date_string';
 export * from './non_empty_array';
@@ -26,3 +27,4 @@ export * from './positive_integer';
 export * from './positive_integer_greater_than_zero';
 export * from './string_to_positive_number';
 export * from './uuid';
+export * from './version';

packages/kbn-securitysolution-io-ts-list-types/src/version/index.ts → packages/kbn-securitysolution-io-ts-types/src/version/index.ts

@@ -7,7 +7,7 @@
  */
 
 import * as t from 'io-ts';
-import { PositiveIntegerGreaterThanZero } from '@kbn/securitysolution-io-ts-types';
+import { PositiveIntegerGreaterThanZero } from '../positive_integer_greater_than_zero';
 
 /**
  * Note this is just a positive number, but we use it as a type here which is still ok.
@@ -16,3 +16,6 @@ import { PositiveIntegerGreaterThanZero } from '@kbn/securitysolution-io-ts-type
  */
 export const version = PositiveIntegerGreaterThanZero;
 export type Version = t.TypeOf<typeof version>;
+
+export const versionOrUndefined = t.union([version, t.undefined]);
+export type VersionOrUndefined = t.TypeOf<typeof versionOrUndefined>;

packages/kbn-test/package.json

@@ -3,8 +3,8 @@
   "version": "1.0.0",
   "private": true,
   "license": "SSPL-1.0 OR Elastic License 2.0",
-  "main": "./target/index.js",
-  "types": "./target/types/index.d.ts",
+  "main": "./target",
+  "types": "./target/types",
   "scripts": {
     "build": "node scripts/build",
     "kbn:bootstrap": "node scripts/build --source-maps",

packages/kbn-test/src/functional_test_runner/index.ts

@@ -10,3 +10,4 @@ export { FunctionalTestRunner } from './functional_test_runner';
 export { readConfigFile, Config } from './lib';
 export { runFtrCli } from './cli';
 export * from './lib/docker_servers';
+export * from './public_types';

packages/kbn-test/types/ftr.d.ts → packages/kbn-test/src/functional_test_runner/public_types.ts

@@ -7,13 +7,9 @@
  */
 
 import { ToolingLog } from '@kbn/dev-utils';
-import {
-  Config,
-  Lifecycle,
-  FailureMetadata,
-  DockerServersService,
-} from '../src/functional_test_runner/lib';
-import { Test, Suite } from '../src/functional_test_runner/fake_mocha_types';
+
+import { Config, Lifecycle, FailureMetadata, DockerServersService } from './lib';
+import { Test, Suite } from './fake_mocha_types';
 
 export { Lifecycle, Config, FailureMetadata };
 

packages/kbn-test/tsconfig.json

@@ -8,19 +8,17 @@
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
-    "sourceRoot": "../../../../../packages/kbn-test/src",
+    "sourceRoot": "../../../../../../packages/kbn-test/src",
     "types": [
       "jest",
       "node"
     ],
   },
   "include": [
-    "types/**/*",
     "src/**/*",
     "index.d.ts"
   ],
   "exclude": [
-    "types/ftr_globals/**/*",
     "**/__fixtures__/**/*"
   ]
 }

src/plugins/home/server/services/index.ts

@@ -15,7 +15,6 @@ export type { TutorialsRegistrySetup, TutorialsRegistryStart } from './tutorials
 export { TutorialsCategory } from './tutorials';
 
 export type {
-  ParamTypes,
   InstructionSetSchema,
   ParamsSchema,
   InstructionsSchema,

src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts

@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject } from 'src/core/server';
+import type { SampleDatasetSchema } from './sample_dataset_schema';
+export type { SampleDatasetSchema, AppLinkSchema, DataIndexSchema } from './sample_dataset_schema';
 
 export enum DatasetStatusTypes {
   NOT_INSTALLED = 'not_installed',
@@ -26,57 +27,4 @@ export enum EmbeddableTypes {
   SEARCH_EMBEDDABLE_TYPE = 'search',
   VISUALIZE_EMBEDDABLE_TYPE = 'visualization',
 }
-export interface DataIndexSchema {
-  id: string;
-
-  // path to newline delimented JSON file containing data relative to KIBANA_HOME
-  dataPath: string;
-
-  // Object defining Elasticsearch field mappings (contents of index.mappings.type.properties)
-  fields: object;
-
-  // times fields that will be updated relative to now when data is installed
-  timeFields: string[];
-
-  // Reference to now in your test data set.
-  // When data is installed, timestamps are converted to the present time.
-  // The distance between a timestamp and currentTimeMarker is preserved but the date and time will change.
-  // For example:
-  //   sample data set:    timestamp: 2018-01-01T00:00:00Z, currentTimeMarker: 2018-01-01T12:00:00Z
-  //   installed data set: timestamp: 2018-04-18T20:33:14Z, currentTimeMarker: 2018-04-19T08:33:14Z
-  currentTimeMarker: string;
-
-  // Set to true to move timestamp to current week, preserving day of week and time of day
-  // Relative distance from timestamp to currentTimeMarker will not remain the same
-  preserveDayOfWeekTimeOfDay: boolean;
-}
-
-export interface AppLinkSchema {
-  path: string;
-  icon: string;
-  label: string;
-}
-
-export interface SampleDatasetSchema<T = unknown> {
-  id: string;
-  name: string;
-  description: string;
-  previewImagePath: string;
-  darkPreviewImagePath: string;
-
-  // saved object id of main dashboard for sample data set
-  overviewDashboard: string;
-  appLinks: AppLinkSchema[];
-
-  // saved object id of default index-pattern for sample data set
-  defaultIndex: string;
-
-  // Kibana saved objects (index patter, visualizations, dashboard, ...)
-  // Should provide a nice demo of Kibana's functionality with the sample data set
-  savedObjects: Array<SavedObject<T>>;
-  dataIndices: DataIndexSchema[];
-  status?: string | undefined;
-  statusMsg?: unknown;
-}
-
 export type SampleDatasetProvider = () => SampleDatasetSchema;