Merge branch 'master' of github.com:elastic/kibana into telemetry/app…

…lication-usage-plugin

.github/CODEOWNERS

@@ -185,3 +185,10 @@
 /x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team
 /x-pack/test/functional/apps/endpoint/ @elastic/endpoint-app-team
 /x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team
+
+# SIEM
+/x-pack/legacy/plugins/siem/ @elastic/siem
+/x-pack/plugins/siem/ @elastic/siem
+/x-pack/test/detection_engine_api_integration @elastic/siem
+/x-pack/test/api_integration/apis/siem @elastic/siem
+/x-pack/plugins/case @elastic/siem

packages/kbn-optimizer/src/index.ts

@@ -17,6 +17,7 @@
  * under the License.
  */
 
+// cache buster - https://github.com/elastic/kibana/issues/58077 - 1
 export { OptimizerConfig } from './optimizer';
 export * from './run_optimizer';
 export * from './log_optimizer_state';

packages/kbn-storybook/index.js

@@ -24,7 +24,7 @@ const { first } = require('rxjs/operators');
 const storybook = require('@storybook/react/standalone');
 const { run } = require('@kbn/dev-utils');
 const { generateStorybookEntry } = require('./lib/storybook_entry');
-const { REPO_ROOT, CURRENT_CONFIG } = require('./lib/constants');
+const { REPO_ROOT, ASSET_DIR, CURRENT_CONFIG } = require('./lib/constants');
 const { buildDll } = require('./lib/dll');
 
 exports.runStorybookCli = config => {
@@ -62,21 +62,25 @@ exports.runStorybookCli = config => {
  // route errors
  subj.toPromise(),
 
- new Promise(() => {
+ new Promise(async () => {
  // storybook never completes, so neither will this promise
  const configDir = join(__dirname, 'storybook_config');
  log.debug('Config dir:', configDir);
- storybook({
- mode: 'dev',
+ await storybook({
+ mode: flags.site ? 'static' : 'dev',
  port: 9001,
  configDir,
+ outputDir: flags.site ? join(ASSET_DIR, name) : undefined,
  });
+
+ // Line is only reached when building the static version
+ if (flags.site) process.exit();
  }),
  ]);
  },
  {
  flags: {
- boolean: ['rebuildDll'],
+ boolean: ['rebuildDll', 'site'],
  },
  description: `
  Run the storybook examples for ${name}

packages/kbn-storybook/storybook_config/preview-head.html

@@ -2,5 +2,5 @@
  This file is looked for by Storybook and included in the HEAD element
  if it exists. This is how we load the DLL content into the Storybook UI.
 -->
-<script src="/dll.js"></script>
-<link href="/dll.css" rel="stylesheet" />
+<script src="./dll.js"></script>
+<link href="./dll.css" rel="stylesheet" />

packages/kbn-ui-shared-deps/entry.js

@@ -40,6 +40,8 @@ export const ReactDom = require('react-dom');
 export const ReactIntl = require('react-intl');
 export const ReactRouter = require('react-router'); // eslint-disable-line
 export const ReactRouterDom = require('react-router-dom');
+export const Monaco = require('./monaco.ts');
+export const MonacoBare = require('monaco-editor/esm/vs/editor/editor.api');
 
 // load timezone data into moment-timezone
 Moment.tz.load(require('moment-timezone/data/packed/latest.json'));

packages/kbn-ui-shared-deps/index.js

@@ -41,4 +41,7 @@ exports.externals = {
  'react-intl': '__kbnSharedDeps__.ReactIntl',
  'react-router': '__kbnSharedDeps__.ReactRouter',
  'react-router-dom': '__kbnSharedDeps__.ReactRouterDom',
+ '@kbn/ui-shared-deps/monaco': '__kbnSharedDeps__.Monaco',
+ // this is how plugins/consumers from npm load monaco
+ 'monaco-editor/esm/vs/editor/editor.api': '__kbnSharedDeps__.MonacoBare',
 };

packages/kbn-ui-shared-deps/monaco.ts

@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
+
+import 'monaco-editor/esm/vs/base/common/worker/simpleWorker';
+import 'monaco-editor/esm/vs/base/worker/defaultWorkerFactory';
+
+import 'monaco-editor/esm/vs/editor/browser/controller/coreCommands.js';
+import 'monaco-editor/esm/vs/editor/browser/widget/codeEditorWidget.js';
+
+import 'monaco-editor/esm/vs/editor/contrib/suggest/suggestController.js'; // Needed for suggestions
+import 'monaco-editor/esm/vs/editor/contrib/hover/hover.js'; // Needed for hover
+import 'monaco-editor/esm/vs/editor/contrib/parameterHints/parameterHints.js'; // Needed for signature
+
+export { monaco };

packages/kbn-ui-shared-deps/package.json

@@ -12,6 +12,7 @@
  "@elastic/charts": "^17.0.2",
  "abortcontroller-polyfill": "^1.4.0",
  "@elastic/eui": "19.0.0",
+ "@kbn/babel-preset": "1.0.0",
  "@kbn/dev-utils": "1.0.0",
  "@kbn/i18n": "1.0.0",
  "@yarnpkg/lockfile": "^1.1.0",

packages/kbn-ui-shared-deps/tsconfig.json

@@ -1,6 +1,7 @@
 {
  "extends": "../../tsconfig.json",
  "include": [
- "index.d.ts"
+ "index.d.ts",
+ "monaco.ts"
  ]
 }

packages/kbn-ui-shared-deps/webpack.config.js

@@ -59,6 +59,17 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({
  test: /\.css$/,
  use: [MiniCssExtractPlugin.loader, 'css-loader'],
  },
+ {
+ include: [require.resolve('./monaco.ts')],
+ use: [
+ {
+ loader: 'babel-loader',
+ options: {
+ presets: [require.resolve('@kbn/babel-preset/webpack_preset')],
+ },
+ },
+ ],
+ },
  ],
  },
 

src/core/MIGRATION.md

@@ -1170,7 +1170,7 @@ import { setup, start } from '../core_plugins/visualizations/public/legacy';
 | `import 'ui/query_bar'` | `import { QueryStringInput } from '../data/public'` | Directives are deprecated. |
 | `import 'ui/search_bar'` | `import { SearchBar } from '../data/public'` | Directive is deprecated. |
 | `import 'ui/kbn_top_nav'` | `import { TopNavMenu } from '../navigation/public'` | Directive is still available in `ui/kbn_top_nav`. |
-| `ui/saved_objects/components/saved_object_finder` | `import { SavedObjectFinder } from '../kibana_react/public'` | |
+| `ui/saved_objects/components/saved_object_finder` | `import { SavedObjectFinder } from '../saved_objects/public'` | |
 | `core_plugins/interpreter` | `data.expressions` | still in progress |
 | `ui/courier` | `data.search` | still in progress |
 | `ui/embeddable` | `embeddables` | still in progress |

src/legacy/ui/public/saved_objects/__tests__/simple_saved_object.js → src/core/public/saved_objects/simple_saved_object.test.ts

@@ -17,36 +17,43 @@
  * under the License.
  */
 
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-import { SimpleSavedObject } from '../../../../../core/public';
+import { SavedObject } from '../../server';
+import { SimpleSavedObject } from './simple_saved_object';
+import { SavedObjectsClientContract } from './saved_objects_client';
 
 describe('SimpleSavedObject', () => {
+ let client: SavedObjectsClientContract;
+
+ beforeEach(() => {
+ client = {
+ update: jest.fn(),
+ create: jest.fn(),
+ delete: jest.fn(),
+ } as any;
+ });
+
  it('persists type and id', () => {
  const id = 'logstash-*';
  const type = 'index-pattern';
 
- const client = sinon.stub();
- const savedObject = new SimpleSavedObject(client, { id, type });
+ const savedObject = new SimpleSavedObject(client, { id, type } as SavedObject);
 
- expect(savedObject.id).to.be(id);
- expect(savedObject.type).to.be(type);
+ expect(savedObject.id).toEqual(id);
+ expect(savedObject.type).toEqual(type);
  });
 
  it('persists attributes', () => {
  const attributes = { title: 'My title' };
 
- const client = sinon.stub();
- const savedObject = new SimpleSavedObject(client, { attributes });
+ const savedObject = new SimpleSavedObject(client, { attributes } as SavedObject);
 
- expect(savedObject.attributes).to.be(attributes);
+ expect(savedObject.attributes).toEqual(attributes);
  });
 
  it('persists version', () => {
- const version = 2;
+ const version = '2';
 
- const client = sinon.stub();
- const savedObject = new SimpleSavedObject(client, { version });
- expect(savedObject._version).to.be(version);
+ const savedObject = new SimpleSavedObject(client, { version } as SavedObject);
+ expect(savedObject._version).toEqual(version);
  });
 });

src/dev/storybook/run_storybook_cli.ts

@@ -52,6 +52,7 @@ run(
 
  log.verbose('Loading Storybook:', absolute);
  process.chdir(join(absolute, '..', '..'));
+
  require(absolute);
  },
  {
@@ -69,9 +70,10 @@ run(
  flags: {
  default: {},
  string: [],
- boolean: ['clean'],
+ boolean: ['clean', 'site'],
  help: `
  --clean Clean Storybook build folder.
+ --site Build static version of Storybook.
  `,
  },
  }

src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts

@@ -24,7 +24,6 @@
  * directly where they are needed.
  */
 
-export { SavedObjectSaveOpts } from 'ui/saved_objects/types';
 export { npSetup, npStart } from 'ui/new_platform';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 export { KbnUrl } from 'ui/url/kbn_url';
@@ -33,7 +32,6 @@ export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_to
 // @ts-ignore
 export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url/index';
 export { IInjector } from 'ui/chrome';
-export { SavedObjectLoader } from 'ui/saved_objects';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
 export {
  configureAppAngularModule,

src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts

@@ -38,7 +38,6 @@ import {
  PrivateProvider,
  PromiseServiceCreator,
  RedirectWhenMissingProvider,
- SavedObjectLoader,
 } from '../legacy_imports';
 // @ts-ignore
 import { initDashboardApp } from './legacy_app';
@@ -47,6 +46,7 @@ import { NavigationPublicPluginStart as NavigationStart } from '../../../../../.
 import { DataPublicPluginStart } from '../../../../../../plugins/data/public';
 import { SharePluginStart } from '../../../../../../plugins/share/public';
 import { KibanaLegacyStart } from '../../../../../../plugins/kibana_legacy/public';
+import { SavedObjectLoader } from '../../../../../../plugins/saved_objects/public';
 
 export interface RenderDeps {
  pluginInitializerContext: PluginInitializerContext;

src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx

@@ -26,9 +26,10 @@ import angular from 'angular';
 import { Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { History } from 'history';
+import { SavedObjectSaveOpts } from 'src/plugins/saved_objects/public';
 import { DashboardEmptyScreen, DashboardEmptyScreenProps } from './dashboard_empty_screen';
 
-import { migrateLegacyQuery, SavedObjectSaveOpts, subscribeWithScope } from '../legacy_imports';
+import { migrateLegacyQuery, subscribeWithScope } from '../legacy_imports';
 import {
  esFilters,
  IndexPattern,

src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts

@@ -18,7 +18,7 @@
  */
 
 import { TimefilterContract } from 'src/plugins/data/public';
-import { SavedObjectSaveOpts } from '../../legacy_imports';
+import { SavedObjectSaveOpts } from '../../../../../../../plugins/saved_objects/public';
 import { updateSavedDashboard } from './update_saved_dashboard';
 import { DashboardStateManager } from '../dashboard_state_manager';
 

src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts

@@ -16,8 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+import {
+ createSavedObjectClass,
+ SavedObject,
+ SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 import { extractReferences, injectReferences } from './saved_dashboard_references';
 
 import {

src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts

@@ -17,8 +17,10 @@
  * under the License.
  */
 
-import { SavedObjectLoader } from 'ui/saved_objects';
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+import {
+ SavedObjectLoader,
+ SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 import { createSavedDashboardClass } from './saved_dashboard';
 
 export function createSavedDashboardLoader(services: SavedObjectKibanaServices) {

src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.ts

@@ -16,8 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+
+import {
+ createSavedObjectClass,
+ SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 
 export function createSavedSearchClass(services: SavedObjectKibanaServices) {
  const SavedObjectClass = createSavedObjectClass(services);

src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches.ts

@@ -16,8 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObjectLoader } from 'ui/saved_objects';
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+
+import {
+ SavedObjectLoader,
+ SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 import { createSavedSearchClass } from './_saved_search';
 
 export function createSavedSearchesLoader(services: SavedObjectKibanaServices) {

src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts

@@ -20,7 +20,7 @@
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { npStart } from 'ui/new_platform';
-import { SavedObjectLoader } from 'ui/saved_objects';
+import { SavedObjectLoader } from '../../../../../plugins/saved_objects/public';
 import { createSavedDashboardLoader } from '../dashboard';
 import { createSavedSearchesLoader } from '../discover';
 import { TypesService, createSavedVisLoader } from '../../../visualizations/public';

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/render.test.js

@@ -50,6 +50,7 @@ describe('CreateIndexPatternWizardRender', () => {
  config: {},
  changeUrl: () => {},
  indexPatternCreationType: {},
+ openConfirm: jest.fn(),
  });
 
  expect(render.mock.calls.length).toBe(1);

src/legacy/core_plugins/timelion/public/directives/saved_object_save_as_checkbox.html

@@ -5,7 +5,7 @@
  i18n-id="timelion.savedObjects.howToSaveAsNewDescription"
  i18n-default-message="In previous versions of Kibana, changing the name of a {savedObjectName} would make a copy with the new name. Use the 'Save as a new {savedObjectName}' checkbox to do this now."
  i18n-values="{ savedObjectName: savedObject.getDisplayName() }"
- i18n-description="'Save as a new {savedObjectName}' refers to common.ui.savedObjects.saveAsNewLabel and should be the same text."
+ i18n-description="'Save as a new {savedObjectName}' refers to timelion.savedObjects.saveAsNewLabel and should be the same text."
  ></div>
 
  <label class="kuiCheckBoxLabel kuiVerticalRhythmSmall">

src/legacy/core_plugins/timelion/public/services/_saved_sheet.ts

@@ -17,9 +17,11 @@
  * under the License.
  */
 
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
 import { IUiSettingsClient } from 'kibana/public';
+import {
+ createSavedObjectClass,
+ SavedObjectKibanaServices,
+} from '../../../../../plugins/saved_objects/public';
 
 // Used only by the savedSheets service, usually no reason to change this
 export function createSavedSheetClass(

src/legacy/core_plugins/timelion/public/services/saved_sheets.ts

@@ -17,9 +17,9 @@
  * under the License.
  */
 import { npStart } from 'ui/new_platform';
-import { SavedObjectLoader } from 'ui/saved_objects';
 // @ts-ignore
 import { uiModules } from 'ui/modules';
+import { SavedObjectLoader } from '../../../../../plugins/saved_objects/public';
 import { createSavedSheetClass } from './_saved_sheet';
 
 const module = uiModules.get('app/sheet');