[ML] Anomaly Detection: add anomalies map to explorer for jobs with 'lat_long' function

x-pack/plugins/ml/common/util/job_utils.test.ts

@@ -281,6 +281,7 @@ describe('ML - job utils', () => {
       expect(isSourceDataChartableForDetector(job, 22)).toBe(true);
       expect(isSourceDataChartableForDetector(job, 23)).toBe(true);
       expect(isSourceDataChartableForDetector(job, 24)).toBe(true);
+      expect(isSourceDataChartableForDetector(job, 36)).toBe(true);
       expect(isSourceDataChartableForDetector(job, 37)).toBe(true);
     });
 
@@ -296,7 +297,6 @@ describe('ML - job utils', () => {
       expect(isSourceDataChartableForDetector(job, 33)).toBe(false);
       expect(isSourceDataChartableForDetector(job, 34)).toBe(false);
       expect(isSourceDataChartableForDetector(job, 35)).toBe(false);
-      expect(isSourceDataChartableForDetector(job, 36)).toBe(false);
     });
   });
 

x-pack/plugins/ml/common/util/job_utils.ts

@@ -93,7 +93,8 @@ export function isSourceDataChartableForDetector(job: CombinedJob, detectorIndex
     // Note that the 'function' field in a record contains what the user entered e.g. 'high_count',
     // whereas the 'function_description' field holds an ML-built display hint for function e.g. 'count'.
     isSourceDataChartable =
-      mlFunctionToESAggregation(functionName) !== null &&
+      (mlFunctionToESAggregation(functionName) !== null ||
+        functionName === ML_JOB_AGGREGATION.LAT_LONG) &&
       dtr.by_field_name !== MLCATEGORY &&
       dtr.partition_field_name !== MLCATEGORY &&
       dtr.over_field_name !== MLCATEGORY;

x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx

@@ -8,6 +8,7 @@ import React, { useEffect, useRef, useState } from 'react';
 
 import { htmlIdGenerator } from '@elastic/eui';
 import { LayerDescriptor } from '../../../../../maps/common/descriptor_types';
+import { INITIAL_LOCATION } from '../../../../../maps/common/constants';
 import {
   MapEmbeddable,
   MapEmbeddableInput,
@@ -81,21 +82,13 @@ export function MlEmbeddedMapComponent({
         viewMode: ViewMode.VIEW,
         isLayerTOCOpen: false,
         hideFilterActions: true,
-        // Zoom Lat/Lon values are set to make sure map is in center in the panel
-        // It will also omit Greenland/Antarctica etc. NOTE: Can be removed when initialLocation is set
-        mapCenter: {
-          lon: 11,
-          lat: 20,
-          zoom: 1,
-        },
         // can use mapSettings to center map on anomalies
         mapSettings: {
           disableInteractive: false,
           hideToolbarOverlay: false,
           hideLayerControl: false,
           hideViewControl: false,
-          // Doesn't currently work with GEO_JSON. Will uncomment when https://github.com/elastic/kibana/pull/88294 is in
-          // initialLocation: INITIAL_LOCATION.AUTO_FIT_TO_BOUNDS, // this will startup based on data-extent
+          initialLocation: INITIAL_LOCATION.AUTO_FIT_TO_BOUNDS, // this will startup based on data-extent
           autoFitToDataBounds: true, // this will auto-fit when there are changes to the filter and/or query
         },
       };

x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_embedded_map.tsx

@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState, useEffect } from 'react';
+import { Dictionary } from '../../../../common/types/common';
+import { LayerDescriptor } from '../../../../../maps/common/descriptor_types';
+import { getMLAnomaliesActualLayer, getMLAnomaliesTypicalLayer } from './map_config';
+import { MlEmbeddedMapComponent } from '../../components/ml_embedded_map';
+interface Props {
+  seriesConfig: Dictionary<any>;
+}
+
+export function EmbeddedMapComponentWrapper({ seriesConfig }: Props) {
+  const [layerList, setLayerList] = useState<LayerDescriptor[]>([]);
+
+  useEffect(() => {
+    if (seriesConfig.mapData && seriesConfig.mapData.length > 0) {
+      setLayerList([
+        getMLAnomaliesActualLayer(seriesConfig.mapData),
+        getMLAnomaliesTypicalLayer(seriesConfig.mapData),
+      ]);
+    }
+  }, [seriesConfig]);
+
+  return (
+    <div data-test-subj="xpack.ml.explorer.embeddedMap" style={{ width: '100%', height: 300 }}>
+      <MlEmbeddedMapComponent layerList={layerList} />
+    </div>
+  );
+}

x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.js

@@ -22,6 +22,7 @@ import {
 } from '../../util/chart_utils';
 import { ExplorerChartDistribution } from './explorer_chart_distribution';
 import { ExplorerChartSingleMetric } from './explorer_chart_single_metric';
+import { EmbeddedMapComponentWrapper } from './explorer_chart_embedded_map';
 import { ExplorerChartLabel } from './components/explorer_chart_label';
 
 import { CHART_TYPE } from '../explorer_constants';
@@ -30,6 +31,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { MlTooltipComponent } from '../../components/chart_tooltip';
 import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { ML_APP_URL_GENERATOR } from '../../../../common/constants/ml_url_generator';
+import { ML_JOB_AGGREGATION } from '../../../../common/constants/aggregation_types';
 import { addItemToRecentlyAccessed } from '../../util/recently_accessed';
 import { ExplorerChartsErrorCallOuts } from './explorer_charts_error_callouts';
 
@@ -43,6 +45,9 @@ const textViewButton = i18n.translate(
     defaultMessage: 'Open in Single Metric Viewer',
   }
 );
+const mapsPluginMessage = i18n.translate('xpack.ml.explorer.charts.mapsPluginMissingMessage', {
+  defaultMessage: 'maps or embeddable start plugin not found',
+});
 
 // create a somewhat unique ID
 // from charts metadata for React's key attribute
@@ -67,8 +72,8 @@ function ExplorerChartContainer({
   useEffect(() => {
     let isCancelled = false;
     const generateLink = async () => {
-      const singleMetricViewerLink = await getExploreSeriesLink(mlUrlGenerator, series);
-      if (!isCancelled) {
+      if (!isCancelled && series.functionDescription !== ML_JOB_AGGREGATION.LAT_LONG) {
+        const singleMetricViewerLink = await getExploreSeriesLink(mlUrlGenerator, series);
         setExplorerSeriesLink(singleMetricViewerLink);
       }
     };
@@ -150,6 +155,18 @@ function ExplorerChartContainer({
         </EuiFlexItem>
       </EuiFlexGroup>
       {(() => {
+        if (chartType === CHART_TYPE.GEO_MAP) {
+          return (
+            <MlTooltipComponent>
+              {(tooltipService) => (
+                <EmbeddedMapComponentWrapper
+                  seriesConfig={series}
+                  tooltipService={tooltipService}
+                />
+              )}
+            </MlTooltipComponent>
+          );
+        }
         if (
           chartType === CHART_TYPE.EVENT_DISTRIBUTION ||
           chartType === CHART_TYPE.POPULATION_DISTRIBUTION
@@ -167,18 +184,20 @@ function ExplorerChartContainer({
             </MlTooltipComponent>
           );
         }
-        return (
-          <MlTooltipComponent>
-            {(tooltipService) => (
-              <ExplorerChartSingleMetric
-                tooManyBuckets={tooManyBuckets}
-                seriesConfig={series}
-                severity={severity}
-                tooltipService={tooltipService}
-              />
-            )}
-          </MlTooltipComponent>
-        );
+        if (chartType === CHART_TYPE.SINGLE_METRIC) {
+          return (
+            <MlTooltipComponent>
+              {(tooltipService) => (
+                <ExplorerChartSingleMetric
+                  tooManyBuckets={tooManyBuckets}
+                  seriesConfig={series}
+                  severity={severity}
+                  tooltipService={tooltipService}
+                />
+              )}
+            </MlTooltipComponent>
+          );
+        }
       })()}
     </React.Fragment>
   );
@@ -199,22 +218,45 @@ export const ExplorerChartsContainerUI = ({
       share: {
         urlGenerators: { getUrlGenerator },
       },
+      embeddable: embeddablePlugin,
+      maps: mapsPlugin,
     },
   } = kibana;
+
+  let seriesToPlotFiltered;
+
+  if (!embeddablePlugin || !mapsPlugin) {
+    seriesToPlotFiltered = [];
+    // Show missing plugin callout
+    seriesToPlot.forEach((series) => {
+      if (series.functionDescription === 'lat_long') {
+        if (errorMessages[mapsPluginMessage] === undefined) {
+          errorMessages[mapsPluginMessage] = new Set([series.jobId]);
+        } else {
+          errorMessages[mapsPluginMessage].add(series.jobId);
+        }
+      } else {
+        seriesToPlotFiltered.push(series);
+      }
+    });
+  }
+
+  const seriesToUse = seriesToPlotFiltered !== undefined ? seriesToPlotFiltered : seriesToPlot;
+
   const mlUrlGenerator = useMemo(() => getUrlGenerator(ML_APP_URL_GENERATOR), [getUrlGenerator]);
 
   // <EuiFlexGrid> doesn't allow a setting of `columns={1}` when chartsPerRow would be 1.
   // If that's the case we trick it doing that with the following settings:
   const chartsWidth = chartsPerRow === 1 ? 'calc(100% - 20px)' : 'auto';
   const chartsColumns = chartsPerRow === 1 ? 0 : chartsPerRow;
 
-  const wrapLabel = seriesToPlot.some((series) => isLabelLengthAboveThreshold(series));
+  const wrapLabel = seriesToUse.some((series) => isLabelLengthAboveThreshold(series));
   return (
     <>
       <ExplorerChartsErrorCallOuts errorMessagesByType={errorMessages} />
       <EuiFlexGrid columns={chartsColumns}>
-        {seriesToPlot.length > 0 &&
-          seriesToPlot.map((series) => (
+        {seriesToUse.length > 0 &&
+          seriesToUse.map((series) => (
             <EuiFlexItem
               key={getChartId(series)}
               className="ml-explorer-chart-container"

x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container_service.js

@@ -28,6 +28,7 @@ import { mlJobService } from '../../services/job_service';
 import { explorerService } from '../explorer_dashboard_service';
 
 import { CHART_TYPE } from '../explorer_constants';
+import { ML_JOB_AGGREGATION } from '../../../../common/constants/aggregation_types';
 import { i18n } from '@kbn/i18n';
 import { SWIM_LANE_LABEL_WIDTH } from '../swimlane_container';
 
@@ -77,7 +78,50 @@ export const anomalyDataChange = function (
   // For now just take first 6 (or 8 if 4 charts per row).
   const maxSeriesToPlot = Math.max(chartsPerRow * 2, 6);
   const recordsToPlot = allSeriesRecords.slice(0, maxSeriesToPlot);
+  const hasGeoData = recordsToPlot.find(
+    (record) =>
+      (record.function_description || recordsToPlot.function) === ML_JOB_AGGREGATION.LAT_LONG
+  );
+
   const seriesConfigs = recordsToPlot.map(buildConfig);
+  const seriesConfigsNoGeoData = [];
+
+  // initialize the charts with loading indicators
+  data.seriesToPlot = seriesConfigs.map((config) => ({
+    ...config,
+    loading: true,
+    chartData: null,
+  }));
+
+  const mapData = [];
+
+  if (hasGeoData !== undefined) {
+    for (let i = 0; i < seriesConfigs.length; i++) {
+      const config = seriesConfigs[i];
+      let records;
+      if (config.detectorLabel.includes(ML_JOB_AGGREGATION.LAT_LONG)) {
+        if (config.entityFields.length) {
+          records = [
+            recordsToPlot.find((record) => {
+              const entityFieldName = config.entityFields[0].fieldName;
+              const entityFieldValue = config.entityFields[0].fieldValue;
+              return (record[entityFieldName] && record[entityFieldName][0]) === entityFieldValue;
+            }),
+          ];
+        } else {
+          records = recordsToPlot;
+        }
+
+        mapData.push({
+          ...config,
+          loading: false,
+          mapData: records,
+        });
+      } else {
+        seriesConfigsNoGeoData.push(config);
+      }
+    }
+  }
 
   // Calculate the time range of the charts, which is a function of the chart width and max job bucket span.
   data.tooManyBuckets = false;
@@ -92,13 +136,6 @@ export const anomalyDataChange = function (
   );
   data.tooManyBuckets = tooManyBuckets;
 
-  // initialize the charts with loading indicators
-  data.seriesToPlot = seriesConfigs.map((config) => ({
-    ...config,
-    loading: true,
-    chartData: null,
-  }));
-
   data.errorMessages = errorMessages;
 
   explorerService.setCharts({ ...data });
@@ -269,22 +306,27 @@ export const anomalyDataChange = function (
   // only after that trigger data processing and page render.
   // TODO - if query returns no results e.g. source data has been deleted,
   // display a message saying 'No data between earliest/latest'.
-  const seriesPromises = seriesConfigs.map((seriesConfig) =>
-    Promise.all([
-      getMetricData(seriesConfig, chartRange),
-      getRecordsForCriteria(seriesConfig, chartRange),
-      getScheduledEvents(seriesConfig, chartRange),
-      getEventDistribution(seriesConfig, chartRange),
-    ])
-  );
+  const seriesPromises = [];
+  // Use seriesConfigs list without geo data config so indices match up after seriesPromises are resolved and we map through the responses
+  const seriesCongifsForPromises = hasGeoData ? seriesConfigsNoGeoData : seriesConfigs;
+  seriesCongifsForPromises.forEach((seriesConfig) => {
+    seriesPromises.push(
+      Promise.all([
+        getMetricData(seriesConfig, chartRange),
+        getRecordsForCriteria(seriesConfig, chartRange),
+        getScheduledEvents(seriesConfig, chartRange),
+        getEventDistribution(seriesConfig, chartRange),
+      ])
+    );
+  });
 
   function processChartData(response, seriesIndex) {
     const metricData = response[0].results;
     const records = response[1].records;
-    const jobId = seriesConfigs[seriesIndex].jobId;
+    const jobId = seriesCongifsForPromises[seriesIndex].jobId;
     const scheduledEvents = response[2].events[jobId];
     const eventDistribution = response[3];
-    const chartType = getChartType(seriesConfigs[seriesIndex]);
+    const chartType = getChartType(seriesCongifsForPromises[seriesIndex]);
 
     // Sort records in ascending time order matching up with chart data
     records.sort((recordA, recordB) => {
@@ -409,16 +451,25 @@ export const anomalyDataChange = function (
       );
       const overallChartLimits = chartLimits(allDataPoints);
 
-      data.seriesToPlot = response.map((d, i) => ({
-        ...seriesConfigs[i],
-        loading: false,
-        chartData: processedData[i],
-        plotEarliest: chartRange.min,
-        plotLatest: chartRange.max,
-        selectedEarliest: selectedEarliestMs,
-        selectedLatest: selectedLatestMs,
-        chartLimits: USE_OVERALL_CHART_LIMITS ? overallChartLimits : chartLimits(processedData[i]),
-      }));
+      data.seriesToPlot = response.map((d, i) => {
+        return {
+          ...seriesCongifsForPromises[i],
+          loading: false,
+          chartData: processedData[i],
+          plotEarliest: chartRange.min,
+          plotLatest: chartRange.max,
+          selectedEarliest: selectedEarliestMs,
+          selectedLatest: selectedLatestMs,
+          chartLimits: USE_OVERALL_CHART_LIMITS
+            ? overallChartLimits
+            : chartLimits(processedData[i]),
+        };
+      });
+
+      if (mapData.length) {
+        // push map data in if it's available
+        data.seriesToPlot.push(...mapData);
+      }
       explorerService.setCharts({ ...data });
     })
     .catch((error) => {