Merge branch 'master' of github.com:elastic/kibana into feat/networkt…

…-tls-search-strategy

# Conflicts:
#	x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/index.ts
#	x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts

.github/CODEOWNERS

@@ -85,7 +85,6 @@
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/observability-ui
-/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md

@@ -7,15 +7,8 @@
 <b>Signature:</b>
 
 ```typescript
-init(forceFieldRefresh?: boolean): Promise<this>;
+init(): Promise<this>;
 ```
-
-## Parameters
-
-| Parameter | Type | Description |
-| --- | --- | --- |
-| forceFieldRefresh | <code>boolean</code> | |
-
 <b>Returns:</b>
 
 `Promise<this>`

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md

@@ -50,7 +50,7 @@ export declare class IndexPattern implements IIndexPattern
 | [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) | | |
 | [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) | | |
 | [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) | | |
-| [init(forceFieldRefresh)](./kibana-plugin-plugins-data-public.indexpattern.init.md) | | |
+| [init()](./kibana-plugin-plugins-data-public.indexpattern.init.md) | | |
 | [initFromSpec(spec)](./kibana-plugin-plugins-data-public.indexpattern.initfromspec.md) | | |
 | [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) | | |
 | [isTimeBasedWildcard()](./kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md) | | |

package.json

@@ -117,15 +117,18 @@
  "**/@types/*/**",
  "**/grunt-*",
  "**/grunt-*/**",
- "x-pack/typescript"
+ "x-pack/typescript",
+ "@elastic/eui/rehype-react",
+ "@elastic/eui/remark-rehype",
+ "@elastic/eui/remark-rehype/**"
  ]
  },
  "dependencies": {
  "@babel/core": "^7.11.1",
  "@babel/register": "^7.10.5",
  "@elastic/datemath": "5.0.3",
  "@elastic/elasticsearch": "7.9.0-rc.2",
- "@elastic/eui": "27.4.1",
+ "@elastic/eui": "28.2.0",
  "@elastic/good": "8.1.1-kibana2",
  "@elastic/numeral": "^2.5.0",
  "@elastic/request-crypto": "1.1.4",
@@ -227,7 +230,7 @@
  "@babel/parser": "^7.11.2",
  "@babel/types": "^7.11.0",
  "@elastic/apm-rum": "^5.5.0",
- "@elastic/charts": "19.8.1",
+ "@elastic/charts": "21.0.1",
  "@elastic/ems-client": "7.9.3",
  "@elastic/eslint-config-kibana": "0.15.0",
  "@elastic/eslint-plugin-eui": "0.0.2",

packages/kbn-es/package.json

@@ -16,7 +16,7 @@
  "glob": "^7.1.2",
  "node-fetch": "^2.6.0",
  "simple-git": "^1.91.0",
- "tar-fs": "^1.16.3",
+ "tar-fs": "^2.1.0",
  "tree-kill": "^1.2.2",
  "yauzl": "^2.10.0"
  }

packages/kbn-plugin-helpers/package.json

@@ -23,10 +23,10 @@
  "vinyl-fs": "^3.0.3"
  },
  "devDependencies": {
- "@types/decompress": "^4.2.3",
+ "@types/extract-zip": "^1.6.2",
  "@types/gulp-zip": "^4.0.1",
  "@types/inquirer": "^6.5.0",
- "decompress": "^4.2.1",
+ "extract-zip": "^2.0.1",
  "typescript": "4.0.2"
  }
 }

packages/kbn-plugin-helpers/src/integration_tests/build.test.ts

@@ -22,7 +22,7 @@ import Fs from 'fs';
 
 import execa from 'execa';
 import { createStripAnsiSerializer, REPO_ROOT, createReplaceSerializer } from '@kbn/dev-utils';
-import decompress from 'decompress';
+import extract from 'extract-zip';
 import del from 'del';
 import globby from 'globby';
 import loadJsonFile from 'load-json-file';
