Merge branch 'main' into eui-v93.0.0

elastic · Feb 8, 2024 · 41709b2 · 41709b2
2 parents c8ce7a2 + ee34012
commit 41709b2
Show file tree

Hide file tree

Showing 73 changed files with 3,814 additions and 517 deletions.
diff --git a/fleet_packages.json b/fleet_packages.json
@@ -56,6 +56,6 @@
   },
   {
     "name": "security_detection_engine",
-    "version": "8.12.3"
+    "version": "8.12.4"
   }
 ]
diff --git a/packages/kbn-search-connectors/types/native_connectors.ts b/packages/kbn-search-connectors/types/native_connectors.ts
@@ -1793,7 +1793,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         type: FieldType.INTEGER,
         ui_restrictions: [],
         validations: [],
-        value: 9090,
+        value: 1433,
       },
       username: {
         default_value: '',
@@ -2681,7 +2681,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         type: FieldType.INTEGER,
         ui_restrictions: [],
         validations: [],
-        value: 9090,
+        value: 5432,
       },
       username: {
         default_value: '',

diff --git a/packages/kbn-text-based-editor/src/editor_footer.tsx b/packages/kbn-text-based-editor/src/editor_footer.tsx
@@ -201,6 +201,7 @@ interface EditorFooterProps {
   editorIsInline?: boolean;
   isSpaceReduced?: boolean;
   isLoading?: boolean;
+  allowQueryCancellation?: boolean;
 }
 
 export const EditorFooter = memo(function EditorFooter({
@@ -216,6 +217,7 @@ export const EditorFooter = memo(function EditorFooter({
   editorIsInline,
   isSpaceReduced,
   isLoading,
+  allowQueryCancellation,
 }: EditorFooterProps) {
   const { euiTheme } = useEuiTheme();
   const [isErrorPopoverOpen, setIsErrorPopoverOpen] = useState(false);
@@ -333,8 +335,8 @@ export const EditorFooter = memo(function EditorFooter({
                   size="s"
                   fill
                   onClick={runQuery}
-                  isLoading={isLoading}
-                  isDisabled={Boolean(disableSubmitAction)}
+                  isLoading={isLoading && !allowQueryCancellation}
+                  isDisabled={Boolean(disableSubmitAction && !allowQueryCancellation)}
                   data-test-subj="TextBasedLangEditor-run-query-button"
                   minWidth={isSpaceReduced ? false : undefined}
                 >
@@ -345,7 +347,11 @@ export const EditorFooter = memo(function EditorFooter({
                     justifyContent="spaceBetween"
                   >
                     <EuiFlexItem grow={false}>
-                      {isSpaceReduced
+                      {allowQueryCancellation && isLoading
+                        ? i18n.translate('textBasedEditor.query.textBasedLanguagesEditor.cancel', {
+                            defaultMessage: 'Cancel',
+                          })
+                        : isSpaceReduced
                         ? i18n.translate('textBasedEditor.query.textBasedLanguagesEditor.run', {
                             defaultMessage: 'Run',
                           })
@@ -361,7 +367,7 @@ export const EditorFooter = memo(function EditorFooter({
                         size="xs"
                         css={css`
                           border: 1px solid
-                            ${Boolean(disableSubmitAction)
+                            ${Boolean(disableSubmitAction && !allowQueryCancellation)
                               ? euiTheme.colors.disabled
                               : euiTheme.colors.emptyShade};
                           padding: 0 ${euiTheme.size.xs};
@@ -370,7 +376,7 @@ export const EditorFooter = memo(function EditorFooter({
                           border-radius: ${euiTheme.size.xs};
                         `}
                       >
-                        {COMMAND_KEY}⏎
+                        {allowQueryCancellation && isLoading ? 'X' : `${COMMAND_KEY}⏎`}
                       </EuiText>
                     </EuiFlexItem>
                   </EuiFlexGroup>

diff --git a/packages/kbn-text-based-editor/src/fetch_fields_from_esql.ts b/packages/kbn-text-based-editor/src/fetch_fields_from_esql.ts
@@ -24,6 +24,7 @@ export function fetchFieldsFromESQL(
   query: Query | AggregateQuery,
   expressions: ExpressionsStart,
   time?: TimeRange,
+  abortController?: AbortController,
   dataView?: DataView
 ) {
   return textBasedQueryStateToAstWithValidation({
@@ -33,7 +34,15 @@ export function fetchFieldsFromESQL(
   })
     .then((ast) => {
       if (ast) {
-        const execution = expressions.run(ast, null);
+        const executionContract = expressions.execute(ast, null);
+
+        if (abortController) {
+          abortController.signal.onabort = () => {
+            executionContract.cancel();
+          };
+        }
+
+        const execution = executionContract.getData();
         let finalData: Datatable;
         let error: string | undefined;
         execution.pipe(pluck('result')).subscribe((resp) => {

diff --git a/packages/kbn-text-based-editor/src/helpers.ts b/packages/kbn-text-based-editor/src/helpers.ts
@@ -116,6 +116,17 @@ export const parseErrors = (errors: Error[], code: string): MonacoMessage[] => {
         endLineNumber: Number(lineNumber),
         severity: monaco.MarkerSeverity.Error,
       };
+    } else if (error.message.includes('expression was aborted')) {
+      return {
+        message: i18n.translate('textBasedEditor.query.textBasedLanguagesEditor.aborted', {
+          defaultMessage: 'Request was aborted',
+        }),
+        startColumn: 1,
+        startLineNumber: 1,
+        endColumn: 10,
+        endLineNumber: 1,
+        severity: monaco.MarkerSeverity.Warning,
+      };
     } else {
       // unknown error message
       return {

diff --git a/packages/kbn-text-based-editor/src/text_based_languages_editor.tsx b/packages/kbn-text-based-editor/src/text_based_languages_editor.tsx
@@ -71,7 +71,10 @@ export interface TextBasedLanguagesEditorProps {
   /** Callback running everytime the query changes */
   onTextLangQueryChange: (query: AggregateQuery) => void;
   /** Callback running when the user submits the query */
-  onTextLangQuerySubmit: (query?: AggregateQuery) => void;
+  onTextLangQuerySubmit: (
+    query?: AggregateQuery,
+    abortController?: AbortController
+  ) => Promise<void>;
   /** Can be used to expand/minimize the editor */
   expandCodeEditor: (status: boolean) => void;
   /** If it is true, the editor initializes with height EDITOR_INITIAL_HEIGHT_EXPANDED */
@@ -105,6 +108,9 @@ export interface TextBasedLanguagesEditorProps {
   editorIsInline?: boolean;
   /** Disables the submit query action*/
   disableSubmitAction?: boolean;
+
+  /** when set to true enables query cancellation **/
+  allowQueryCancellation?: boolean;
 }
 
 interface TextBasedEditorDeps {
@@ -158,6 +164,7 @@ export const TextBasedLanguagesEditor = memo(function TextBasedLanguagesEditor({
   editorIsInline,
   disableSubmitAction,
   dataTestSubj,
+  allowQueryCancellation,
 }: TextBasedLanguagesEditorProps) {
   const { euiTheme } = useEuiTheme();
   const language = getAggregateQueryMode(query);
@@ -176,7 +183,8 @@ export const TextBasedLanguagesEditor = memo(function TextBasedLanguagesEditor({
   const [showLineNumbers, setShowLineNumbers] = useState(isCodeEditorExpanded);
   const [isCompactFocused, setIsCompactFocused] = useState(isCodeEditorExpanded);
   const [isCodeEditorExpandedFocused, setIsCodeEditorExpandedFocused] = useState(false);
-
+  const [isQueryLoading, setIsQueryLoading] = useState(true);
+  const [abortController, setAbortController] = useState(new AbortController());
   const [editorMessages, setEditorMessages] = useState<{
     errors: MonacoMessage[];
     warnings: MonacoMessage[];
@@ -186,12 +194,25 @@ export const TextBasedLanguagesEditor = memo(function TextBasedLanguagesEditor({
   });
 
   const onQuerySubmit = useCallback(() => {
-    const currentValue = editor1.current?.getValue();
-    if (currentValue != null) {
-      setCodeStateOnSubmission(currentValue);
+    if (isQueryLoading && allowQueryCancellation) {
+      abortController?.abort();
+      setIsQueryLoading(false);
+    } else {
+      setIsQueryLoading(true);
+      const abc = new AbortController();
+      setAbortController(abc);
+
+      const currentValue = editor1.current?.getValue();
+      if (currentValue != null) {
+        setCodeStateOnSubmission(currentValue);
+      }
+      onTextLangQuerySubmit({ [language]: currentValue } as AggregateQuery, abc);
     }
-    onTextLangQuerySubmit({ [language]: currentValue } as AggregateQuery);
-  }, [language, onTextLangQuerySubmit]);
+  }, [language, onTextLangQuerySubmit, abortController, isQueryLoading, allowQueryCancellation]);
+
+  useEffect(() => {
+    if (!isLoading) setIsQueryLoading(false);
+  }, [isLoading]);
 
   const [documentationSections, setDocumentationSections] =
     useState<LanguageDocumentationSections>();
@@ -311,12 +332,13 @@ export const TextBasedLanguagesEditor = memo(function TextBasedLanguagesEditor({
   const { cache: esqlFieldsCache, memoizedFieldsFromESQL } = useMemo(() => {
     // need to store the timing of the first request so we can atomically clear the cache per query
     const fn = memoize(
-      (...args: [{ esql: string }, ExpressionsStart]) => ({
+      (...args: [{ esql: string }, ExpressionsStart, undefined, AbortController?]) => ({
         timestamp: Date.now(),
         result: fetchFieldsFromESQL(...args),
       }),
       ({ esql }) => esql
     );
+
     return { cache: fn.cache, memoizedFieldsFromESQL: fn };
   }, []);
 
@@ -334,7 +356,12 @@ export const TextBasedLanguagesEditor = memo(function TextBasedLanguagesEditor({
           // Check if there's a stale entry and clear it
           clearCacheWhenOld(esqlFieldsCache, esqlQuery.esql);
           try {
-            const table = await memoizedFieldsFromESQL(esqlQuery, expressions).result;
+            const table = await memoizedFieldsFromESQL(
+              esqlQuery,
+              expressions,
+              undefined,
+              abortController
+            ).result;
             return table?.columns.map((c) => ({ name: c.name, type: c.meta.type })) || [];
           } catch (e) {
             // no action yet
@@ -352,7 +379,14 @@ export const TextBasedLanguagesEditor = memo(function TextBasedLanguagesEditor({
         return policies.map(({ type, query: policyQuery, ...rest }) => rest);
       },
     }),
-    [dataViews, expressions, indexManagementApiService, esqlFieldsCache, memoizedFieldsFromESQL]
+    [
+      dataViews,
+      expressions,
+      indexManagementApiService,
+      esqlFieldsCache,
+      memoizedFieldsFromESQL,
+      abortController,
+    ]
   );
 
   const queryValidation = useCallback(
@@ -867,7 +901,8 @@ export const TextBasedLanguagesEditor = memo(function TextBasedLanguagesEditor({
                         disableSubmitAction={disableSubmitAction}
                         hideRunQueryText={hideRunQueryText}
                         isSpaceReduced={isSpaceReduced}
-                        isLoading={isLoading}
+                        isLoading={isQueryLoading}
+                        allowQueryCancellation={allowQueryCancellation}
                       />
                     )}
                   </div>
@@ -954,13 +989,16 @@ export const TextBasedLanguagesEditor = memo(function TextBasedLanguagesEditor({
           lines={lines}
           containerCSS={styles.bottomContainer}
           onErrorClick={onErrorClick}
-          runQuery={onQuerySubmit}
+          runQuery={() => {
+            onQuerySubmit();
+          }}
           detectTimestamp={detectTimestamp}
           hideRunQueryText={hideRunQueryText}
           editorIsInline={editorIsInline}
           disableSubmitAction={disableSubmitAction}
           isSpaceReduced={isSpaceReduced}
-          isLoading={isLoading}
+          isLoading={isQueryLoading}
+          allowQueryCancellation={allowQueryCancellation}
           {...editorMessages}
         />
       )}

diff --git a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
@@ -717,7 +717,7 @@ export const QueryBarTopRow = React.memo(
             errors={props.textBasedLanguageModeErrors}
             warning={props.textBasedLanguageModeWarning}
             detectTimestamp={detectTimestamp}
-            onTextLangQuerySubmit={() =>
+            onTextLangQuerySubmit={async () =>
               onSubmit({
                 query: queryRef.current,
                 dateRange: dateRangeRef.current,

diff --git a/x-pack/packages/ml/anomaly_utils/anomaly_utils.ts b/x-pack/packages/ml/anomaly_utils/anomaly_utils.ts
@@ -59,6 +59,10 @@ export interface MlEntityField {
    * Optional entity field operation
    */
   operation?: MlEntityFieldOperation;
+  /**
+   * Optional cardinality of field
+   */
+  cardinality?: number;
 }
 
 // List of function descriptions for which actual values from record level results should be displayed.

diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts b/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts
@@ -115,7 +115,8 @@ describe('Service inventory', () => {
     });
   });
 
-  describe('Table search', () => {
+  // Skipping this until we enable the table search on the Service inventory view
+  describe.skip('Table search', () => {
     beforeEach(() => {
       cy.updateAdvancedSettings({
         'observability:apmEnableTableSearchBar': true,

diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/index.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/index.tsx
@@ -357,6 +357,7 @@ export function ServiceList({
 
   const tableSearchBar: TableSearchBar<ServiceListItem> = useMemo(() => {
     return {
+      isEnabled: false,
       fieldsToSearch: ['serviceName'],
       maxCountExceeded,
       onChangeSearchQuery,

diff --git a/x-pack/plugins/apm/public/components/shared/managed_table/index.tsx b/x-pack/plugins/apm/public/components/shared/managed_table/index.tsx
@@ -111,7 +111,7 @@ function UnoptimizedManagedTable<T extends object>(props: {
   const { core } = useApmPluginContext();
   const isTableSearchBarEnabled = core.uiSettings.get<boolean>(
     apmEnableTableSearchBar,
-    false
+    true
   );
 
   const {

diff --git a/x-pack/plugins/cases/public/components/all_cases/severity_filter.test.tsx b/x-pack/plugins/cases/public/components/all_cases/severity_filter.test.tsx
@@ -14,7 +14,9 @@ import { screen, waitFor } from '@testing-library/react';
 import { waitForEuiPopoverOpen } from '@elastic/eui/lib/test/rtl';
 import { SeverityFilter } from './severity_filter';
 
-describe('Severity form field', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/176336
+// FLAKY: https://github.com/elastic/kibana/issues/176337
+describe.skip('Severity form field', () => {
   const onChange = jest.fn();
   let appMockRender: AppMockRenderer;
   const props = {

diff --git a/x-pack/plugins/cases/public/components/app/routes.test.tsx b/x-pack/plugins/cases/public/components/app/routes.test.tsx
@@ -60,7 +60,8 @@ describe('Cases routes', () => {
     });
   });
 
-  describe('Case view', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/163263
+  describe.skip('Case view', () => {
     it.each(getCaseViewPaths())(
       'navigates to the cases view page for path: %s',
       async (path: string) => {
@@ -84,7 +85,9 @@ describe('Cases routes', () => {
     );
   });
 
-  describe('Create case', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/175229
+  // FLAKY: https://github.com/elastic/kibana/issues/175230
+  describe.skip('Create case', () => {
     it('navigates to the create case page', () => {
       renderWithRouter(['/cases/create']);
       expect(screen.getByText('Create case')).toBeInTheDocument();
@@ -96,7 +99,9 @@ describe('Cases routes', () => {
     });
   });
 
-  describe('Cases settings', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/175231
+  // FLAKY: https://github.com/elastic/kibana/issues/175232
+  describe.skip('Cases settings', () => {
     it('navigates to the cases settings page', () => {
       renderWithRouter(['/cases/configure']);
       expect(screen.getByText('Settings')).toBeInTheDocument();
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,7 +111,7 @@ function UnoptimizedManagedTable<T extends object>(props: { @@
       const { core } = useApmPluginContext();
       const isTableSearchBarEnabled = core.uiSettings.get<boolean>(
         apmEnableTableSearchBar,
-        false
+        true
       );
       const {
@@ Expand Down @@