Merge branch 'main' into rule-execution-log-feedback-part-deux

.buildkite/scripts/pipelines/pull_request/pipeline.js

@@ -20,6 +20,7 @@ const SKIPPABLE_PATHS = [
   /^\.github\//,
   /\.md$/,
   /^\.backportrc\.json$/,
+  /^nav-kibana-dev\.docnav\.json$/,
 ];
 
 const REQUIRED_PATHS = [

packages/kbn-ci-stats-reporter/src/ci_stats_reporter.ts

@@ -22,6 +22,8 @@ import { parseConfig, Config, CiStatsMetadata } from '@kbn/ci-stats-core';
 import type { CiStatsTestGroupInfo, CiStatsTestRun } from './ci_stats_test_group_types';
 
 const BASE_URL = 'https://ci-stats.kibana.dev';
+const SECOND = 1000;
+const MINUTE = 60 * SECOND;
 
 function limitMetaStrings(meta: CiStatsMetadata) {
   return Object.fromEntries(
@@ -107,6 +109,7 @@ interface ReqOptions {
   body: any;
   bodyDesc: string;
   query?: AxiosRequestConfig['params'];
+  timeout?: number;
 }
 
 /** Object that helps report data to the ci-stats service */
@@ -282,6 +285,7 @@ export class CiStatsReporter {
         },
         bodyDesc: `[${group.name}/${group.type}] Chunk of ${bufferBytes} bytes`,
         body: buffer.join('\n'),
+        timeout: 5 * MINUTE,
       });
       buffer.length = 0;
       bufferBytes = 0;
@@ -336,7 +340,7 @@ export class CiStatsReporter {
     }
   }
 
