Merge branch 'main' into chore/langchain-core-bump

elasticmachine · web-flow · commit ec8ff2992d90 · 2025-12-29T13:18:43.000-05:00
diff --git a/src/platform/packages/shared/kbn-visualization-ui-components/components/query_input/filter_query_input.tsx b/src/platform/packages/shared/kbn-visualization-ui-components/components/query_input/filter_query_input.tsx
@@ -78,6 +78,14 @@ export function FilterQueryInput({
     dataView
   );
 
+  const emptyFilterQueryText = i18n.translate(
+    'visualizationUiComponents.filterQueryInput.emptyFilterQuery',
+    {
+      defaultMessage: '(empty)',
+    }
+  );
+  const filterQueryText = (inputFilter?.query as string) || emptyFilterQueryText;
+
   return (
     <EuiFormRow
       display="rowCompressed"
@@ -135,14 +143,9 @@ export function FilterQueryInput({
                           defaultMessage: 'Click to edit',
                         }
                       )}
+                      aria-label={`${filterByLabel} ${filterQueryText}`}
                     >
-                      {(inputFilter?.query as string) ||
-                        i18n.translate(
-                          'visualizationUiComponents.filterQueryInput.emptyFilterQuery',
-                          {
-                            defaultMessage: '(empty)',
-                          }
-                        )}
+                      {filterQueryText}
                     </EuiLink>
                   </EuiFlexItem>
                 </EuiFlexGroup>
diff --git a/src/platform/plugins/shared/dashboard/public/dashboard_app/no_data/dashboard_app_no_data.tsx b/src/platform/plugins/shared/dashboard/public/dashboard_app/no_data/dashboard_app_no_data.tsx
@@ -75,7 +75,7 @@ export const DashboardAppNoDataPage = ({
         query: `FROM ${indexName}`,
         http: coreServices.http,
       });
-      const esqlQuery = getInitialESQLQuery(dataView);
+      const esqlQuery = getInitialESQLQuery(dataView, true);
 
       try {
         const columns = await getESQLQueryColumns({
diff --git a/src/platform/test/functional/apps/dashboard/group6/dashboard_esql_no_data.ts b/src/platform/test/functional/apps/dashboard/group6/dashboard_esql_no_data.ts
@@ -35,7 +35,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       await panelActions.clickEdit();
       const editorValue = await monacoEditor.getCodeEditorValue();
-      expect(editorValue).to.eql(`FROM logs* | LIMIT 10`);
+      expect(editorValue).to.eql(`FROM logs*`);
     });
   });
 }
diff --git a/x-pack/platform/plugins/shared/agent_builder/server/routes/wrap_handler.ts b/x-pack/platform/plugins/shared/agent_builder/server/routes/wrap_handler.ts
@@ -41,7 +41,12 @@ export const getHandlerWrapper =
       if (!ignoreLicense) {
         const { license } = await ctx.licensing;
         if (!isValidLicense(license)) {
-          return res.forbidden();
+          return res.forbidden({
+            body: {
+              message:
+                'Invalid license level. Agent Builder APIs require an Enterprise license or higher.',
+            },
+          });
         }
       }
 
diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/field_input.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/field_input.tsx
@@ -44,12 +44,13 @@ export function FieldInput({
       selectedOperationDefinition?.input,
       currentFieldIsInvalid
     );
+  const fieldLabel = i18n.translate('xpack.lens.indexPattern.chooseField', {
+    defaultMessage: 'Field',
+  });
   return (
     <EuiFormRow
       data-test-subj="indexPattern-field-selection-row"
-      label={i18n.translate('xpack.lens.indexPattern.chooseField', {
-        defaultMessage: 'Field',
-      })}
+      label={fieldLabel}
       fullWidth
       isInvalid={Boolean(incompleteOperation || currentFieldIsInvalid)}
       error={fieldErrorMessage}
@@ -86,6 +87,7 @@ export function FieldInput({
           groupId,
           dimensionGroups
         )}
+        aria-label={fieldLabel}
       />
     </EuiFormRow>
   );
diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/field_select.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/field_select.tsx
@@ -38,6 +38,7 @@ export interface FieldSelectProps extends EuiComboBoxProps<EuiComboBoxOptionOpti
   'data-test-subj'?: string;
   showTimeSeriesDimensions: boolean;
   'aria-describedby'?: string;
+  'aria-label'?: string;
 }
 
 export function FieldSelect({
@@ -53,6 +54,7 @@ export function FieldSelect({
   ['data-test-subj']: dataTestSub,
   showTimeSeriesDimensions,
   ['aria-describedby']: ariaDescribedby,
+  ['aria-label']: ariaLabel,
 }: FieldSelectProps) {
   const { hasFieldData } = useExistingFieldsReader();
   const memoizedFieldOptions = useMemo(() => {
@@ -212,6 +214,7 @@ export function FieldSelect({
       fieldIsInvalid={Boolean(incompleteOperation || fieldIsInvalid)}
       data-test-subj={dataTestSub ?? 'indexPattern-dimension-field'}
       aria-describedby={ariaDescribedby}
+      aria-label={ariaLabel}
     />
   );
 }
diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/format_selector.test.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/format_selector.test.tsx
@@ -93,5 +93,26 @@ describe('FormatSelector', () => {
       expect(screen.queryByLabelText('Decimals')).toHaveValue(2);
       expect(screen.queryByTestId('lns-indexpattern-dimension-formatCompact')).toBeInTheDocument();
     });
+
+    it('sets compact to true by default when selecting duration format', async () => {
+      renderFormatSelector({
+        selectedColumn: {
+          ...props.selectedColumn,
+          params: { format: { id: 'number' } },
+        },
+      });
+
+      // Change format from number to duration
+      const formatInput = within(screen.getByTestId('indexPattern-dimension-format')).getByRole(
+        'combobox'
+      );
+      await user.click(formatInput);
+      fireEvent.click(screen.getByText('Duration'));
+
+      expect(props.onChange).toBeCalledWith({
+        id: 'duration',
+        params: { decimals: 0, compact: true },
+      });
+    });
   });
 });
diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/format_selector.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/format_selector.tsx
@@ -244,7 +244,10 @@ export function FormatSelector(props: FormatSelectorProps) {
       const defaultDecimals = supportedFormats[id].defaultDecimals;
       onChange({
         id: choices[0].value,
-        params: { decimals: defaultDecimals ?? decimals },
+        params: {
+          decimals: defaultDecimals ?? decimals,
+          ...(id === 'duration' ? { compact: true } : {}),
+        },
       });
       setDecimals(defaultDecimals ?? decimals);
     },
diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/reduced_time_range.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/reduced_time_range.tsx
@@ -184,6 +184,7 @@ export function ReducedTimeRange({
                   setLocalValue(choice);
                 }
               }}
