Merge branch '7.x' into backport/7.x/pr-88881

.browserslistrc

@@ -2,10 +2,10 @@
 last 2 Firefox versions
 last 2 Chrome versions
 last 2 Safari versions
-> 0.25%
-not ie 11
-not op_mini all
-not samsung 4
+last 2 Edge versions
+last 1 ios_saf versions
+last 1 and_chr versions
+last 1 samsung versions
 
 [dev]
 last 1 chrome versions

.ci/teamcity/default/build.sh

@@ -14,6 +14,7 @@ node scripts/build_kibana_platform_plugins \
   --scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
   --scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
+  --scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
   --verbose
 tc_end_block "Build Platform Plugins"
 

.teamcity/src/builds/default/DefaultFunctionalBase.kt

@@ -1,13 +1,17 @@
 package builds.default
 
+import StandardAgents
 import addTestSettings
+import co.elastic.teamcity.common.requireAgent
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 
 open class DefaultFunctionalBase(init: BuildType.() -> Unit = {}) : BuildType({
   params {
     param("env.KBN_NP_PLUGINS_BUILT", "true")
   }
 
+  requireAgent(StandardAgents["4"]!!)
+
   dependencies {
     defaultBuildWithPlugins()
   }

docs/management/index-patterns.asciidoc

@@ -158,10 +158,13 @@ date values in {es}, you can use a {kib} field formatter to change the display t
 <<field-formatters-geopoint, geopoints>>,
 and <<field-formatters-numeric, numbers>>.
 
+To customize the displayed field name provided by {es}, you can 
+use *Custom Label* .
+
 A popularity counter keeps track of the fields you use most often.
 The top five most popular fields and their values are displayed in <<discover,*Discover*>>.
 
-To edit the field format and popularity counter, click the edit icon
+To edit the field display, click the edit icon
 (image:management/index-patterns/images/edit_icon.png[]) in the index pattern detail view.
 
 [role="screenshot"]

docs/management/managing-fields.asciidoc

@@ -18,6 +18,7 @@ To format a field:
 . Open the main menu, and click *Stack Management > Index Patterns*.
 . Click the index pattern that contains the field you want to format.
 . Find the field you want to format and click the edit icon (image:management/index-patterns/images/edit_icon.png[]).
+. Enter a custom label for the field, if needed.
 . Select a format and fill in the details.
 +
 [role="screenshot"]

src/core/server/ui_settings/integration_tests/routes.test.ts

@@ -9,7 +9,8 @@
 import { schema } from '@kbn/config-schema';
 import * as kbnTestServer from '../../../test_helpers/kbn_server';
 
-describe('ui settings service', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/89191
+describe.skip('ui settings service', () => {
   describe('routes', () => {
     let root: ReturnType<typeof kbnTestServer.createRoot>;
     beforeAll(async () => {

src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.ts

@@ -13,14 +13,24 @@ import { IKibanaResponse, KibanaResponseFactory } from 'kibana/server';
 interface EsErrorHandlerParams {
   error: ApiError;
   response: KibanaResponseFactory;
+  handleCustomError?: () => IKibanaResponse<any>;
 }
 
 /*
  * For errors returned by the new elasticsearch js client.
  */
-export const handleEsError = ({ error, response }: EsErrorHandlerParams): IKibanaResponse => {
+export const handleEsError = ({
+  error,
+  response,
+  handleCustomError,
+}: EsErrorHandlerParams): IKibanaResponse => {
   // error.name is slightly better in terms of performance, since all errors now have name property
   if (error.name === 'ResponseError') {
+    // The consumer may sometimes want to provide a custom response
+    if (typeof handleCustomError === 'function') {
+      return handleCustomError();
+    }
+
     const { statusCode, body } = error as ResponseError;
     return response.customError({
       statusCode,

src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx

@@ -29,8 +29,6 @@ beforeEach(() => {
         name: 'test',
         title: 'test',
         visualization: null,
-        requestHandler: 'test',
-        responseHandler: 'test',
         stage: 'beta',
         requiresSearch: false,
         hidden: false,

src/plugins/input_control_vis/public/components/editor/controls_tab.tsx

@@ -19,7 +19,7 @@ import {
   EuiSelect,
 } from '@elastic/eui';
 
-import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
+import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
 import { IIndexPattern } from 'src/plugins/data/public';
 import { ControlEditor } from './control_editor';
 import {
@@ -40,7 +40,7 @@ interface ControlsTabUiState {
   type: CONTROL_TYPES;
 }
 
-export type ControlsTabProps = VisOptionsProps<InputControlVisParams> & {
+export type ControlsTabProps = VisEditorOptionsProps<InputControlVisParams> & {
   deps: InputControlVisDependencies;
 };
 

src/plugins/input_control_vis/public/components/editor/index.tsx

@@ -7,17 +7,17 @@
  */
 
 import React, { lazy } from 'react';
-import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
+import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
 import { InputControlVisDependencies } from '../../plugin';
 import { InputControlVisParams } from '../../types';
 
 const ControlsTab = lazy(() => import('./controls_tab'));
 const OptionsTab = lazy(() => import('./options_tab'));
 
 export const getControlsTab = (deps: InputControlVisDependencies) => (
-  props: VisOptionsProps<InputControlVisParams>
+  props: VisEditorOptionsProps<InputControlVisParams>
 ) => <ControlsTab {...props} deps={deps} />;
 
-export const OptionsTabLazy = (props: VisOptionsProps<InputControlVisParams>) => (
+export const OptionsTabLazy = (props: VisEditorOptionsProps<InputControlVisParams>) => (
   <OptionsTab {...props} />
 );

src/plugins/input_control_vis/public/components/editor/options_tab.tsx

@@ -12,10 +12,10 @@ import { EuiForm, EuiFormRow, EuiSwitch } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiSwitchEvent } from '@elastic/eui';
 
-import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
+import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
 import { InputControlVisParams } from '../../types';
 
-export type OptionsTabProps = VisOptionsProps<InputControlVisParams>;
+export type OptionsTabProps = VisEditorOptionsProps<InputControlVisParams>;
 
 class OptionsTab extends PureComponent<OptionsTabProps> {
   handleUpdateFiltersChange = (event: EuiSwitchEvent) => {

src/plugins/input_control_vis/public/input_control_vis_type.ts

@@ -7,15 +7,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { VisGroups, BaseVisTypeOptions } from '../../visualizations/public';
+import { VisGroups, VisTypeDefinition } from '../../visualizations/public';
 import { getControlsTab, OptionsTabLazy } from './components/editor';
 import { InputControlVisDependencies } from './plugin';
 import { toExpressionAst } from './to_ast';
 import { InputControlVisParams } from './types';
 
 export function createInputControlVisTypeDefinition(
   deps: InputControlVisDependencies
-): BaseVisTypeOptions<InputControlVisParams> {
+): VisTypeDefinition<InputControlVisParams> {
   const ControlsTab = getControlsTab(deps);
 
   return {
@@ -56,7 +56,6 @@ export function createInputControlVisTypeDefinition(
       ],
     },
     inspectorAdapters: {},
-    requestHandler: 'none',
     toExpressionAst,
   };
 }

src/plugins/kibana_react/public/index.ts

@@ -15,6 +15,7 @@ export * from './ui_settings';
 export * from './field_icon';
 export * from './field_button';
 export * from './table_list_view';
+export * from './toolbar_button';
 export * from './split_panel';
 export * from './react_router_navigate';
 export { ValidatedDualRange, Value } from './validated_range';