Merge remote-tracking branch 'origin/master' into lens/reference-ui

src/plugins/data/common/index_patterns/index_pattern.stub.ts

@@ -25,6 +25,7 @@ export const stubIndexPattern: IIndexPattern = {
   fields: stubFields,
   title: 'logstash-*',
   timeFieldName: '@timestamp',
+  getTimeField: () => ({ name: '@timestamp', type: 'date' }),
 };
 
 export const stubIndexPatternWithFields: IIndexPattern = {

src/plugins/data/common/search/aggs/buckets/date_histogram.ts

@@ -149,7 +149,7 @@ export const getDateHistogramBucketAgg = ({
         type: 'field',
         filterFieldTypes: KBN_FIELD_TYPES.DATE,
         default(agg: IBucketDateHistogramAggConfig) {
-          return agg.getIndexPattern().timeFieldName;
+          return agg.getIndexPattern().getTimeField?.()?.name;
         },
         onChange(agg: IBucketDateHistogramAggConfig) {
           if (isAutoInterval(get(agg, 'params.interval')) && !agg.fieldIsTimeField()) {

x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx

@@ -391,7 +391,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
               updateLayer={setStateWrapper}
               columnId={columnId}
               currentColumn={state.layers[layerId].columns[columnId]}
-              dateRange={props.dateRange}
+              dateRange={dateRange}
               indexPattern={currentIndexPattern}
               {...services}
             />

x-pack/plugins/ml/common/index.ts

@@ -8,3 +8,4 @@ export { SearchResponse7 } from './types/es_client';
 export { ANOMALY_SEVERITY, ANOMALY_THRESHOLD, SEVERITY_COLORS } from './constants/anomalies';
 export { getSeverityColor, getSeverityType } from './util/anomaly_utils';
 export { composeValidators, patternValidator } from './util/validators';
+export { extractErrorMessage } from './util/errors';

x-pack/plugins/ml/common/types/modules.ts

@@ -5,6 +5,7 @@
  */
 import { SavedObjectAttributes } from 'kibana/public';
 import { Datafeed, Job } from './anomaly_detection_jobs';
+import { ErrorType } from '../util/errors';
 
 export interface ModuleJob {
   id: string;
@@ -63,22 +64,13 @@ export interface KibanaObjectResponse extends ResultItem {
   error?: any;
 }
 
-export interface SetupError {
-  body: string;
-  msg: string;
-  path: string;
-  query: {};
-  response: string;
-  statusCode: number;
-}
-
 export interface DatafeedResponse extends ResultItem {
   started: boolean;
-  error?: SetupError;
+  error?: ErrorType;
 }
 
 export interface JobResponse extends ResultItem {
-  error?: SetupError;
+  error?: ErrorType;
 }
 
 export interface DataRecognizerConfigResponse {

x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts

@@ -160,26 +160,6 @@ export class CategorizationJobCreator extends JobCreator {
     return this._categorizationAnalyzer;
   }
 
-  public cloneFromExistingJob(job: Job, datafeed: Datafeed) {
-    this._overrideConfigs(job, datafeed);
-    this.createdBy = CREATED_BY_LABEL.CATEGORIZATION;
-    const detectors = getRichDetectors(job, datafeed, this.additionalFields, false);
-
-    const dtr = detectors[0];
-    if (detectors.length && dtr.agg !== null && dtr.field !== null) {
-      this._detectorType =
-        dtr.agg.id === ML_JOB_AGGREGATION.COUNT
-          ? ML_JOB_AGGREGATION.COUNT
-          : ML_JOB_AGGREGATION.RARE;
-
-      const bs = job.analysis_config.bucket_span;
-      this.setDetectorType(this._detectorType);
-      // set the bucketspan back to the original value
-      // as setDetectorType applies a default
-      this.bucketSpan = bs;
-    }
-  }
-
   public get categorizationPerPartitionField() {
     return this._partitionFieldName;
   }
@@ -204,4 +184,43 @@ export class CategorizationJobCreator extends JobCreator {
       }
     }
   }
+
+  // override the setter and getter for the per-partition toggle
+  // so we can remove the partition field in the wizard when
+  // per-partition categorization is disabled.
+  public get perPartitionCategorization() {
+    return this._job_config.analysis_config.per_partition_categorization?.enabled === true;
+  }
+
+  public set perPartitionCategorization(enabled: boolean) {
+    this._initPerPartitionCategorization();
+    this._job_config.analysis_config.per_partition_categorization!.enabled = enabled;
+    if (enabled === false) {
+      this.categorizationPerPartitionField = null;
+    }
+  }
+
+  public cloneFromExistingJob(job: Job, datafeed: Datafeed) {
+    this._overrideConfigs(job, datafeed);
+    this.createdBy = CREATED_BY_LABEL.CATEGORIZATION;
+    const detectors = getRichDetectors(job, datafeed, this.additionalFields, false);
+
+    const dtr = detectors[0];
+    if (dtr !== undefined && dtr.agg !== null && dtr.field !== null) {
+      const detectorType =
+        dtr.agg.id === ML_JOB_AGGREGATION.COUNT
+          ? ML_JOB_AGGREGATION.COUNT
+          : ML_JOB_AGGREGATION.RARE;
+
+      const bs = job.analysis_config.bucket_span;
+      this.setDetectorType(detectorType);
+      if (dtr.partitionField !== null) {
+        this.categorizationPerPartitionField = dtr.partitionField.id;
+      }
+
+      // set the bucketspan back to the original value
+      // as setDetectorType applies a default
+      this.bucketSpan = bs;
+    }
+  }
 }

x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts

@@ -631,7 +631,7 @@ export class JobCreator {
     return JSON.stringify(this._datafeed_config, null, 2);
   }
 
-  private _initPerPartitionCategorization() {
+  protected _initPerPartitionCategorization() {
     if (this._job_config.analysis_config.per_partition_categorization === undefined) {
       this._job_config.analysis_config.per_partition_categorization = {};
     }

x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_item.tsx

@@ -21,6 +21,7 @@ import { ModuleJobUI } from '../page';
 import { SETUP_RESULTS_WIDTH } from './module_jobs';
 import { tabColor } from '../../../../../../common/util/group_color_utils';
 import { JobOverride } from '../../../../../../common/types/modules';
+import { extractErrorMessage } from '../../../../../../common/util/errors';
 
 interface JobItemProps {
   job: ModuleJobUI;
@@ -94,13 +95,13 @@ export const JobItem: FC<JobItemProps> = memo(
 
           {setupResult && setupResult.error && (
             <EuiText size="xs" color="danger">
-              {setupResult.error.msg}
+              {extractErrorMessage(setupResult.error)}
             </EuiText>
           )}
 
           {datafeedResult && datafeedResult.error && (
             <EuiText size="xs" color="danger">
-              {datafeedResult.error.msg}
+              {extractErrorMessage(datafeedResult.error)}
             </EuiText>
           )}
         </EuiFlexItem>

x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/kibana_objects.tsx

@@ -18,6 +18,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { KibanaObjectUi } from '../page';
+import { extractErrorMessage } from '../../../../../../common/util/errors';
 
 export interface KibanaObjectItemProps {
   objectType: string;
@@ -57,7 +58,7 @@ export const KibanaObjects: FC<KibanaObjectItemProps> = memo(
                       </EuiText>
                       {success === false && error !== undefined && (
                         <EuiText size="xs" color="danger">
-                          {error.message}
+                          {extractErrorMessage(error)}
                         </EuiText>
                       )}
                     </EuiFlexItem>

x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts

@@ -58,6 +58,7 @@ export async function fetchESUsage(
         {
           timestamp: {
             order: 'desc',
+            unmapped_type: 'long',
           },
         },
       ],

x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts

@@ -27,6 +27,7 @@ export async function fetchLicenseType(
         {
           timestamp: {
             order: 'desc',
+            unmapped_type: 'long',
           },
         },
       ],

x-pack/plugins/monitoring/server/lib/alerts/fetch_legacy_alerts.test.ts

@@ -70,7 +70,7 @@ describe('fetchLegacyAlerts', () => {
       ],
       body: {
         size,
-        sort: [{ timestamp: { order: 'desc' } }],
+        sort: [{ timestamp: { order: 'desc', unmapped_type: 'long' } }],
         query: {
           bool: {
             minimum_should_match: 1,

x-pack/plugins/monitoring/server/lib/alerts/fetch_legacy_alerts.ts

@@ -28,6 +28,7 @@ export async function fetchLegacyAlerts(
         {
           timestamp: {
             order: 'desc',
+            unmapped_type: 'long',
           },
         },
       ],

x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts

@@ -97,6 +97,7 @@ export async function fetchMissingMonitoringData(
                       {
                         timestamp: {
                           order: 'desc',
+                          unmapped_type: 'long',
                         },
                       },
                     ],

x-pack/plugins/monitoring/server/lib/beats/get_beats.ts

@@ -151,7 +151,7 @@ export async function getBeats(req: LegacyRequest, beatsIndexPattern: string, cl
         inner_hits: {
           name: 'earliest',
           size: 1,
-          sort: [{ 'beats_stats.timestamp': 'asc' }],
+          sort: [{ 'beats_stats.timestamp': { order: 'asc', unmapped_type: 'long' } }],
         },
       },
       sort: [

x-pack/plugins/uptime/public/state/api/ml_anomaly.ts

@@ -13,6 +13,7 @@ import {
   JobExistResult,
   MlCapabilitiesResponse,
 } from '../../../../../plugins/ml/public';
+import { extractErrorMessage } from '../../../../../plugins/ml/common';
 import {
   CreateMLJobSuccess,
   DeleteJobResults,
@@ -62,7 +63,7 @@ export const createMLJob = async ({
       };
     } else {
       const { error } = jobResponse;
-      throw new Error(error?.msg);
+      throw new Error(extractErrorMessage(error));
     }
   } else {
     return null;