Merge branch 'main' of github.com:elastic/kibana into config-schema-a…

…s-server-only
elastic · Aug 29, 2024 · 0e21ee6 · 0e21ee6
2 parents 45d3b57 + 2853279
commit 0e21ee6
Show file tree

Hide file tree

Showing 93 changed files with 1,788 additions and 202 deletions.
diff --git a/docs/api/dashboard-api.asciidoc b/docs/api/dashboard-api.asciidoc
@@ -1,7 +1,7 @@
 [[dashboard-api]]
 == Import and export dashboard APIs
 
-deprecated::[7.15.0,Both of these APIs have been deprecated in favor of the {api-kibana}/group/endpoint-saved-objects[saved objects API].]
+deprecated::[7.15.0,Both of these APIs have been deprecated and will be removed in 9.0.0]
 
 Import and export dashboards with the corresponding saved objects, such as visualizations, saved
 searches, and data views.
@@ -16,4 +16,4 @@ The following import and export dashboard APIs are available:
 * <<dashboard-api-export, Export dashboard API>> to export dashboards and corresponding saved objects
 
 include::dashboard/import-dashboard.asciidoc[]
-include::dashboard/export-dashboard.asciidoc[]
+include::dashboard/export-dashboard.asciidoc[]
diff --git a/docs/api/data-views.asciidoc b/docs/api/data-views.asciidoc
@@ -8,5 +8,3 @@ For the latest details, refer to {api-kibana}/group/endpoint-data-views[data vie
 WARNING: Do not write documents directly to the `.kibana` index. When you write directly
 to the `.kibana` index, the data becomes corrupted and permanently breaks future {kib} versions.
 
-WARNING: Use the data views APIs for managing data views instead of lower-level <<saved-objects-api, saved objects API>>.
-
diff --git a/docs/api/osquery-manager.asciidoc b/docs/api/osquery-manager.asciidoc
@@ -3,7 +3,7 @@
 
 experimental[] Run live queries, manage packs and saved queries
 
-WARNING: Use the osquery manager APIs for managing packs and saved queries instead of lower-level <<saved-objects-api, saved objects API>>.
+Use the osquery manager APIs for managing packs and saved queries.
 
 The following osquery manager APIs are available: 
 

diff --git a/docs/api/saved-objects.asciidoc b/docs/api/saved-objects.asciidoc
@@ -1,9 +1,4 @@
 [[saved-objects-api]]
 == Saved objects APIs
 
-Manage {kib} saved objects, including dashboards, visualizations, and more.
-
-For the latest details, refer to the {api-kibana}/group/endpoint-saved-objects[saved object API].
-
-WARNING: Do not write documents directly to the `.kibana` index. When you write directly
-to the `.kibana` index, the data becomes corrupted and permanently breaks future {kib} versions.
+For the latest details, refer to the {api-kibana}/group/endpoint-saved-objects[saved objects API].
diff --git a/docs/api/short-urls.asciidoc b/docs/api/short-urls.asciidoc
@@ -1,7 +1,14 @@
 [[short-urls-api]]
 == Short URLs APIs
 
-Manage {kib} short URLs.
+experimental[] Manage {kib} short URLs.
+
+The following short urls APIs are available:
+
+* <<short-urls-api-create, Create short URL API>>
+* <<short-urls-api-get, Get short URL API>>
+* <<short-urls-api-delete, Delete short URL API>>
+* <<short-urls-api-resolve, Resolve short URL API>>
 
 include::short-urls/create-short-url.asciidoc[]
 include::short-urls/get-short-url.asciidoc[]

diff --git a/oas_docs/output/kibana.serverless.yaml b/oas_docs/output/kibana.serverless.yaml
@@ -19031,10 +19031,25 @@ tags:
   - name: Fleet uninstall tokens
   - description: Machine learning
     name: ml
-  - description: >-
-      Manage Kibana saved objects, including dashboards, visualizations, and
-      more.
+  - description: >
+      Export sets of saved objects that you want to import into {kib}, resolve
+      import errors, and rotate an encryption key for encrypted saved objects
+      with the saved objects APIs.
+
+
+      To manage a specific type of saved object, use the corresponding APIs.
+
+      For example, use:
+
+
+      [Data views](../group/endpoint-data-views)
+
+
+      Warning: Do not write documents directly to the `.kibana` index. When you
+      write directly to the `.kibana` index, the data becomes corrupted and
+      permanently breaks future Kibana versions.
     name: saved objects
+    x-displayName: Saved objects
   - description: 'SLO APIs enable you to define, manage and track service-level objectives'
     name: slo
   - name: system
diff --git a/oas_docs/output/kibana.yaml b/oas_docs/output/kibana.yaml
@@ -27592,10 +27592,30 @@ tags:
   - name: Fleet uninstall tokens
   - description: Machine learning
     name: ml
-  - description: >-
-      Manage Kibana saved objects, including dashboards, visualizations, and
-      more.
+  - description: >
+      Export sets of saved objects that you want to import into {kib}, resolve
+      import errors, and rotate an encryption key for encrypted saved objects
+      with the saved objects APIs.
+
+
+      To manage a specific type of saved object, use the corresponding APIs.
+
+      For example, use:
+
+
+      * [Data views](../group/endpoint-data-views)
+
+      * [Spaces](https://www.elastic.co/guide/en/kibana/current/spaces-api.html)
+
+      * [Short
+      URLs](https://www.elastic.co/guide/en/kibana/current/short-urls-api.html)
+
+
+      Warning: Do not write documents directly to the `.kibana` index. When you
+      write directly to the `.kibana` index, the data becomes corrupted and
+      permanently breaks future Kibana versions.
     name: saved objects
+    x-displayName: Saved objects
   - description: 'SLO APIs enable you to define, manage and track service-level objectives'
     name: slo
   - name: system
diff --git a/oas_docs/overlays/kibana.overlays.serverless.yaml b/oas_docs/overlays/kibana.overlays.serverless.yaml
@@ -50,10 +50,6 @@ actions:
     description: Change displayName
     update:
       x-displayName: "Machine learning"
-  - target: '$.tags[?(@.name=="saved objects")]'
-    description: Change displayName
-    update:
-      x-displayName: "Saved objects"
   - target: '$.tags[?(@.name=="slo")]'
     description: Change displayName
     update:

diff --git a/oas_docs/overlays/kibana.overlays.yaml b/oas_docs/overlays/kibana.overlays.yaml
@@ -65,10 +65,6 @@ actions:
     description: Change displayName
     update:
       x-displayName: "Machine learning"
-  - target: '$.tags[?(@.name=="saved objects")]'
-    description: Change displayName
-    update:
-      x-displayName: "Saved objects"
   - target: '$.tags[?(@.name=="slo")]'
     description: Change displayName
     update:

diff --git a/package.json b/package.json
@@ -1651,7 +1651,7 @@
     "buildkite-test-collector": "^1.7.0",
     "callsites": "^3.1.0",
     "chance": "1.0.18",
-    "chromedriver": "^127.0.3",
+    "chromedriver": "^128.0.0",
     "clean-webpack-plugin": "^3.0.0",
     "cli-progress": "^3.12.0",
     "cli-table3": "^0.6.1",

diff --git a/packages/core/saved-objects/docs/openapi/bundled.json b/packages/core/saved-objects/docs/openapi/bundled.json
@@ -20,7 +20,8 @@
   "tags": [
     {
       "name": "saved objects",
-      "description": "Manage Kibana saved objects, including dashboards, visualizations, and more."
+      "x-displayName": "Saved objects",
+      "description": "Export sets of saved objects that you want to import into {kib}, resolve import errors, and rotate an encryption key for encrypted saved objects with the saved objects APIs.\n\nTo manage a specific type of saved object, use the corresponding APIs.\nFor example, use:\n\n* [Data views](../group/endpoint-data-views)\n* [Spaces](https://www.elastic.co/guide/en/kibana/current/spaces-api.html)\n* [Short URLs](https://www.elastic.co/guide/en/kibana/current/short-urls-api.html)\n\nWarning: Do not write documents directly to the `.kibana` index. When you write directly to the `.kibana` index, the data becomes corrupted and permanently breaks future Kibana versions.\n"
     }
   ],
   "paths": {

diff --git a/packages/core/saved-objects/docs/openapi/bundled.yaml b/packages/core/saved-objects/docs/openapi/bundled.yaml
@@ -12,7 +12,18 @@ servers:
   - url: /
 tags:
   - name: saved objects
-    description: Manage Kibana saved objects, including dashboards, visualizations, and more.
+    x-displayName: Saved objects
+    description: |
+      Export sets of saved objects that you want to import into {kib}, resolve import errors, and rotate an encryption key for encrypted saved objects with the saved objects APIs.
+
+      To manage a specific type of saved object, use the corresponding APIs.
+      For example, use:
+
+      * [Data views](../group/endpoint-data-views)
+      * [Spaces](https://www.elastic.co/guide/en/kibana/current/spaces-api.html)
+      * [Short URLs](https://www.elastic.co/guide/en/kibana/current/short-urls-api.html)
+
+      Warning: Do not write documents directly to the `.kibana` index. When you write directly to the `.kibana` index, the data becomes corrupted and permanently breaks future Kibana versions.
 paths:
   /api/encrypted_saved_objects/_rotate_key:
     post:

diff --git a/packages/core/saved-objects/docs/openapi/bundled_serverless.json b/packages/core/saved-objects/docs/openapi/bundled_serverless.json
@@ -25,7 +25,8 @@
   "tags": [
     {
       "name": "saved objects",
-      "description": "Manage Kibana saved objects, including dashboards, visualizations, and more."
+      "x-displayName": "Saved objects",
+      "description": "Export sets of saved objects that you want to import into {kib}, resolve import errors, and rotate an encryption key for encrypted saved objects with the saved objects APIs.\n\nTo manage a specific type of saved object, use the corresponding APIs.\nFor example, use:\n\n[Data views](../group/endpoint-data-views)\n\nWarning: Do not write documents directly to the `.kibana` index. When you write directly to the `.kibana` index, the data becomes corrupted and permanently breaks future Kibana versions.\n"
     }
   ],
   "paths": {

diff --git a/packages/core/saved-objects/docs/openapi/bundled_serverless.yaml b/packages/core/saved-objects/docs/openapi/bundled_serverless.yaml
@@ -15,7 +15,16 @@ servers:
         default: localhost:5601
 tags:
   - name: saved objects
-    description: Manage Kibana saved objects, including dashboards, visualizations, and more.
+    x-displayName: Saved objects
+    description: |
+      Export sets of saved objects that you want to import into {kib}, resolve import errors, and rotate an encryption key for encrypted saved objects with the saved objects APIs.
+
+      To manage a specific type of saved object, use the corresponding APIs.
+      For example, use:
+
+      [Data views](../group/endpoint-data-views)
+
+      Warning: Do not write documents directly to the `.kibana` index. When you write directly to the `.kibana` index, the data becomes corrupted and permanently breaks future Kibana versions.
 paths:
   /api/saved_objects/_export:
     post:

diff --git a/packages/core/saved-objects/docs/openapi/entrypoint.yaml b/packages/core/saved-objects/docs/openapi/entrypoint.yaml
@@ -10,7 +10,18 @@ info:
     url: https://www.elastic.co/licensing/elastic-license
 tags:
   - name: saved objects
-    description: Manage Kibana saved objects, including dashboards, visualizations, and more.
+    x-displayName: Saved objects
+    description: |
+      Export sets of saved objects that you want to import into {kib}, resolve import errors, and rotate an encryption key for encrypted saved objects with the saved objects APIs.
+      
+      To manage a specific type of saved object, use the corresponding APIs.
+      For example, use:
+
+      * [Data views](../group/endpoint-data-views)
+      * [Spaces](https://www.elastic.co/guide/en/kibana/current/spaces-api.html)
+      * [Short URLs](https://www.elastic.co/guide/en/kibana/current/short-urls-api.html)
+
+      Warning: Do not write documents directly to the `.kibana` index. When you write directly to the `.kibana` index, the data becomes corrupted and permanently breaks future Kibana versions.
 servers:
   - url: /
 paths:

diff --git a/packages/core/saved-objects/docs/openapi/entrypoint_serverless.yaml b/packages/core/saved-objects/docs/openapi/entrypoint_serverless.yaml
@@ -10,7 +10,16 @@ info:
     url: https://www.elastic.co/licensing/elastic-license
 tags:
   - name: saved objects
-    description: Manage Kibana saved objects, including dashboards, visualizations, and more.
+    x-displayName: Saved objects
+    description: |
+      Export sets of saved objects that you want to import into {kib}, resolve import errors, and rotate an encryption key for encrypted saved objects with the saved objects APIs.
+      
+      To manage a specific type of saved object, use the corresponding APIs.
+      For example, use:
+
+      [Data views](../group/endpoint-data-views)
+
+      Warning: Do not write documents directly to the `.kibana` index. When you write directly to the `.kibana` index, the data becomes corrupted and permanently breaks future Kibana versions.
 servers:
   - url: 'https://{kibana_url}'
     variables:

diff --git a/src/plugins/embeddable/public/add_panel_flyout/add_panel_flyout.tsx b/src/plugins/embeddable/public/add_panel_flyout/add_panel_flyout.tsx
@@ -82,9 +82,11 @@ const runAddTelemetry = (
 export const AddPanelFlyout = ({
   container,
   onAddPanel,
+  modalTitleId,
 }: {
   container: PresentationContainer;
   onAddPanel?: (id: string) => void;
+  modalTitleId?: string;
 }) => {
   const legacyFactoriesBySavedObjectType: LegacyFactoryMap = useMemo(() => {
     return [...embeddableStart.getEmbeddableFactories()]
@@ -187,7 +189,7 @@ export const AddPanelFlyout = ({
     <>
       <EuiFlyoutHeader hasBorder>
         <EuiTitle size="m">
-          <h2>
+          <h2 id={modalTitleId}>
             {i18n.translate('embeddableApi.addPanel.Title', { defaultMessage: 'Add from library' })}
           </h2>
         </EuiTitle>

diff --git a/src/plugins/embeddable/public/add_panel_flyout/open_add_panel_flyout.tsx b/src/plugins/embeddable/public/add_panel_flyout/open_add_panel_flyout.tsx
@@ -9,7 +9,7 @@
 import React, { Suspense } from 'react';
 
 import { OverlayRef } from '@kbn/core/public';
-import { EuiLoadingSpinner } from '@elastic/eui';
+import { EuiLoadingSpinner, htmlIdGenerator } from '@elastic/eui';
 import { toMountPoint } from '@kbn/react-kibana-mount';
 
 import { PresentationContainer } from '@kbn/presentation-containers';
@@ -20,6 +20,8 @@ const LazyAddPanelFlyout = React.lazy(async () => {
   return { default: module.AddPanelFlyout };
 });
 
+const htmlId = htmlIdGenerator('modalTitleId');
+
 export const openAddPanelFlyout = ({
   container,
   onAddPanel,
@@ -29,21 +31,28 @@ export const openAddPanelFlyout = ({
   onAddPanel?: (id: string) => void;
   onClose?: () => void;
 }): OverlayRef => {
+  const modalTitleId = htmlId();
+
   // send the overlay ref to the root embeddable if it is capable of tracking overlays
   const flyoutSession = core.overlays.openFlyout(
     toMountPoint(
       <Suspense fallback={<EuiLoadingSpinner />}>
-        <LazyAddPanelFlyout container={container} onAddPanel={onAddPanel} />
+        <LazyAddPanelFlyout
+          container={container}
+          onAddPanel={onAddPanel}
+          modalTitleId={modalTitleId}
+        />
       </Suspense>,
       core
     ),
     {
-      'data-test-subj': 'dashboardAddPanel',
       ownFocus: true,
       onClose: (overlayRef) => {
         if (onClose) onClose();
         overlayRef.close();
       },
+      'data-test-subj': 'dashboardAddPanel',
+      'aria-labelledby': modalTitleId,
     }
   );
 

diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_body/empty_convo.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_body/empty_convo.tsx
@@ -38,7 +38,7 @@ export const EmptyConvo: React.FC<Props> = ({
   setIsSettingsModalVisible,
 }) => {
   return (
-    <EuiFlexGroup alignItems="center" justifyContent="center">
+    <EuiFlexGroup alignItems="center" justifyContent="center" data-test-subj="emptyConvo">
       <EuiFlexItem grow={false}>
         <EuiPanel
           hasShadow={false}

diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_body/welcome_setup.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_body/welcome_setup.tsx
@@ -31,7 +31,12 @@ export const WelcomeSetup: React.FC<Props> = ({
             text-align: center;
           `}
         >
-          <EuiFlexGroup alignItems="center" justifyContent="center" direction="column">
+          <EuiFlexGroup
+            alignItems="center"
+            justifyContent="center"
+            direction="column"
+            data-test-subj="welcome-setup"
+          >
             <EuiFlexItem grow={false}>
               <AssistantAnimatedIcon />
             </EuiFlexItem>

diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/flyout_navigation.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/flyout_navigation.tsx
@@ -106,6 +106,7 @@ export const FlyoutNavigation = memo<FlyoutNavigationProps>(
                       size="xs"
                       color="primary"
                       iconType="newChat"
+                      data-test-subj="newChatFromOverlay"
                       onClick={onConversationCreate}
                       disabled={isLoading || !isAssistantEnabled}
                     >

diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_title/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_title/index.tsx
@@ -59,6 +59,7 @@ export const AssistantTitle: React.FC<{
         `}
       >
         <EuiInlineEditTitle
+          data-test-subj="conversationTitle"
           heading="h2"
           inputAriaLabel="Edit text inline"
           value={newTitle ?? NEW_CHAT}

diff --git a/...kages/kbn-elastic-assistant/impl/assistant/conversations/conversation_sidepanel/index.tsx b/...kages/kbn-elastic-assistant/impl/assistant/conversations/conversation_sidepanel/index.tsx
@@ -197,6 +197,7 @@ export const ConversationSidePanel = React.memo<Props>(
                       onConversationSelected({ cId: conversation.id, cTitle: conversation.title })
                     }
                     label={conversation.title}
+                    data-test-subj={`conversation-select-${conversation.title}`}
                     isActive={
                       !isEmpty(conversation.id)
                         ? conversation.id === currentConversation?.id

diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.tsx
@@ -456,7 +456,7 @@ const AssistantComponent: React.FC<Props> = ({
           overflow: hidden;
         `}
       >
-        <CommentContainer>
+        <CommentContainer data-test-subj="assistantChat">
           <EuiFlexGroup
             css={css`
               overflow: hidden;

diff --git a/...ges/kbn-elastic-assistant/impl/assistant/prompt_editor/selected_prompt_contexts/index.tsx b/...ges/kbn-elastic-assistant/impl/assistant/prompt_editor/selected_prompt_contexts/index.tsx
@@ -45,10 +45,13 @@ const SelectedPromptContextsComponent: React.FC<Props> = ({
     <EuiFlexGroup data-test-subj="selectedPromptContexts" direction="column" gutterSize={'s'}>
       {Object.keys(selectedPromptContexts)
         .sort()
-        .map((id) => (
+        .map((id, i) => (
           <EuiFlexItem data-test-subj={`selectedPromptContext-${id}`} grow={false} key={id}>
             <EuiAccordion
               buttonContent={promptContexts[id]?.description}
+              buttonProps={{
+                'data-test-subj': `selectedPromptContext-${i}-button`,
+              }}
               extraAction={
                 <EuiToolTip content={i18n.REMOVE_CONTEXT}>
                   <EuiButtonIcon

diff --git a/...ackages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/helpers.test.tsx b/...ackages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/helpers.test.tsx
@@ -34,7 +34,9 @@ describe('helpers', () => {
 
       render(<TestProviders>{option.dropdownDisplay}</TestProviders>);
 
-      expect(screen.getByTestId('name')).toHaveTextContent(mockSystemPrompt.name);
+      expect(screen.getByTestId(`systemPrompt-${mockSystemPrompt.name}`)).toHaveTextContent(
+        mockSystemPrompt.name
+      );
     });
 
     it('shows the expected prompt content in the dropdownDisplay', () => {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,5 +8,3 @@ For the latest details, refer to {api-kibana}/group/endpoint-data-views[data vie
		WARNING: Do not write documents directly to the `.kibana` index. When you write directly
		to the `.kibana` index, the data becomes corrupted and permanently breaks future {kib} versions.

		WARNING: Use the data views APIs for managing data views instead of lower-level <<saved-objects-api, saved objects API>>.