Merge branch 'main' into files-record-created-by

* main: Upgrade @elastic/makelogs from v6.0.0 to v6.1.1 (elastic#144231) [Files] move to src (elastic#144044) [Synthetics UI] Add pagination and date filtering to test runs table (elastic#144029) Update time range when opening timeline from Entity Analytics page (elastic#144024) [Security Solution] Added guided onboarding for the rules area (elastic#144016)
jloleysens · Oct 31, 2022 · 0c910e7 · 0c910e7
2 parents 8f24d18 + 91f5453
commit 0c910e7
Show file tree

Hide file tree

Showing 247 changed files with 1,681 additions and 1,088 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -84,8 +84,8 @@
 /x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-services
 /x-pack/plugins/runtime_fields @elastic/kibana-app-services
 /src/plugins/dashboard/public/application/embeddable/viewport/print_media @elastic/kibana-app-services
-x-pack/plugins/files @elastic/kibana-app-services
-x-pack/examples/files_example @elastic/kibana-app-services
+/src/plugins/files @elastic/kibana-app-services
+/examples/files_example @elastic/kibana-app-services
 /x-pack/test/search_sessions_integration/ @elastic/kibana-app-services
 /test/plugin_functional/test_suites/panel_actions @elastic/kibana-app-services
 /test/plugin_functional/test_suites/data_plugin @elastic/kibana-app-services

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -9,10 +9,7 @@
     "charts": "src/plugins/charts",
     "console": "src/plugins/console",
     "contentManagement": "packages/content-management",
-    "core": [
-      "src/core",
-      "packages/core"
-    ],
+    "core": ["src/core", "packages/core"],
     "customIntegrations": "src/plugins/custom_integrations",
     "dashboard": "src/plugins/dashboard",
     "controls": "src/plugins/controls",
@@ -41,6 +38,7 @@
     "expressionTagcloud": "src/plugins/chart_expressions/expression_tagcloud",
     "eventAnnotation": "src/plugins/event_annotation",
     "fieldFormats": "src/plugins/field_formats",
+    "files": "src/plugins/files",
     "flot": "packages/kbn-flot-charts/lib",
     "guidedOnboarding": "src/plugins/guided_onboarding",
     "guidedOnboardingPackage": "packages/kbn-guided-onboarding",

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -176,6 +176,10 @@ for use in their own application.
 |Index pattern fields formatters
 
 
+|{kib-repo}blob/{branch}/src/plugins/files/README.md[files]
+|File upload, download, sharing, and serving over HTTP implementation in Kibana.
+
+
 |{kib-repo}blob/{branch}/src/plugins/guided_onboarding/README.md[guidedOnboarding]
 |This plugin contains the code for the Guided Onboarding project. Guided onboarding consists of guides for Solutions (Enterprise Search, Observability, Security) that can be completed as a checklist of steps. The guides help users to ingest their data and to navigate to the correct Solutions pages.
 
@@ -491,10 +495,6 @@ activities.
 |The features plugin enhance Kibana with a per-feature privilege system.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/files/README.md[files]
-|File upload, download, sharing, and serving over HTTP implementation in Kibana.
-
-
 |{kib-repo}blob/{branch}/x-pack/plugins/file_upload[fileUpload]
 |WARNING: Missing README.
 

diff --git a/x-pack/examples/files_example/.i18nrc.json → examples/files_example/.i18nrc.json b/x-pack/examples/files_example/.i18nrc.json → examples/files_example/.i18nrc.json
diff --git a/x-pack/examples/files_example/README.md → examples/files_example/README.md b/x-pack/examples/files_example/README.md → examples/files_example/README.md
diff --git a/...ck/examples/files_example/common/index.ts → examples/files_example/common/index.ts b/...ck/examples/files_example/common/index.ts → examples/files_example/common/index.ts
@@ -1,8 +1,9 @@
 /*
  * 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 type { FileKind, FileImageMetadata } from '@kbn/files-plugin/common';

diff --git a/x-pack/examples/files_example/kibana.json → examples/files_example/kibana.json b/x-pack/examples/files_example/kibana.json → examples/files_example/kibana.json
diff --git a/...ples/files_example/public/application.tsx → ...ples/files_example/public/application.tsx b/...ples/files_example/public/application.tsx → ...ples/files_example/public/application.tsx
@@ -1,8 +1,9 @@
 /*
  * 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 React from 'react';

diff --git a/...s/files_example/public/components/app.tsx → ...s/files_example/public/components/app.tsx b/...s/files_example/public/components/app.tsx → ...s/files_example/public/components/app.tsx
@@ -1,8 +1,9 @@
 /*
  * 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 React, { useState } from 'react';

diff --git a/...mple/public/components/confirm_button.tsx → ...mple/public/components/confirm_button.tsx b/...mple/public/components/confirm_button.tsx → ...mple/public/components/confirm_button.tsx
@@ -1,8 +1,9 @@
 /*
  * 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 React, { useState, FunctionComponent } from 'react';

diff --git a/...mple/public/components/details_flyout.tsx → ...mple/public/components/details_flyout.tsx b/...mple/public/components/details_flyout.tsx → ...mple/public/components/details_flyout.tsx
@@ -1,9 +1,11 @@
 /*
  * 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 moment from 'moment';
 import type { FunctionComponent } from 'react';
 import React from 'react';

diff --git a/...example/public/components/file_picker.tsx → ...example/public/components/file_picker.tsx b/...example/public/components/file_picker.tsx → ...example/public/components/file_picker.tsx
@@ -1,8 +1,9 @@
 /*
  * 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 React from 'react';

diff --git a/...files_example/public/components/modal.tsx → ...files_example/public/components/modal.tsx b/...files_example/public/components/modal.tsx → ...files_example/public/components/modal.tsx
@@ -1,8 +1,9 @@
 /*
  * 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 type { FunctionComponent } from 'react';

diff --git a/.../examples/files_example/public/imports.ts → examples/files_example/public/imports.ts b/.../examples/files_example/public/imports.ts → examples/files_example/public/imports.ts
@@ -1,8 +1,9 @@
 /*
  * 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.
  */
 
 export {

diff --git a/...ck/examples/files_example/public/index.ts → examples/files_example/public/index.ts b/...ck/examples/files_example/public/index.ts → examples/files_example/public/index.ts
@@ -1,8 +1,9 @@
 /*
  * 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 { FilesExamplePlugin } from './plugin';

diff --git a/...k/examples/files_example/public/plugin.ts → examples/files_example/public/plugin.ts b/...k/examples/files_example/public/plugin.ts → examples/files_example/public/plugin.ts
@@ -1,8 +1,9 @@
 /*
  * 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 { AppNavLinkStatus } from '@kbn/core-application-browser';

diff --git a/...ck/examples/files_example/public/types.ts → examples/files_example/public/types.ts b/...ck/examples/files_example/public/types.ts → examples/files_example/public/types.ts
@@ -1,8 +1,9 @@
 /*
  * 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 { MyImageMetadata } from '../common';

diff --git a/...ck/examples/files_example/server/index.ts → examples/files_example/server/index.ts b/...ck/examples/files_example/server/index.ts → examples/files_example/server/index.ts
@@ -1,8 +1,9 @@
 /*
  * 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 { PluginInitializerContext } from '@kbn/core/server';

diff --git a/...k/examples/files_example/server/plugin.ts → examples/files_example/server/plugin.ts b/...k/examples/files_example/server/plugin.ts → examples/files_example/server/plugin.ts
@@ -1,8 +1,9 @@
 /*
  * 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 { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';

diff --git a/...ck/examples/files_example/server/types.ts → examples/files_example/server/types.ts b/...ck/examples/files_example/server/types.ts → examples/files_example/server/types.ts
@@ -1,8 +1,9 @@
 /*
  * 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 type { FilesSetup, FilesStart } from '@kbn/files-plugin/server';

diff --git a/examples/files_example/tsconfig.json b/examples/files_example/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./target/types"
+  },
+  "include": [
+    "index.ts",
+    "common/**/*",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "server/**/*.ts",
+    "../../typings/**/*"
+  ],
+  "exclude": [],
+  "kbn_references": [
+    { "path": "../../src/core/tsconfig.json" },
+    { "path": "../developer_examples/tsconfig.json" },
+    { "path": "../../src/plugins/files/tsconfig.json" },
+  ]
+}
diff --git a/package.json b/package.json
@@ -703,7 +703,7 @@
     "@cypress/snapshot": "^2.1.7",
     "@cypress/webpack-preprocessor": "^5.12.2",
     "@elastic/eslint-plugin-eui": "0.0.2",