-  private async req<T>({ auth, body, bodyDesc, path, query }: ReqOptions) {
+  private async req<T>({ auth, body, bodyDesc, path, query, timeout = 60 * SECOND }: ReqOptions) {
     let attempt = 0;
     const maxAttempts = 5;
 
@@ -365,6 +369,7 @@ export class CiStatsReporter {
           // if it can be serialized into a string, send it
           maxBodyLength: Infinity,
           maxContentLength: Infinity,
+          timeout,
         });
 
         return resp.data;

packages/kbn-pm/dist/index.js

@@ -1580,6 +1580,8 @@ var _ciStatsCore = __webpack_require__("../../node_modules/@kbn/ci-stats-core/ta
  */
 // @ts-expect-error not "public", but necessary to prevent Jest shimming from breaking things
 const BASE_URL = 'https://ci-stats.kibana.dev';
+const SECOND = 1000;
+const MINUTE = 60 * SECOND;
 
 function limitMetaStrings(meta) {
   return Object.fromEntries(Object.entries(meta).map(([key, value]) => {
@@ -1782,7 +1784,8 @@ class CiStatsReporter {
           groupType: group.type
         },
         bodyDesc: `[${group.name}/${group.type}] Chunk of ${bufferBytes} bytes`,
-        body: buffer.join('\n')
+        body: buffer.join('\n'),
+        timeout: 5 * MINUTE
       });
       buffer.length = 0;
       bufferBytes = 0;
@@ -1851,7 +1854,8 @@ class CiStatsReporter {
     body,
     bodyDesc,
     path,
-    query
+    query,
+    timeout = 60 * SECOND
   }) {
     let attempt = 0;
     const maxAttempts = 5;
@@ -1879,7 +1883,8 @@ class CiStatsReporter {
           adapter: _http.default,
           // if it can be serialized into a string, send it
           maxBodyLength: Infinity,
-          maxContentLength: Infinity
+          maxContentLength: Infinity,
+          timeout
         });
         return resp.data;
       } catch (error) {

src/plugins/discover/public/components/discover_grid/discover_grid_document_selection.tsx

@@ -18,6 +18,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { euiLightVars as themeLight, euiDarkVars as themeDark } from '@kbn/ui-theme';
+import { i18n } from '@kbn/i18n';
 import { DiscoverGridContext } from './discover_grid_context';
 import { ElasticSearchHit } from '../../types';
 
@@ -36,6 +37,11 @@ export const SelectButton = ({ rowIndex, setCellProps }: EuiDataGridCellValueEle
   const id = useMemo(() => getDocId(doc), [doc]);
   const checked = useMemo(() => selectedDocs.includes(id), [selectedDocs, id]);
 
+  const toggleDocumentSelectionLabel = i18n.translate('discover.grid.selectDoc', {
+    defaultMessage: `Select document '{rowNumber}'`,
+    values: { rowNumber: rowIndex + 1 },
+  });
+
   useEffect(() => {
     if (expanded && doc && expanded._id === doc._id) {
       setCellProps({
@@ -51,7 +57,7 @@ export const SelectButton = ({ rowIndex, setCellProps }: EuiDataGridCellValueEle
   return (
     <EuiCheckbox
       id={id}
-      label=""
+      aria-label={toggleDocumentSelectionLabel}
       checked={checked}
       data-test-subj={`dscGridSelectDoc-${id}`}
       onChange={() => {

x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts

@@ -7,7 +7,7 @@
 
 import { random, mean } from 'lodash';
 import { SanitizedRule, AlertSummary } from '../types';
-import { IValidatedEvent } from '@kbn/event-log-plugin/server';
+import { IValidatedEvent, millisToNanos, nanosToMillis } from '@kbn/event-log-plugin/server';
 import { EVENT_LOG_ACTIONS, EVENT_LOG_PROVIDER, LEGACY_EVENT_LOG_ACTIONS } from '../plugin';
 import { alertSummaryFromEventLog } from './alert_summary_from_event_log';
 
@@ -643,7 +643,7 @@ export class EventsFactory {
       event: {
         provider: EVENT_LOG_PROVIDER,
         action: EVENT_LOG_ACTIONS.execute,
-        duration: random(2000, 180000) * 1000 * 1000,
+        duration: millisToNanos(random(2000, 180000)),
       },
     };
 
@@ -710,7 +710,7 @@ export class EventsFactory {
     return this.events
       .filter((ev) => ev?.event?.action === 'execute' && ev?.event?.duration !== undefined)
       .reduce((res: Record<string, number>, ev) => {
-        res[ev?.['@timestamp']!] = ev?.event?.duration! / (1000 * 1000);
+        res[ev?.['@timestamp']!] = nanosToMillis(ev?.event?.duration!);
         return res;
       }, {});
   }

x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts

@@ -6,12 +6,10 @@
  */
 
 import { mean } from 'lodash';
-import { IEvent } from '@kbn/event-log-plugin/server';
+import { IEvent, nanosToMillis } from '@kbn/event-log-plugin/server';
 import { SanitizedRule, AlertSummary, AlertStatus } from '../types';
 import { EVENT_LOG_ACTIONS, EVENT_LOG_PROVIDER, LEGACY_EVENT_LOG_ACTIONS } from '../plugin';
 
-const Millis2Nanos = 1000 * 1000;
-
 export interface AlertSummaryFromEventLogParams {
   rule: SanitizedRule<{ bar: boolean }>;
   events: IEvent[];
@@ -111,7 +109,7 @@ export function alertSummaryFromEventLog(params: AlertSummaryFromEventLogParams)
     }
 
     if (event?.event?.duration) {
-      const eventDirationMillis = event.event.duration / Millis2Nanos;
+      const eventDirationMillis = nanosToMillis(event.event.duration);
       eventDurations.push(eventDirationMillis);
       eventDurationsWithTimestamp[event['@timestamp']!] = eventDirationMillis;
     }

x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts

@@ -71,7 +71,7 @@ export function createAlertEventLogRecordObject(params: CreateAlertEventLogRecor
       category: [ruleType.producer],
       ...(state?.start ? { start: state.start as string } : {}),
       ...(state?.end ? { end: state.end as string } : {}),
-      ...(state?.duration !== undefined ? { duration: state.duration as number } : {}),
+      ...(state?.duration !== undefined ? { duration: state.duration as string } : {}),
     },
     kibana: {
       alert: {

x-pack/plugins/alerting/server/rules_client/tests/get_execution_log.test.ts

@@ -296,7 +296,7 @@ const findResults = {
         kind: 'action',
         start: '2022-03-23T17:37:07.105Z',
         end: '2022-03-23T17:37:07.105Z',
-        duration: 0,
+        duration: '0',
         outcome: 'failure',
       },
       kibana: {
@@ -345,7 +345,7 @@ const findResults = {
         kind: 'action',
         start: '2022-03-23T17:37:07.101Z',
         end: '2022-03-23T17:37:07.102Z',
-        duration: 1000000,
+        duration: '1000000',
         outcome: 'failure',
       },
       kibana: {
@@ -394,7 +394,7 @@ const findResults = {
         kind: 'action',
         start: '2022-03-23T17:37:07.098Z',
         end: '2022-03-23T17:37:07.098Z',
-        duration: 0,
+        duration: '0',
         outcome: 'failure',
       },
       kibana: {
@@ -443,7 +443,7 @@ const findResults = {
         kind: 'action',
         start: '2022-03-23T17:37:07.095Z',
         end: '2022-03-23T17:37:07.096Z',
-        duration: 1000000,
+        duration: '1000000',
         outcome: 'failure',
       },
       kibana: {
@@ -492,7 +492,7 @@ const findResults = {
         kind: 'action',
         start: '2022-03-23T17:37:07.084Z',
         end: '2022-03-23T17:37:07.086Z',
-        duration: 2000000,
+        duration: '2000000',
         outcome: 'failure',
       },
       kibana: {
@@ -543,7 +543,7 @@ const findResults = {
         start: '2022-03-23T17:23:05.131Z',
         outcome: 'failure',
         end: '2022-03-23T17:23:05.248Z',
-        duration: 117000000,
+        duration: '117000000',
         reason: 'execute',
       },
       kibana: {

x-pack/plugins/alerting/server/task_runner/fixtures.ts

@@ -28,7 +28,7 @@ export const DATE_1969 = '1969-12-31T00:00:00.000Z';
 export const DATE_1970 = '1970-01-01T00:00:00.000Z';
 export const DATE_1970_5_MIN = '1969-12-31T23:55:00.000Z';
 export const DATE_9999 = '9999-12-31T12:34:56.789Z';
-export const MOCK_DURATION = 86400000000000;
+export const MOCK_DURATION = '86400000000000';
 
 export const SAVED_OBJECT = {
   id: '1',