Merge branch 'master' of github.com:elastic/kibana into ts-project-re…

…fs-es_ui/grokdebugger

docs/setup/upgrade/upgrade-migrations.asciidoc

@@ -19,17 +19,16 @@ Saved objects are stored in two indices:
 * `.kibana_{kibana_version}_001`, or if the `kibana.index` configuration setting is set `.{kibana.index}_{kibana_version}_001`. E.g. for Kibana v7.12.0 `.kibana_7.12.0_001`.
 * `.kibana_task_manager_{kibana_version}_001`, or if the `xpack.tasks.index` configuration setting is set `.{xpack.tasks.index}_{kibana_version}_001` E.g. for Kibana v7.12.0 `.kibana_task_manager_7.12.0_001`.
 
-The index aliases `.kibana` and `.kibana_task_manager` will always point to the most up-to-date version indices.
+The index aliases `.kibana` and `.kibana_task_manager` will always point to
+the most up-to-date saved object indices.
 
 The first time a newer {kib} starts, it will first perform an upgrade migration before starting plugins or serving HTTP traffic. To prevent losing acknowledged writes old nodes should be shutdown before starting the upgrade. To reduce the likelihood of old nodes losing acknowledged writes, {kib} 7.12.0 and later will add a write block to the outdated index. Table 1 lists the saved objects indices used by previous versions of {kib}.
 
 .Saved object indices and aliases per {kib} version
 [options="header"]
-[cols="a,a,a"]
 |=======================
-|Upgrading from version | Outdated index (alias) | Upgraded index (alias)
-| 6.0.0 through 6.4.x    | `.kibana`     1.3+^.^| `.kibana_7.12.0_001`
-(`.kibana` alias)
+|Upgrading from version | Outdated index (alias)
+| 6.0.0 through 6.4.x    | `.kibana`     
 
 `.kibana_task_manager_7.12.0_001` (`.kibana_task_manager` alias)
 | 6.5.0 through 7.3.x    | `.kibana_N` (`.kibana` alias)

packages/kbn-telemetry-tools/src/tools/tasks/check_matching_schemas_task.ts

@@ -23,7 +23,7 @@ export function checkMatchingSchemasTask({ roots }: TaskContext, throwOnDiff: bo
         root.esMappingDiffs = Object.keys(differences);
         if (root.esMappingDiffs.length && throwOnDiff) {
           throw Error(
-            `The following changes must be persisted in ${fullPath} file. Use '--fix' to update.\n${JSON.stringify(
+            `The following changes must be persisted in ${fullPath} file. Run 'node scripts/telemetry_check --fix' to update.\n${JSON.stringify(
               differences,
               null,
               2

x-pack/plugins/lens/public/app_plugin/app.tsx

@@ -370,6 +370,11 @@ export function App({
     state.persistedDoc?.state,
   ]);
 
+  const tagsIds =
+    state.persistedDoc && savedObjectsTagging
+      ? savedObjectsTagging.ui.getTagIdsFromReferences(state.persistedDoc.references)
+      : [];
+
   const runSave = async (
     saveProps: Omit<OnSaveProps, 'onTitleDuplicate' | 'newDescription'> & {
       returnToOrigin: boolean;
@@ -385,8 +390,11 @@ export function App({
     }
 
     let references = lastKnownDoc.references;
-    if (savedObjectsTagging && saveProps.newTags) {
-      references = savedObjectsTagging.ui.updateTagsReferences(references, saveProps.newTags);
+    if (savedObjectsTagging) {
+      references = savedObjectsTagging.ui.updateTagsReferences(
+        references,
+        saveProps.newTags || tagsIds
+      );
     }
 
     const docToSave = {
@@ -586,11 +594,6 @@ export function App({
     },
   });
 
-  const tagsIds =
-    state.persistedDoc && savedObjectsTagging
-      ? savedObjectsTagging.ui.getTagIdsFromReferences(state.persistedDoc.references)
-      : [];
-
   return (
     <>
       <div className="lnsApp">

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

@@ -78,6 +78,18 @@ export function isTimeSeriesViewDetector(job: CombinedJob, detectorIndex: number
   );
 }
 
+// Returns a flag to indicate whether the specified job is suitable for embedded map viewing.
+export function isMappableJob(job: CombinedJob, detectorIndex: number): boolean {
+  let isMappable = false;
+  const { detectors } = job.analysis_config;
+  if (detectorIndex >= 0 && detectorIndex < detectors.length) {
+    const dtr = detectors[detectorIndex];
+    const functionName = dtr.function;
+    isMappable = functionName === ML_JOB_AGGREGATION.LAT_LONG;
+  }
+  return isMappable;
+}
+
 // Returns a flag to indicate whether the source data can be plotted in a time
 // series chart for the specified detector.
 export function isSourceDataChartableForDetector(job: CombinedJob, detectorIndex: number): boolean {

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"