Merge branch 'master' into feature/host-isolation-exception-artifact-generation

Author: kibanamachine

docs/settings/spaces-settings.asciidoc

@@ -7,11 +7,6 @@
 
 By default, spaces is enabled in {kib}. To secure spaces, <<security-settings-kb,enable security>>.
 
-`xpack.spaces.enabled`::
-deprecated:[7.16.0,"In 8.0 and later, this setting will no longer be supported and it will not be possible to disable this plugin."]
-To enable spaces, set to `true`. 
-The default is `true`.
-
 `xpack.spaces.maxSpaces`::
 The maximum number of spaces that you can use with the {kib} instance. Some {kib} operations
 return all spaces using a single `_search` from {es}, so you must

docs/spaces/index.asciidoc

@@ -109,11 +109,6 @@ image::images/spaces-configure-landing-page.png["Configure space-level landing p
 
 [float]
 [[spaces-delete-started]]
-=== Disable and version updates
-
-Spaces are automatically enabled in {kib}. If you don't want use this feature,
-you can disable it. For more information, refer to <<spaces-settings-kb,Spaces settings in {kib}>>.
-
-When you upgrade {kib}, the default space contains all of your existing saved objects.
-
+=== Disabling spaces
 
+Starting in {kib} 8.0, the Spaces feature cannot be disabled.

src/core/server/elasticsearch/elasticsearch_config.test.ts

@@ -322,7 +322,7 @@ describe('deprecations', () => {
     const { messages } = applyElasticsearchDeprecations({ username: 'elastic' });
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Setting [${CONFIG_PATH}.username] to \\"elastic\\" is deprecated. You should use the \\"kibana_system\\" user instead.",
+        "Kibana is configured to authenticate to Elasticsearch with the \\"elastic\\" user. Use a service account token instead.",
       ]
     `);
   });
@@ -331,7 +331,7 @@ describe('deprecations', () => {
     const { messages } = applyElasticsearchDeprecations({ username: 'kibana' });
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Setting [${CONFIG_PATH}.username] to \\"kibana\\" is deprecated. You should use the \\"kibana_system\\" user instead.",
+        "Kibana is configured to authenticate to Elasticsearch with the \\"kibana\\" user. Use a service account token instead.",
       ]
     `);
   });
@@ -350,7 +350,7 @@ describe('deprecations', () => {
     const { messages } = applyElasticsearchDeprecations({ ssl: { key: '' } });
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Setting [${CONFIG_PATH}.ssl.key] without [${CONFIG_PATH}.ssl.certificate] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.",
+        "Use both \\"elasticsearch.ssl.key\\" and \\"elasticsearch.ssl.certificate\\" to enable Kibana to use Mutual TLS authentication with Elasticsearch.",
       ]
     `);
   });
@@ -359,7 +359,7 @@ describe('deprecations', () => {
     const { messages } = applyElasticsearchDeprecations({ ssl: { certificate: '' } });
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Setting [${CONFIG_PATH}.ssl.certificate] without [${CONFIG_PATH}.ssl.key] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.",
+        "Use both \\"elasticsearch.ssl.certificate\\" and \\"elasticsearch.ssl.key\\" to enable Kibana to use Mutual TLS authentication with Elasticsearch.",
       ]
     `);
   });

src/core/server/elasticsearch/elasticsearch_config.ts

@@ -8,6 +8,7 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 import { readPkcs12Keystore, readPkcs12Truststore } from '@kbn/crypto';
+import { i18n } from '@kbn/i18n';
 import { Duration } from 'moment';
 import { readFileSync } from 'fs';
 import { ConfigDeprecationProvider } from 'src/core/server';
