Merge branch '7.10' into backport/7.10/pr-81025

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.es_field_types.md

@@ -43,4 +43,5 @@ export declare enum ES_FIELD_TYPES
 |  STRING | <code>&quot;string&quot;</code> |  |
 |  TEXT | <code>&quot;text&quot;</code> |  |
 |  TOKEN\_COUNT | <code>&quot;token_count&quot;</code> |  |
+|  UNSIGNED\_LONG | <code>&quot;unsigned_long&quot;</code> |  |
 

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.es_field_types.md

@@ -43,4 +43,5 @@ export declare enum ES_FIELD_TYPES
 |  STRING | <code>&quot;string&quot;</code> |  |
 |  TEXT | <code>&quot;text&quot;</code> |  |
 |  TOKEN\_COUNT | <code>&quot;token_count&quot;</code> |  |
+|  UNSIGNED\_LONG | <code>&quot;unsigned_long&quot;</code> |  |
 

docs/redirects.asciidoc

@@ -28,12 +28,12 @@ This page has moved. Please see the new section in the {heartbeat-ref}/securing-
 [role="exclude",id="infra-read-only-access"]
 == Configure source read-only access
 
-This page has moved. Please see the new section in the {metrics-guide}/configure-metrics-source.html[Metrics Monitoring Guide].
+This page has moved. Please see {observability-guide}/configure-settings.html[configure settings].
 
 [role="exclude",id="logs-read-only-access"]
 == Configure source read-only access
 
-This page has moved. Please see {logs-guide}/configure-logs-source.html[logs configuration].
+This page has moved. Please see {observability-guide}/configure-data-sources.html[configure data sources].
 
 [role="exclude",id="creating-df-kib"]
 == Creating {transforms}

src/core/server/core_app/integration_tests/default_route_provider_config.test.ts

@@ -24,7 +24,8 @@ const { startES } = kbnTestServer.createTestServers({
 });
 let esServer: kbnTestServer.TestElasticsearchUtils;
 