@@ -81,7 +81,7 @@ it('builds a generated plugin into a viable archive', async () => {
  info compressing plugin into [fooTestPlugin-7.5.0.zip]"
  `);
 
- await decompress(PLUGIN_ARCHIVE, TMP_DIR);
+ await extract(PLUGIN_ARCHIVE, { dir: TMP_DIR });
 
  const files = await globby(['**/*'], { cwd: TMP_DIR });
  files.sort((a, b) => a.localeCompare(b));

packages/kbn-test/package.json

@@ -32,7 +32,7 @@
  "parse-link-header": "^1.0.1",
  "rxjs": "^6.5.5",
  "strip-ansi": "^5.2.0",
- "tar-fs": "^1.16.3",
+ "tar-fs": "^2.1.0",
  "tmp": "^0.1.0",
  "xml2js": "^0.4.22",
  "zlib": "^1.0.5"

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

@@ -9,8 +9,8 @@
  "kbn:watch": "node scripts/build --dev --watch"
  },
  "dependencies": {
- "@elastic/charts": "19.8.1",
- "@elastic/eui": "27.4.1",
+ "@elastic/charts": "21.0.1",
+ "@elastic/eui": "28.2.0",
  "@elastic/numeral": "^2.5.0",
  "@kbn/i18n": "1.0.0",
  "@kbn/monaco": "1.0.0",

src/core/server/ui_settings/integration_tests/lib/servers.ts

@@ -73,9 +73,9 @@ export function getServices() {
  httpServerMock.createKibanaRequest()
  );
 
- const uiSettings = kbnServer.server.uiSettingsServiceFactory({
- savedObjectsClient,
- });
+ const uiSettings = kbnServer.newPlatform.start.core.uiSettings.asScopedToClient(
+ savedObjectsClient
+ );
 
  services = {
  kbnServer,

src/legacy/server/kbn_server.d.ts

@@ -45,7 +45,6 @@ import { LegacyConfig, ILegacyService, ILegacyInternals } from '../../core/serve
 import { UiPlugins } from '../../core/server/plugins';
 import { CallClusterWithRequest, ElasticsearchPlugin } from '../core_plugins/elasticsearch';
 import { UsageCollectionSetup } from '../../plugins/usage_collection/server';
-import { UiSettingsServiceFactoryOptions } from '../../legacy/ui/ui_settings/ui_settings_service_factory';
 import { HomeServerPluginSetup } from '../../plugins/home/server';
 
 // lot of legacy code was assuming this type only had these two methods
@@ -78,7 +77,6 @@ declare module 'hapi' {
  name: string,
  factoryFn: (request: Request) => Record<string, any>
  ) => void;
- uiSettingsServiceFactory: (options?: UiSettingsServiceFactoryOptions) => IUiSettingsClient;
  logWithMetadata: (tags: string[], message: string, meta: Record<string, any>) => void;
  newPlatform: KbnServer['newPlatform'];
  }

src/legacy/ui/ui_mixin.js

@@ -19,10 +19,8 @@
 
 import { uiAppsMixin } from './ui_apps';
 import { uiRenderMixin } from './ui_render';
-import { uiSettingsMixin } from './ui_settings';
 
 export async function uiMixin(kbnServer) {
  await kbnServer.mixin(uiAppsMixin);
- await kbnServer.mixin(uiSettingsMixin);
  await kbnServer.mixin(uiRenderMixin);
 }

src/legacy/ui/ui_render/ui_render_mixin.js

@@ -21,6 +21,7 @@ import { createHash } from 'crypto';
 import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
 import * as UiSharedDeps from '@kbn/ui-shared-deps';
+import { KibanaRequest } from '../../../core/server';
 import { AppBootstrap } from './bootstrap';
 import { getApmConfig } from '../apm';
 
@@ -79,7 +80,10 @@ export function uiRenderMixin(kbnServer, server, config) {
  auth: authEnabled ? { mode: 'try' } : false,
  },
  async handler(request, h) {
- const uiSettings = request.getUiSettingsService();
+ const soClient = kbnServer.newPlatform.start.core.savedObjects.getScopedClient(
+ KibanaRequest.from(request)
+ );
+ const uiSettings = kbnServer.newPlatform.start.core.uiSettings.asScopedToClient(soClient);
 
  const darkMode =
  !authEnabled || request.auth.isAuthenticated