@@ -171,49 +172,82 @@ export const configSchema = schema.object({
 });
 
 const deprecations: ConfigDeprecationProvider = () => [
-  (settings, fromPath, addDeprecation) => {
+  (settings, fromPath, addDeprecation, { branch }) => {
     const es = settings[fromPath];
     if (!es) {
       return;
     }
-    if (es.username === 'elastic') {
-      addDeprecation({
-        configPath: `${fromPath}.username`,
-        message: `Setting [${fromPath}.username] to "elastic" is deprecated. You should use the "kibana_system" user instead.`,
-        correctiveActions: {
-          manualSteps: [`Replace [${fromPath}.username] from "elastic" to "kibana_system".`],
-        },
-      });
-    } else if (es.username === 'kibana') {
+
+    if (es.username === 'elastic' || es.username === 'kibana') {
+      const username = es.username;
       addDeprecation({
         configPath: `${fromPath}.username`,
-        message: `Setting [${fromPath}.username] to "kibana" is deprecated. You should use the "kibana_system" user instead.`,
-        correctiveActions: {
-          manualSteps: [`Replace [${fromPath}.username] from "kibana" to "kibana_system".`],
-        },
-      });
-    }
-    if (es.ssl?.key !== undefined && es.ssl?.certificate === undefined) {
-      addDeprecation({
-        configPath: `${fromPath}.ssl.key`,
-        message: `Setting [${fromPath}.ssl.key] without [${fromPath}.ssl.certificate] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
+        title: i18n.translate('core.deprecations.elasticsearchUsername.title', {
+          defaultMessage: 'Using "elasticsearch.username: {username}" is deprecated',
+          values: { username },
+        }),
+        message: i18n.translate('core.deprecations.elasticsearchUsername.message', {
+          defaultMessage:
+            'Kibana is configured to authenticate to Elasticsearch with the "{username}" user. Use a service account token instead.',
+          values: { username },
+        }),
+        level: 'warning',
+        documentationUrl: `https://www.elastic.co/guide/en/elasticsearch/reference/${branch}/service-accounts.html`,
         correctiveActions: {
           manualSteps: [
-            `Set [${fromPath}.ssl.certificate] in your kibana configs to enable TLS client authentication to Elasticsearch.`,
+            i18n.translate('core.deprecations.elasticsearchUsername.manualSteps1', {
+              defaultMessage:
+                'Use the elasticsearch-service-tokens CLI tool to create a new service account token for the "elastic/kibana" service account.',
+            }),
+            i18n.translate('core.deprecations.elasticsearchUsername.manualSteps2', {
+              defaultMessage: 'Add the "elasticsearch.serviceAccountToken" setting to kibana.yml.',
+            }),
+            i18n.translate('core.deprecations.elasticsearchUsername.manualSteps3', {
+              defaultMessage:
+                'Remove "elasticsearch.username" and "elasticsearch.password" from kibana.yml.',
+            }),
           ],
         },
       });
-    } else if (es.ssl?.certificate !== undefined && es.ssl?.key === undefined) {
+    }
+
+    const addSslDeprecation = (existingSetting: string, missingSetting: string) => {
       addDeprecation({
-        configPath: `${fromPath}.ssl.certificate`,
-        message: `Setting [${fromPath}.ssl.certificate] without [${fromPath}.ssl.key] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
+        configPath: existingSetting,
+        title: i18n.translate('core.deprecations.elasticsearchSSL.title', {
+          defaultMessage: 'Using "{existingSetting}" without "{missingSetting}" has no effect',
+          values: { existingSetting, missingSetting },
+        }),
+        message: i18n.translate('core.deprecations.elasticsearchSSL.message', {
+          defaultMessage:
+            'Use both "{existingSetting}" and "{missingSetting}" to enable Kibana to use Mutual TLS authentication with Elasticsearch.',
+          values: { existingSetting, missingSetting },
+        }),
+        level: 'warning',
+        documentationUrl: `https://www.elastic.co/guide/en/kibana/${branch}/elasticsearch-mutual-tls.html`,
         correctiveActions: {
           manualSteps: [
-            `Set [${fromPath}.ssl.key] in your kibana configs to enable TLS client authentication to Elasticsearch.`,
+            i18n.translate('core.deprecations.elasticsearchSSL.manualSteps1', {
+              defaultMessage: 'Add the "{missingSetting}" setting to kibana.yml.',
+              values: { missingSetting },
+            }),
+            i18n.translate('core.deprecations.elasticsearchSSL.manualSteps2', {
+              defaultMessage:
+                'Alternatively, if you don\'t want to use Mutual TLS authentication, remove "{existingSetting}" from kibana.yml.',
+              values: { existingSetting },
+            }),
           ],
         },
       });
-    } else if (es.logQueries === true) {
+    };
+
+    if (es.ssl?.key !== undefined && es.ssl?.certificate === undefined) {
+      addSslDeprecation(`${fromPath}.ssl.key`, `${fromPath}.ssl.certificate`);
+    } else if (es.ssl?.certificate !== undefined && es.ssl?.key === undefined) {
+      addSslDeprecation(`${fromPath}.ssl.certificate`, `${fromPath}.ssl.key`);
+    }
+
+    if (es.logQueries === true) {
       addDeprecation({
         configPath: `${fromPath}.logQueries`,
         message: `Setting [${fromPath}.logQueries] is deprecated and no longer used. You should set the log level to "debug" for the "elasticsearch.queries" context in "logging.loggers".`,

src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker

@@ -366,7 +366,6 @@ kibana_vars=(
     xpack.securitySolution.packagerTaskInterval
     xpack.securitySolution.prebuiltRulesFromFileSystem
     xpack.securitySolution.prebuiltRulesFromSavedObjects
-    xpack.spaces.enabled
     xpack.spaces.maxSpaces
     xpack.task_manager.index
     xpack.task_manager.max_attempts

src/plugins/inspector/public/views/requests/components/request_selector.tsx

@@ -13,142 +13,82 @@ import { i18n } from '@kbn/i18n';
 
 import {
   EuiBadge,
-  EuiButtonEmpty,
-  EuiContextMenuPanel,
-  EuiContextMenuItem,
+  EuiComboBox,
+  EuiComboBoxOptionOption,
   EuiFlexGroup,
   EuiFlexItem,
   EuiLoadingSpinner,
-  EuiPopover,
-  EuiTextColor,
   EuiToolTip,
 } from '@elastic/eui';
 
 import { RequestStatus } from '../../../../common/adapters';
 import { Request } from '../../../../common/adapters/request/types';
 
-interface RequestSelectorState {
-  isPopoverOpen: boolean;
-}
-
 interface RequestSelectorProps {
   requests: Request[];
   selectedRequest: Request;
-  onRequestChanged: Function;
+  onRequestChanged: (request: Request) => void;
 }
 
-export class RequestSelector extends Component<RequestSelectorProps, RequestSelectorState> {
+export class RequestSelector extends Component<RequestSelectorProps> {
   static propTypes = {
     requests: PropTypes.array.isRequired,
     selectedRequest: PropTypes.object.isRequired,
     onRequestChanged: PropTypes.func,
   };
 
-  state = {
-    isPopoverOpen: false,
-  };
+  handleSelected = (selectedOptions: Array<EuiComboBoxOptionOption<string>>) => {
+    const selectedOption = this.props.requests.find(
+      (request) => request.id === selectedOptions[0].value
+    );
 
-  togglePopover = () => {
-    this.setState((prevState: RequestSelectorState) => ({
-      isPopoverOpen: !prevState.isPopoverOpen,
-    }));
+    if (selectedOption) {
+      this.props.onRequestChanged(selectedOption);
+    }
   };
 
-  closePopover = () => {
-    this.setState({
-      isPopoverOpen: false,
+  renderRequestCombobox() {
+    const options = this.props.requests.map((item) => {
+      const hasFailed = item.status === RequestStatus.ERROR;
+      const testLabel = item.name.replace(/\s+/, '_');
+
+      return {
+        'data-test-subj': `inspectorRequestChooser${testLabel}`,
+        label: hasFailed
+          ? `${item.name} ${i18n.translate('inspector.requests.failedLabel', {
+              defaultMessage: ' (failed)',
+            })}`
+          : item.name,
+        value: item.id,
+      };
     });
-  };
-
-  renderRequestDropdownItem = (request: Request, index: number) => {
-    const hasFailed = request.status === RequestStatus.ERROR;
-    const inProgress = request.status === RequestStatus.PENDING;
 
     return (
-      <EuiContextMenuItem
-        key={index}
-        icon={request === this.props.selectedRequest ? 'check' : 'empty'}
-        onClick={() => {
-          this.props.onRequestChanged(request);
-          this.closePopover();
-        }}
-        toolTipContent={request.description}
-        toolTipPosition="left"
-        data-test-subj={`inspectorRequestChooser${request.name}`}
-      >
-        <EuiTextColor color={hasFailed ? 'danger' : 'default'}>
-          {request.name}
-
-          {hasFailed && (
-            <FormattedMessage id="inspector.requests.failedLabel" defaultMessage=" (failed)" />
-          )}
-
-          {inProgress && (
-            <EuiLoadingSpinner
-              size="s"
-              aria-label={i18n.translate('inspector.requests.requestInProgressAriaLabel', {
-                defaultMessage: 'Request in progress',
-              })}
-              className="insRequestSelector__menuSpinner"
-            />
-          )}
-        </EuiTextColor>
-      </EuiContextMenuItem>
-    );
-  };
-
-  renderRequestDropdown() {
-    const button = (
-      <EuiButtonEmpty
-        iconType="arrowDown"
-        iconSide="right"
-        size="s"
-        onClick={this.togglePopover}
+      <EuiComboBox
         data-test-subj="inspectorRequestChooser"
-      >
-        {this.props.selectedRequest.name}
-      </EuiButtonEmpty>
-    );
-
-    return (
-      <EuiPopover
+        fullWidth={true}
         id="inspectorRequestChooser"
-        button={button}
-        isOpen={this.state.isPopoverOpen}
-        closePopover={this.closePopover}
-        panelPaddingSize="none"
-        anchorPosition="downLeft"
-        repositionOnScroll
-      >
-        <EuiContextMenuPanel
-          items={this.props.requests.map(this.renderRequestDropdownItem)}
-          data-test-subj="inspectorRequestChooserMenuPanel"
-        />
-      </EuiPopover>
+        isClearable={false}
+        onChange={this.handleSelected}
+        options={options}
+        prepend="Request"
+        selectedOptions={[
+          {
+            label: this.props.selectedRequest.name,
+            value: this.props.selectedRequest.id,
+          },
+        ]}
+        singleSelection={{ asPlainText: true }}
+      />
     );
   }
 
   render() {
     const { selectedRequest, requests } = this.props;
 
     return (
-      <EuiFlexGroup alignItems="center" gutterSize="xs">
-        <EuiFlexItem grow={false}>
-          <strong>
-            <FormattedMessage id="inspector.requests.requestLabel" defaultMessage="Request:" />
-          </strong>
-        </EuiFlexItem>
-        <EuiFlexItem grow={true}>
-          {requests.length <= 1 && (
-            <div
-              className="insRequestSelector__singleRequest"
-              data-test-subj="inspectorRequestName"
-            >
-              {selectedRequest.name}
-            </div>
-          )}
-          {requests.length > 1 && this.renderRequestDropdown()}
-        </EuiFlexItem>
+      <EuiFlexGroup alignItems="center">
+        <EuiFlexItem grow={true}>{requests.length && this.renderRequestCombobox()}</EuiFlexItem>
         <EuiFlexItem grow={false}>
           {selectedRequest.status !== RequestStatus.PENDING && (
             <EuiToolTip

src/plugins/vis_types/table/common/types.ts

@@ -24,5 +24,6 @@ export interface TableVisParams {
   showTotal: boolean;
   totalFunc: AggTypes;
   percentageCol: string;
+  autoFitRowToContent?: boolean;
   row?: boolean;
 }