-describe('default route provider', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/81072
+describe.skip('default route provider', () => {
   let root: Root;
 
   beforeAll(async () => {

src/plugins/data/common/kbn_field_types/kbn_field_types.test.ts

@@ -66,6 +66,7 @@ describe('utils/kbn_field_types', () => {
     test('returns the kbnFieldType name that matches the esType', () => {
       expect(castEsToKbnFieldTypeName(ES_FIELD_TYPES.KEYWORD)).toBe('string');
       expect(castEsToKbnFieldTypeName(ES_FIELD_TYPES.FLOAT)).toBe('number');
+      expect(castEsToKbnFieldTypeName(ES_FIELD_TYPES.UNSIGNED_LONG)).toBe('number');
     });
 
     test('returns unknown for unknown es types', () => {

src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts

@@ -48,6 +48,7 @@ export const createKbnFieldTypes = (): KbnFieldType[] => [
       ES_FIELD_TYPES.DOUBLE,
       ES_FIELD_TYPES.INTEGER,
       ES_FIELD_TYPES.LONG,
+      ES_FIELD_TYPES.UNSIGNED_LONG,
       ES_FIELD_TYPES.SHORT,
       ES_FIELD_TYPES.BYTE,
       ES_FIELD_TYPES.TOKEN_COUNT,

src/plugins/data/common/kbn_field_types/types.ts

@@ -52,6 +52,7 @@ export enum ES_FIELD_TYPES {
   INTEGER = 'integer',
   LONG = 'long',
   SHORT = 'short',
+  UNSIGNED_LONG = 'unsigned_long',
 
   NESTED = 'nested',
   BYTE = 'byte',

src/plugins/data/public/public.api.md

@@ -513,7 +513,9 @@ export enum ES_FIELD_TYPES {
     // (undocumented)
     TOKEN_COUNT = "token_count",
     // (undocumented)
-    _TYPE = "_type"
+    _TYPE = "_type",
+    // (undocumented)
+    UNSIGNED_LONG = "unsigned_long"
 }
 
 // Warning: (ae-missing-release-tag) "ES_SEARCH_STRATEGY" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)

src/plugins/data/server/server.api.md

@@ -210,7 +210,9 @@ export enum ES_FIELD_TYPES {
     // (undocumented)
     TOKEN_COUNT = "token_count",
     // (undocumented)
-    _TYPE = "_type"
+    _TYPE = "_type",
+    // (undocumented)
+    UNSIGNED_LONG = "unsigned_long"
 }
 
 // Warning: (ae-missing-release-tag) "ES_SEARCH_STRATEGY" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)

x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx

@@ -22,6 +22,24 @@ const ClFlexGroup = styled(EuiFlexGroup)`
   }
 `;
 
+function formatTitle(unit: string, value?: number) {
+  if (typeof value === 'undefined') return I18LABELS.dataMissing;
+  return formatToSec(value, unit);
+}
+
+function PageViewsTotalTitle({ pageViews }: { pageViews?: number }) {
+  if (typeof pageViews === 'undefined') {
+    return <>{I18LABELS.dataMissing}</>;
+  }
+  return pageViews < 10000 ? (
+    <>{numeral(pageViews).format('0,0')}</>
+  ) : (
+    <EuiToolTip content={numeral(pageViews).format('0,0')}>
+      <>{numeral(pageViews).format('0 a')}</>
+    </EuiToolTip>
+  );
+}
+
 export function ClientMetrics() {
   const uxQuery = useUxQuery();
 
@@ -50,38 +68,28 @@ export function ClientMetrics() {
 
   const STAT_STYLE = { width: '240px' };
 
-  const pageViewsTotal = data?.pageViews?.value ?? 0;
-
   return (
     <ClFlexGroup responsive={false}>
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="l"
-          title={formatToSec(data?.backEnd?.value ?? 0, 'ms')}
+          title={formatTitle('ms', data?.backEnd?.value)}
           description={I18LABELS.backEnd}
           isLoading={status !== 'success'}
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="l"
-          title={formatToSec(data?.frontEnd?.value ?? 0, 'ms')}
+          title={formatTitle('ms', data?.frontEnd?.value)}
           description={I18LABELS.frontEnd}
           isLoading={status !== 'success'}
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="l"
-          title={
-            pageViewsTotal < 10000 ? (
-              numeral(pageViewsTotal).format('0,0')
-            ) : (
-              <EuiToolTip content={numeral(pageViewsTotal).format('0,0')}>
-                <>{numeral(pageViewsTotal).format('0 a')}</>
-              </EuiToolTip>
-            )
-          }
+          title={<PageViewsTotalTitle pageViews={data?.pageViews?.value} />}
           description={I18LABELS.pageViews}
           isLoading={status !== 'success'}
         />

x-pack/plugins/apm/public/components/app/RumDashboard/UXMetrics/KeyUXMetrics.tsx

@@ -8,6 +8,7 @@ import React from 'react';
 import { EuiFlexItem, EuiStat, EuiFlexGroup } from '@elastic/eui';
 import numeral from '@elastic/numeral';
 import {
+  DATA_UNDEFINED_LABEL,
   FCP_LABEL,
   LONGEST_LONG_TASK,
   NO_OF_LONG_TASK,
@@ -36,6 +37,11 @@ interface Props {
   loading: boolean;
 }
 
+function formatTitle(unit: string, value?: number) {
+  if (typeof value === 'undefined') return DATA_UNDEFINED_LABEL;
+  return formatToSec(value, unit);
+}
+
 export function KeyUXMetrics({ data, loading }: Props) {
   const uxQuery = useUxQuery();
 
@@ -62,39 +68,43 @@ export function KeyUXMetrics({ data, loading }: Props) {
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="s"
-          title={formatToSec(data?.fcp, 'ms')}
+          title={formatTitle('ms', data?.fcp)}
           description={FCP_LABEL}
           isLoading={loading}
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="s"
-          title={formatToSec(data?.tbt, 'ms')}
+          title={formatTitle('ms', data?.tbt)}
           description={TBT_LABEL}
           isLoading={loading}
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="s"
-          title={numeral(longTaskData?.noOfLongTasks ?? 0).format('0,0')}
+          title={
+            longTaskData?.noOfLongTasks
+              ? numeral(longTaskData.noOfLongTasks).format('0,0')
+              : DATA_UNDEFINED_LABEL
+          }
           description={NO_OF_LONG_TASK}
           isLoading={status !== 'success'}
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="s"
-          title={formatToSec(longTaskData?.longestLongTask, 'ms')}
+          title={formatTitle('ms', longTaskData?.longestLongTask)}
           description={LONGEST_LONG_TASK}
           isLoading={status !== 'success'}
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="s"
-          title={formatToSec(longTaskData?.sumOfLongTasks, 'ms')}
+          title={formatTitle('ms', longTaskData?.sumOfLongTasks)}
           description={SUM_LONG_TASKS}
           isLoading={status !== 'success'}
         />

x-pack/plugins/apm/public/components/app/RumDashboard/UXMetrics/translations.ts

@@ -6,6 +6,13 @@
 
 import { i18n } from '@kbn/i18n';
 
+export const DATA_UNDEFINED_LABEL = i18n.translate(
+  'xpack.apm.rum.coreVitals.dataUndefined',
+  {
+    defaultMessage: 'N/A',
+  }
+);
+
 export const FCP_LABEL = i18n.translate('xpack.apm.rum.coreVitals.fcp', {
   defaultMessage: 'First contentful paint',
 });

x-pack/plugins/apm/public/components/app/RumDashboard/translations.ts

@@ -7,6 +7,9 @@
 import { i18n } from '@kbn/i18n';
 
 export const I18LABELS = {
+  dataMissing: i18n.translate('xpack.apm.rum.dashboard.dataMissing', {
+    defaultMessage: 'N/A',
+  }),
   backEnd: i18n.translate('xpack.apm.rum.dashboard.backend', {
     defaultMessage: 'Backend',
   }),

x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx

@@ -58,7 +58,12 @@ const emptyOption: EuiComboBoxOptionOption = {
   label: '',
 };
 
-const excludeFrequentOptions: EuiComboBoxOptionOption[] = [{ label: 'all' }, { label: 'none' }];
+const excludeFrequentOptions: EuiComboBoxOptionOption[] = [
+  { label: 'all' },
+  { label: 'none' },
+  { label: 'by' },
+  { label: 'over' },
+];
 
 export const AdvancedDetectorModal: FC<Props> = ({
   payload,

x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/descriptions.tsx

@@ -142,7 +142,7 @@ export const ExcludeFrequentDescription: FC = memo(({ children }) => {
       description={
         <FormattedMessage
           id="xpack.ml.newJob.wizard.pickFieldsStep.advancedDetectorModal.excludeFrequent.description"
-          defaultMessage="If true will automatically identify and exclude frequently occurring entities which may otherwise have dominated results."
+          defaultMessage="If set, it will automatically identify and exclude frequently occurring entities which may otherwise have dominated results."
         />
       }
     >

x-pack/plugins/ml/server/routes/schemas/anomaly_detectors_schema.ts

@@ -26,6 +26,8 @@ const detectorSchema = schema.object({
   over_field_name: schema.maybe(schema.string()),
   partition_field_name: schema.maybe(schema.string()),
   detector_description: schema.maybe(schema.string()),
+  exclude_frequent: schema.maybe(schema.string()),
+  use_null: schema.maybe(schema.boolean()),
   /** Custom rules */
   custom_rules: customRulesSchema,
 });

x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx

@@ -76,4 +76,27 @@ describe('UXSection', () => {
     expect(queryAllByText('View in app')).toEqual([]);
     expect(getByText('elastic-co-frontend')).toBeInTheDocument();
   });
+  it('shows empty state', () => {
+    jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
+      data: undefined,
+      status: fetcherHook.FETCH_STATUS.SUCCESS,
+      refetch: jest.fn(),
+    });
+    const { getByText, queryAllByText, getAllByText } = render(
+      <UXSection
+        absoluteTime={{
+          start: moment('2020-06-29T11:38:23.747Z').valueOf(),
+          end: moment('2020-06-29T12:08:23.748Z').valueOf(),
+        }}
+        relativeTime={{ start: 'now-15m', end: 'now' }}
+        bucketSize="60s"
+        serviceName="elastic-co-frontend"
+      />
+    );
+
+    expect(getByText('User Experience')).toBeInTheDocument();
+    expect(getAllByText('No data is available.')).toHaveLength(3);
+    expect(queryAllByText('View in app')).toEqual([]);
+    expect(getByText('elastic-co-frontend')).toBeInTheDocument();
+  });
 });

x-pack/plugins/observability/public/components/shared/core_web_vitals/core_vital_item.tsx

@@ -4,7 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiFlexGroup, EuiIconTip, euiPaletteForStatus, EuiSpacer, EuiStat } from '@elastic/eui';
+import {
+  EuiCard,
+  EuiFlexGroup,
+  EuiIconTip,
+  euiPaletteForStatus,
+  EuiSpacer,
+  EuiStat,
+} from '@elastic/eui';
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { PaletteLegends } from './palette_legends';
@@ -14,6 +21,7 @@ import {
   CV_GOOD_LABEL,
   LESS_LABEL,
   MORE_LABEL,
+  NO_DATA,
   CV_POOR_LABEL,
   IS_LABEL,
   TAKES_LABEL,
@@ -26,7 +34,7 @@ export interface Thresholds {
 
 interface Props {
   title: string;
-  value: string;
+  value?: string;
   ranks?: number[];
   loading: boolean;
   thresholds: Thresholds;
@@ -80,6 +88,9 @@ export function CoreVitalItem({
 
   const biggestValIndex = ranks.indexOf(Math.max(...ranks));
 
+  if (value === undefined && ranks[0] === 100 && !loading) {
+    return <EuiCard title={title} isDisabled={true} description={NO_DATA} />;
+  }
   return (
     <>
       <EuiStat

x-pack/plugins/observability/public/components/shared/core_web_vitals/index.tsx

@@ -50,6 +50,13 @@ interface Props {
   serviceName?: string;
 }
 
+function formatValue(value?: number) {
+  if (typeof value === 'undefined') {
+    return undefined;
+  }
+  return formatToSec(value, 'ms');
+}
+
 export function CoreVitals({ data, loading, displayServiceName, serviceName }: Props) {
   const { lcp, lcpRanks, fid, fidRanks, cls, clsRanks } = data || {};
 
@@ -63,7 +70,7 @@ export function CoreVitals({ data, loading, displayServiceName, serviceName }: P
         <EuiFlexItem style={{ flexBasis: 380 }}>
           <CoreVitalItem
             title={LCP_LABEL}
-            value={formatToSec(lcp, 'ms')}
+            value={formatValue(lcp)}
             ranks={lcpRanks}
             loading={loading}
             thresholds={CoreVitalsThresholds.LCP}
@@ -73,7 +80,7 @@ export function CoreVitals({ data, loading, displayServiceName, serviceName }: P
         <EuiFlexItem style={{ flexBasis: 380 }}>
           <CoreVitalItem
             title={FID_LABEL}
-            value={formatToSec(fid, 'ms')}
+            value={formatValue(fid)}
             ranks={fidRanks}
             loading={loading}
             thresholds={CoreVitalsThresholds.FID}
@@ -83,7 +90,7 @@ export function CoreVitals({ data, loading, displayServiceName, serviceName }: P
         <EuiFlexItem style={{ flexBasis: 380 }}>
           <CoreVitalItem
             title={CLS_LABEL}
-            value={cls ?? '0'}
+            value={cls}
             ranks={clsRanks}
             loading={loading}
             thresholds={CoreVitalsThresholds.CLS}

x-pack/plugins/observability/public/components/shared/core_web_vitals/translations.ts

@@ -6,6 +6,10 @@
 
 import { i18n } from '@kbn/i18n';
 
+export const NO_DATA = i18n.translate('xpack.observability.ux.coreVitals.noData', {
+  defaultMessage: 'No data is available.',
+});
+
 export const LCP_LABEL = i18n.translate('xpack.observability.ux.coreVitals.lcp', {
   defaultMessage: 'Largest contentful paint',
 });