-    "@elastic/makelogs": "^6.0.0",
+    "@elastic/makelogs": "^6.1.1",
     "@elastic/synthetics": "^1.0.0-beta.22",
     "@emotion/babel-preset-css-prop": "^11.10.0",
     "@emotion/jest": "^11.10.0",

diff --git a/src/dev/storybook/aliases.ts b/src/dev/storybook/aliases.ts
@@ -33,7 +33,7 @@ export const storybookAliases = {
   expression_reveal_image: 'src/plugins/expression_reveal_image/.storybook',
   expression_shape: 'src/plugins/expression_shape/.storybook',
   expression_tagcloud: 'src/plugins/chart_expressions/expression_tagcloud/.storybook',
-  files: 'x-pack/plugins/files/.storybook',
+  files: 'src/plugins/files/.storybook',
   fleet: 'x-pack/plugins/fleet/.storybook',
   home: 'src/plugins/home/.storybook',
   infra: 'x-pack/plugins/infra/.storybook',

diff --git a/x-pack/plugins/files/.i18nrc.json → src/plugins/files/.i18nrc.json b/x-pack/plugins/files/.i18nrc.json → src/plugins/files/.i18nrc.json
diff --git a/x-pack/plugins/files/.storybook/main.ts → src/plugins/files/.storybook/main.ts b/x-pack/plugins/files/.storybook/main.ts → src/plugins/files/.storybook/main.ts
@@ -1,8 +1,9 @@
 /*
  * 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 { defaultConfig } from '@kbn/storybook';

diff --git a/x-pack/plugins/files/.storybook/manager.ts → src/plugins/files/.storybook/manager.ts b/x-pack/plugins/files/.storybook/manager.ts → src/plugins/files/.storybook/manager.ts
@@ -1,8 +1,9 @@
 /*
  * 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 { addons } from '@storybook/addons';
@@ -13,7 +14,7 @@ addons.setConfig({
   theme: create({
     base: 'light',
     brandTitle: 'Kibana React Storybook',
-    brandUrl: 'https://github.com/elastic/kibana/tree/main/x-pack/plugins/files',
+    brandUrl: 'https://github.com/elastic/kibana/tree/main/src/plugins/files',
   }),
   showPanel: true.valueOf,
   selectedPanel: PANEL_ID,

diff --git a/x-pack/plugins/files/README.md → src/plugins/files/README.md b/x-pack/plugins/files/README.md → src/plugins/files/README.md
diff --git a/x-pack/plugins/files/common/api_routes.ts → src/plugins/files/common/api_routes.ts b/x-pack/plugins/files/common/api_routes.ts → src/plugins/files/common/api_routes.ts
@@ -1,8 +1,9 @@
 /*
  * 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 type { TypeOf, Type } from '@kbn/config-schema';

diff --git a/x-pack/plugins/files/common/constants.ts → src/plugins/files/common/constants.ts b/x-pack/plugins/files/common/constants.ts → src/plugins/files/common/constants.ts
@@ -1,8 +1,9 @@
 /*
  * 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.
  */
 
 /**

diff --git a/...files/common/file_kinds_registry/index.ts → ...files/common/file_kinds_registry/index.ts b/...files/common/file_kinds_registry/index.ts → ...files/common/file_kinds_registry/index.ts
@@ -1,9 +1,11 @@
 /*
  * 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 { createGetterSetter } from '@kbn/kibana-utils-plugin/common';
 import assert from 'assert';
 import { FileKind } from '..';

diff --git a/x-pack/plugins/files/common/index.ts → src/plugins/files/common/index.ts b/x-pack/plugins/files/common/index.ts → src/plugins/files/common/index.ts
@@ -1,8 +1,9 @@
 /*
  * 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.
  */
 
 export { FILE_SO_TYPE, PLUGIN_ID, PLUGIN_NAME, ES_FIXED_SIZE_INDEX_BLOB_STORE } from './constants';

diff --git a/x-pack/plugins/files/common/types.ts → src/plugins/files/common/types.ts b/x-pack/plugins/files/common/types.ts → src/plugins/files/common/types.ts
@@ -1,9 +1,11 @@
 /*
  * 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 type { SavedObject } from '@kbn/core/server';
 import type { Observable } from 'rxjs';
 import type { Readable } from 'stream';

diff --git a/x-pack/plugins/files/docs/tutorial.mdx → src/plugins/files/docs/tutorial.mdx b/x-pack/plugins/files/docs/tutorial.mdx → src/plugins/files/docs/tutorial.mdx
@@ -53,7 +53,7 @@ Consumers of the file service are able to decide what metadata they want to asso
 
 ### How to set up files for your plugin
 
-All setup examples are based on the [`filesExample` plugin](https://github.com/elastic/kibana/blob/d431e87f7ff43833bff085e5bb5b2ab603bfa05d/x-pack/examples/files_example/README.md).
+All setup examples are based on the [`filesExample` plugin](https://github.com/elastic/kibana/blob/d431e87f7ff43833bff085e5bb5b2ab603bfa05d/examples/files_example/README.md).
 
 First add the  `files` plugin as a required dependency in your `kibana.json`:
 

diff --git a/src/plugins/files/jest.config.js b/src/plugins/files/jest.config.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../..',
+  roots: ['<rootDir>/src/plugins/files'],
+  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/src/plugins/files',
+  coverageReporters: ['text', 'html'],
+  collectCoverageFrom: ['<rootDir>/src/plugins/files/{common,public,server}/**/*.{js,ts,tsx}'],
+};