Merge branch 'master' into bugfix/console_example

Author: elasticmachine

docs/user/alerting/action-types/pagerduty.asciidoc

@@ -68,11 +68,11 @@ Then, select the *Integrations* tab and click the *New Integration* button.
 * If you are creating a new service for your integration,
 go to
 https://support.pagerduty.com/docs/services-and-integrations#section-configuring-services-and-integrations[Configuring Services and Integrations]
-and follow the steps outlined in the *Create a New Service* section, selecting *Elastic* as the *Integration Type* in step 4.
+and follow the steps outlined in the *Create a New Service* section, selecting *Elastic Alerts* as the *Integration Type* in step 4.
 Continue with the <<pagerduty-in-elastic, In Elastic>> section once you have finished these steps.
 
 . Enter an *Integration Name* in the format Elastic-service-name (for example, Elastic-Alerting or Kibana-APM-Alerting)
-and select Elastic from the *Integration Type* menu.
+and select *Elastic Alerts* from the *Integration Type* menu.
 . Click *Add Integration* to save your new integration.
 +
 You will be redirected to the *Integrations* tab for your service. An Integration Key is generated on this screen.

test/functional/page_objects/management/saved_objects_page.ts

@@ -87,13 +87,15 @@ export function SavedObjectsPageProvider({ getService, getPageObjects }: FtrProv
 
     async waitTableIsLoaded() {
       return retry.try(async () => {
-        const exists = await find.existsByDisplayedByCssSelector(
-          '*[data-test-subj="savedObjectsTable"] .euiBasicTable-loading'
+        const isLoaded = await find.existsByDisplayedByCssSelector(
+          '*[data-test-subj="savedObjectsTable"] :not(.euiBasicTable-loading)'
         );
-        if (exists) {
+
+        if (isLoaded) {
+          return true;
+        } else {
           throw new Error('Waiting');
         }
-        return true;
       });
     }
 

x-pack/plugins/ml/common/constants/field_types.ts

@@ -17,3 +17,6 @@ export enum ML_JOB_FIELD_TYPES {
 
 export const MLCATEGORY = 'mlcategory';
 export const DOC_COUNT = 'doc_count';
+
+// List of system fields we don't want to display.
+export const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];

x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts

@@ -65,7 +65,7 @@ export interface Detector {
   function: string;
   over_field_name?: string;
   partition_field_name?: string;
-  use_null?: string;
+  use_null?: boolean;
   custom_rules?: CustomRule[];
 }
 export interface AnalysisLimits {
@@ -80,7 +80,7 @@ export interface DataDescription {
 }
 
 export interface ModelPlotConfig {
-  enabled: boolean;
+  enabled?: boolean;
   annotations_enabled?: boolean;
   terms?: string;
 }

x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts

@@ -12,9 +12,6 @@ import { BASIC_NUMERICAL_TYPES, EXTENDED_NUMERICAL_TYPES } from '../../../../com
 
 export const CATEGORICAL_TYPES = new Set(['ip', 'keyword']);
 
-// List of system fields we want to ignore for the numeric field check.
-export const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];
-
 // Regression supports numeric fields. Classification supports categorical, numeric, and boolean.
 export const shouldAddAsDepVarOption = (field: Field, jobType: AnalyticsJobType) => {
   if (field.id === EVENT_RATE_FIELD_ID) return false;

x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx

@@ -11,8 +11,9 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { AnalyticsJobType } from '../../../analytics_management/hooks/use_create_analytics_form/state';
 import { ANALYSIS_CONFIG_TYPE } from '../../../../common/analytics';
 import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../common/types/fields';
+import { OMIT_FIELDS } from '../../../../../../../common/constants/field_types';
 import { BASIC_NUMERICAL_TYPES, EXTENDED_NUMERICAL_TYPES } from '../../../../common/fields';
-import { OMIT_FIELDS, CATEGORICAL_TYPES } from './form_options_validation';
+import { CATEGORICAL_TYPES } from './form_options_validation';
 import { ES_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
 import { newJobCapsService } from '../../../../../services/new_job_capabilities_service';
 

x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx

@@ -39,6 +39,7 @@ import {
 import { getAnalyticsFactory } from '../../services/analytics_service';
 import { getTaskStateBadge, getJobTypeBadge, useColumns } from './use_columns';
 import { ExpandedRow } from './expanded_row';
+import { stringMatch } from '../../../../../util/string_utils';
 import {
   ProgressBar,
   mlInMemoryTableFactory,
@@ -65,14 +66,6 @@ function getItemIdToExpandedRowMap(
   }, {} as ItemIdToExpandedRowMap);
 }
 
-function stringMatch(str: string | undefined, substr: any) {
-  return (
-    typeof str === 'string' &&
-    typeof substr === 'string' &&
-    (str.toLowerCase().match(substr.toLowerCase()) === null) === false
-  );
-}
-
 const MlInMemoryTable = mlInMemoryTableFactory<DataFrameAnalyticsListRow>();
 
 interface Props {

x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts

@@ -10,13 +10,12 @@ import { getToastNotifications } from '../../../util/dependency_cache';
 import { IndexPattern } from '../../../../../../../../src/plugins/data/public';
 
 import { SavedSearchQuery } from '../../../contexts/ml';
+import { OMIT_FIELDS } from '../../../../../common/constants/field_types';
 import { IndexPatternTitle } from '../../../../../common/types/kibana';
 
 import { ml } from '../../../services/ml_api_service';
 import { FieldRequestConfig } from '../common';
 
-// List of system fields we don't want to display.
-const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];
 // Maximum number of examples to obtain for text type fields.
 const MAX_EXAMPLES_DEFAULT: number = 10;
 

x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js

@@ -11,6 +11,7 @@ import rison from 'rison-node';
 import { mlJobService } from '../../../services/job_service';
 import { ml } from '../../../services/ml_api_service';
 import { getToastNotifications } from '../../../util/dependency_cache';
+import { stringMatch } from '../../../util/string_utils';
 import { JOB_STATE, DATAFEED_STATE } from '../../../../../common/constants/states';
 import { parseInterval } from '../../../../../common/util/parse_interval';
 import { i18n } from '@kbn/i18n';
@@ -350,14 +351,6 @@ export function checkForAutoStartDatafeed() {
   }
 }
 
-function stringMatch(str, substr) {
-  return (
-    typeof str === 'string' &&
-    typeof substr === 'string' &&
-    (str.toLowerCase().match(substr.toLowerCase()) === null) === false
-  );
-}
-
 function jobProperty(job, prop) {
   const propMap = {
     job_state: 'jobState',

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

@@ -226,23 +226,39 @@ export class JobCreator {
     this._calendars = calendars;
   }
 
-  public set modelPlot(enable: boolean) {
-    if (enable) {
-      this._job_config.model_plot_config = {
-        enabled: true,
-      };
-    } else {
-      delete this._job_config.model_plot_config;
+  private _initModelPlotConfig() {
+    // initialize configs to false if they are missing
+    if (this._job_config.model_plot_config === undefined) {
+      this._job_config.model_plot_config = {};
+    }
+    if (this._job_config.model_plot_config.enabled === undefined) {
+      this._job_config.model_plot_config.enabled = false;
+    }
+    if (this._job_config.model_plot_config.annotations_enabled === undefined) {
+      this._job_config.model_plot_config.annotations_enabled = false;
     }
   }
 
+  public set modelPlot(enable: boolean) {
+    this._initModelPlotConfig();
+    this._job_config.model_plot_config!.enabled = enable;
+  }
   public get modelPlot() {
     return (
       this._job_config.model_plot_config !== undefined &&
       this._job_config.model_plot_config.enabled === true
     );
   }
 
+  public set modelChangeAnnotations(enable: boolean) {
+    this._initModelPlotConfig();
+    this._job_config.model_plot_config!.annotations_enabled = enable;
+  }
+
+  public get modelChangeAnnotations() {
+    return this._job_config.model_plot_config?.annotations_enabled === true;
+  }
+
   public set useDedicatedIndex(enable: boolean) {
     this._useDedicatedIndex = enable;
     if (enable) {