+              aria-label={label}
             />
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/time_scaling.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/time_scaling.tsx
@@ -51,6 +51,9 @@ export interface TimeScalingProps {
 
 export function TimeScaling({ selectedColumn, columnId, layer, updateLayer }: TimeScalingProps) {
   const selectedOperation = operationDefinitionMap[selectedColumn.operationType];
+  const timeScaleLabel = i18n.translate('xpack.lens.indexPattern.timeScale.label', {
+    defaultMessage: 'Normalize by unit',
+  });
 
   if (!selectedOperation.timeScalingMode || selectedOperation.timeScalingMode === 'disabled') {
     return null;
@@ -62,9 +65,7 @@ export function TimeScaling({ selectedColumn, columnId, layer, updateLayer }: Ti
       fullWidth
       label={
         <span>
-          {i18n.translate('xpack.lens.indexPattern.timeScale.label', {
-            defaultMessage: 'Normalize by unit',
-          })}{' '}
+          {timeScaleLabel}{' '}
           <EuiIconTip
             type="question"
             color="subdued"
@@ -101,6 +102,7 @@ export function TimeScaling({ selectedColumn, columnId, layer, updateLayer }: Ti
               const value = e.target.value || undefined;
               updateLayer(setTimeScaling(columnId, layer, value as TimeScaleUnit));
             }}
+            aria-label={timeScaleLabel}
           />
         </EuiFlexItem>
       </EuiFlexGroup>
diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/time_shift.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/time_shift.tsx
@@ -96,6 +96,9 @@ export function TimeShift({
   const parsedLocalValue = localValue && parseTimeShift(localValue);
   const isLocalValueInvalid = Boolean(parsedLocalValue && isInvalid(parsedLocalValue));
   const warnings = getColumnTimeShiftWarnings(dateHistogramInterval, localValue);
+  const timeShiftLabel = i18n.translate('xpack.lens.indexPattern.timeShift.label', {
+    defaultMessage: 'Time shift',
+  });
 
   function getSelectedOption() {
     const goodPick = timeShiftOptions.filter(({ value }) => value === localValue);
@@ -118,9 +121,7 @@ export function TimeShift({
         display="rowCompressed"
         fullWidth
         data-test-subj="indexPattern-dimension-time-shift-row"
-        label={i18n.translate('xpack.lens.indexPattern.timeShift.label', {
-          defaultMessage: 'Time shift',
-        })}
+        label={timeShiftLabel}
         helpText={i18n.translate('xpack.lens.indexPattern.timeShift.help', {
           defaultMessage: 'Enter the time shift number and unit',
         })}
@@ -175,6 +176,7 @@ export function TimeShift({
                   setLocalValue(choice);
                 }
               }}
+              aria-label={timeShiftLabel}
             />
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/x-pack/platform/plugins/shared/lens/public/react_embeddable/esql.ts b/x-pack/platform/plugins/shared/lens/public/react_embeddable/esql.ts
@@ -50,7 +50,7 @@ export async function loadESQLAttributes({
     import('../async_services'),
   ]);
 
-  const esqlQuery = getInitialESQLQuery(dataView);
+  const esqlQuery = getInitialESQLQuery(dataView, true);
 
   const defaultEsqlQuery = {
     esql: esqlQuery,
diff --git a/x-pack/platform/test/plugin_api_integration/test_suites/task_manager/task_management.ts b/x-pack/platform/test/plugin_api_integration/test_suites/task_manager/task_management.ts
@@ -50,7 +50,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const testHistoryIndex = '.kibana_task_manager_test_result';
 
-  describe('scheduling and running tasks', () => {
+  // Failing: See https://github.com/elastic/kibana/issues/247560
+  describe.skip('scheduling and running tasks', () => {
     beforeEach(async () => {
       // clean up before each test
       await supertest.delete('/api/sample_tasks').set('kbn-xsrf', 'xxx').expect(200);
diff --git a/x-pack/solutions/observability/plugins/infra/public/alerting/metric_threshold/components/expression.tsx b/x-pack/solutions/observability/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
@@ -307,6 +307,7 @@ export const Expressions: React.FC<Props> = (props) => {
               <RuleConditionChart
                 metricExpression={{
                   metrics: metricExpression,
+                  equation: e.equation,
                   threshold: e.threshold,
                   comparator: e.comparator,
                   timeSize,
diff --git a/x-pack/solutions/observability/plugins/observability/public/components/rule_condition_chart/rule_condition_chart.tsx b/x-pack/solutions/observability/plugins/observability/public/components/rule_condition_chart/rule_condition_chart.tsx
@@ -545,7 +545,7 @@ export function RuleConditionChart({
     );
   }
   return (
-    <div>
+    <div data-test-subj="thresholdRulePreviewChart">
       <lens.EmbeddableComponent
         onLoad={setChartLoading}
         id="ruleConditionChart"
diff --git a/x-pack/solutions/observability/plugins/observability/test/scout/ui/fixtures/constants.ts b/x-pack/solutions/observability/plugins/observability/test/scout/ui/fixtures/constants.ts
@@ -43,6 +43,7 @@ export const RULE_TYPE_MODAL_TEST_SUBJECTS = {
   RULE_TYPE_MODAL: 'ruleTypeModal',
   RULE_TYPE_MODAL_SEARCH: 'ruleTypeModalSearch',
   ALL_RULE_TYPES_BUTTON: 'allRuleTypesButton',
+  CUSTOM_THRESHOLD_RULE_TYPE: 'observability.rules.custom_threshold-SelectOption',
 } as const;
 
 /**
diff --git a/x-pack/solutions/observability/plugins/observability/test/scout/ui/fixtures/generators.ts b/x-pack/solutions/observability/plugins/observability/test/scout/ui/fixtures/generators.ts
@@ -4,10 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { ApiServicesFixture } from '@kbn/scout-oblt';
+import type { ApiServicesFixture, KbnClient } from '@kbn/scout-oblt';
 import type { ApmFields, LogDocument } from '@kbn/synthtrace-client';
 import type { SynthtraceEsClient } from '@kbn/synthtrace/src/lib/shared/base_client';
 import { apm, log, timerange } from '@kbn/synthtrace-client';
+import { AxiosError } from 'axios';
 
 export const TEST_START_DATE = '2024-01-01T00:00:00.000Z';
 export const TEST_END_DATE = '2024-01-01T01:00:00.000Z';
@@ -120,3 +121,41 @@ export async function generateRulesData(apiServices: ApiServicesFixture) {
     });
   }
 }
+
+/**
+ * Creates a data view in Kibana
+ */
+export const createDataView = async (
+  kbnClient: KbnClient,
+  dataViewParams: { id: string; name: string; title: string }
+) => {
+  const { id, title, name } = dataViewParams;
+
+  try {
+    await kbnClient.request({
+      method: 'POST',
+      path: '/api/content_management/rpc/create',
+      body: {
+        contentTypeId: 'index-pattern',
+        data: {
+          fieldAttrs: '{}',
+          title,
+          timeFieldName: '@timestamp',
+          sourceFilters: '[]',
+          fields: '[]',
+          fieldFormatMap: '{}',
+          typeMeta: '{}',
+          runtimeFieldMap: '{}',
+          name,
+        },
+        options: { id },
+        version: 1,
+      },
+    });
+  } catch (error) {
+    if (error instanceof AxiosError && error.response?.status === 409) {
+      return;
+    }
+    throw error;
+  }
+};
diff --git a/x-pack/solutions/observability/plugins/observability/test/scout/ui/fixtures/page_objects/rules_page.ts b/x-pack/solutions/observability/plugins/observability/test/scout/ui/fixtures/page_objects/rules_page.ts
@@ -333,4 +333,12 @@ export class RulesPage {
     await this.editRuleFlyoutCancelButton.click();
     await expect(this.editRuleFlyout).toBeHidden({ timeout: SHORTER_TIMEOUT });
   }
+
+  public get observabilityCategory() {
+    return this.ruleTypeModal.locator('.euiFacetButton[title="Observability"]');
+  }
+
+  public get customThresholdRuleType() {
+    return this.page.testSubj.locator(RULE_TYPE_MODAL_TEST_SUBJECTS.CUSTOM_THRESHOLD_RULE_TYPE);
+  }
 }
diff --git a/x-pack/solutions/observability/plugins/observability/test/scout/ui/parallel_tests/global.setup.ts b/x-pack/solutions/observability/plugins/observability/test/scout/ui/parallel_tests/global.setup.ts
@@ -6,13 +6,25 @@
  */
 
 import { globalSetupHook } from '@kbn/scout-oblt';
-import { generateRulesData } from '../fixtures/generators';
+import { createDataView, generateLogsData, generateRulesData } from '../fixtures/generators';
 
 globalSetupHook(
   'Ingest data to Elasticsearch',
   { tag: ['@ess', '@svlOblt'] },
-  async ({ apiServices, log }) => {
+  async ({ apiServices, log, logsSynthtraceEsClient, kbnClient }) => {
     log.info('Generating Observability data...');
     await generateRulesData(apiServices);
+
+    await generateLogsData({
+      from: Date.now() - 15 * 60 * 1000, // 15 minutes ago
+      to: Date.now(),
+      client: logsSynthtraceEsClient,
+    });
+
+    await createDataView(kbnClient, {
+      name: 'test-data-view-name_1',
+      id: 'test-data-view-id_1',
+      title: 'logs-*',
+    });
   }
 );
diff --git a/x-pack/solutions/observability/plugins/observability/test/scout/ui/parallel_tests/rules/custom_threshold_preview_chart.spec.ts b/x-pack/solutions/observability/plugins/observability/test/scout/ui/parallel_tests/rules/custom_threshold_preview_chart.spec.ts
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/index.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/index.ts
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/custom_threshold_preview_chart.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/custom_threshold_preview_chart.ts

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {`
`35`	`35`
`36`	`36`	`await panelActions.clickEdit();`
`37`	`37`	`const editorValue = await monacoEditor.getCodeEditorValue();`
`38`		- expect(editorValue).to.eql(`FROM logs* \| LIMIT 10`);
	`38`	+ expect(editorValue).to.eql(`FROM logs*`);
`39`	`39`	`});`
`40`	`40`	`});`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,12 @@ export const getHandlerWrapper =`
`41`	`41`	`if (!ignoreLicense) {`
`42`	`42`	`const { license } = await ctx.licensing;`
`43`	`43`	`if (!isValidLicense(license)) {`
`44`		`- return res.forbidden();`
	`44`	`+ return res.forbidden({`
	`45`	`+ body: {`
	`46`	`+ message:`
	`47`	`+ 'Invalid license level. Agent Builder APIs require an Enterprise license or higher.',`
	`48`	`+ },`
	`49`	`+ });`
`45`	`50`	`}`
`46`	`51`	`}`
`47`	`52`
Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@ export function ReducedTimeRange({`
`184`	`184`	`setLocalValue(choice);`
`185`	`185`	`}`
`186`	`186`	`}}`
	`187`	`+ aria-label={label}`
`187`	`188`	`/>`
`188`	`189`	`</EuiFlexItem>`
`189`	`190`	`</EuiFlexGroup>`