Merge branch 'master' into elastic#60333

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

@@ -23,6 +23,7 @@
 |  Function | Description |
 |  --- | --- |
 |  [getDefaultSearchParams(config)](./kibana-plugin-plugins-data-server.getdefaultsearchparams.md) |  |
+|  [getTotalLoaded({ total, failed, successful })](./kibana-plugin-plugins-data-server.gettotalloaded.md) |  |
 |  [parseInterval(interval)](./kibana-plugin-plugins-data-server.parseinterval.md) |  |
 |  [plugin(initializerContext)](./kibana-plugin-plugins-data-server.plugin.md) | Static code to be shared externally |
 |  [shouldReadFieldFromDocValues(aggregatable, esType)](./kibana-plugin-plugins-data-server.shouldreadfieldfromdocvalues.md) |  |

package.json

@@ -170,8 +170,8 @@
     "deepmerge": "^4.2.2",
     "del": "^5.1.0",
     "elastic-apm-node": "^3.2.0",
-    "elasticsearch": "^16.5.0",
-    "elasticsearch-browser": "^16.5.0",
+    "elasticsearch": "^16.7.0",
+    "elasticsearch-browser": "^16.7.0",
     "execa": "^4.0.0",
     "expiry-js": "0.1.7",
     "fast-deep-equal": "^3.1.1",

src/legacy/core_plugins/kibana/public/discover/kibana_services.ts

@@ -47,10 +47,15 @@ export function setServices(newServices: any) {
   services = newServices;
 }
 
+export const [getUrlTracker, setUrlTracker] = createGetterSetter<{
+  setTrackedUrl: (url: string) => void;
+}>('urlTracker');
+
 // EXPORT legacy static dependencies, should be migrated when available in a new version;
 export { angular };
 export { wrapInI18nContext } from 'ui/i18n';
 import { search } from '../../../../../plugins/data/public';
+import { createGetterSetter } from '../../../../../plugins/kibana_utils/common';
 export const { getRequestInspectorStats, getResponseInspectorStats, tabifyAggResponse } = search;
 export {
   unhashUrl,

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js

@@ -44,6 +44,7 @@ import {
   getRequestInspectorStats,
   getResponseInspectorStats,
   getServices,
+  getUrlTracker,
   unhashUrl,
   subscribeWithScope,
   tabifyAggResponse,
@@ -160,6 +161,9 @@ app.config($routeProvider => {
                       '/management/kibana/objects/savedSearches/' + $route.current.params.id,
                   },
                   toastNotifications,
+                  onBeforeRedirect() {
+                    getUrlTracker().setTrackedUrl('/discover');
+                  },
                 })
               ),
           });

src/legacy/core_plugins/kibana/public/discover/plugin.ts

@@ -31,7 +31,7 @@ import { registerFeature } from './np_ready/register_feature';
 import './kibana_services';
 import { EmbeddableStart, EmbeddableSetup } from '../../../../../plugins/embeddable/public';
 import { getInnerAngularModule, getInnerAngularModuleEmbeddable } from './get_inner_angular';
-import { setAngularModule, setServices } from './kibana_services';
+import { setAngularModule, setServices, setUrlTracker } from './kibana_services';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
 import { ChartsPluginStart } from '../../../../../plugins/charts/public';
 import { buildServices } from './build_services';
@@ -92,7 +92,12 @@ export class DiscoverPlugin implements Plugin<void, void> {
   public initializeServices?: () => Promise<{ core: CoreStart; plugins: DiscoverStartPlugins }>;
 
   setup(core: CoreSetup<DiscoverStartPlugins, void>, plugins: DiscoverSetupPlugins) {
-    const { appMounted, appUnMounted, stop: stopUrlTracker } = createKbnUrlTracker({
+    const {
+      appMounted,
+      appUnMounted,
+      stop: stopUrlTracker,
+      setActiveUrl: setTrackedUrl,
+    } = createKbnUrlTracker({
       baseUrl: core.http.basePath.prepend('/app/kibana'),
       defaultSubUrl: '#/discover',
       storageKey: 'lastUrl:discover',
@@ -113,6 +118,7 @@ export class DiscoverPlugin implements Plugin<void, void> {
         },
       ],
     });
+    setUrlTracker({ setTrackedUrl });
     this.stopUrlTracking = () => {
       stopUrlTracker();
     };

src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js

@@ -204,6 +204,9 @@ export function initVisualizeApp(app, deps) {
                       '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
                   },
                   toastNotifications,
+                  onBeforeRedirect() {
+                    deps.setActiveUrl(VisualizeConstants.LANDING_PAGE_PATH);
+                  },
                 })
               );
           },

src/plugins/data/server/index.ts

@@ -173,6 +173,7 @@ export {
   ISearchContext,
   TSearchStrategyProvider,
   getDefaultSearchParams,
+  getTotalLoaded,
 } from './search';
 
 // Search namespace

src/plugins/data/server/search/es_search/es_search_strategy.ts

@@ -21,7 +21,7 @@ import { APICaller } from 'kibana/server';
 import { SearchResponse } from 'elasticsearch';
 import { ES_SEARCH_STRATEGY } from '../../../common/search';
 import { ISearchStrategy, TSearchStrategyProvider } from '../i_search_strategy';
-import { getDefaultSearchParams, ISearchContext } from '..';
+import { getDefaultSearchParams, getTotalLoaded, ISearchContext } from '..';
 
 export const esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_STRATEGY> = (
   context: ISearchContext,
@@ -46,9 +46,7 @@ export const esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_
 
       // The above query will either complete or timeout and throw an error.
       // There is no progress indication on this api.
-      const { total, failed, successful } = rawResponse._shards;
-      const loaded = failed + successful;
-      return { total, loaded, rawResponse };
+      return { rawResponse, ...getTotalLoaded(rawResponse._shards) };
     },
   };
 };

src/plugins/data/server/search/es_search/get_total_loaded.test.ts

@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getTotalLoaded } from './get_total_loaded';
+
+describe('getTotalLoaded', () => {
+  it('returns the total/loaded, not including skipped', () => {
+    const result = getTotalLoaded({
+      successful: 10,
+      failed: 5,
+      skipped: 5,
+      total: 100,
+    });
+
+    expect(result).toEqual({
+      total: 100,
+      loaded: 15,
+    });
+  });
+});

src/plugins/data/server/search/es_search/get_total_loaded.ts

@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ShardsResponse } from 'elasticsearch';
+
+/**
+ * Get the `total`/`loaded` for this response (see `IKibanaSearchResponse`). Note that `skipped` is
+ * not included as it is already included in `successful`.
+ * @internal
+ */
+export function getTotalLoaded({ total, failed, successful }: ShardsResponse) {
+  const loaded = failed + successful;
+  return { total, loaded };
+}

src/plugins/data/server/search/es_search/index.ts

@@ -20,3 +20,4 @@
 export { ES_SEARCH_STRATEGY, IEsSearchRequest, IEsSearchResponse } from '../../../common/search';
 export { esSearchStrategyProvider } from './es_search_strategy';
 export { getDefaultSearchParams } from './get_default_search_params';
+export { getTotalLoaded } from './get_total_loaded';

src/plugins/data/server/search/index.ts

@@ -33,4 +33,4 @@ export { TStrategyTypes } from './strategy_types';
 
 export { TSearchStrategyProvider } from './i_search_strategy';
 
-export { getDefaultSearchParams } from './es_search';
+export { getDefaultSearchParams, getTotalLoaded } from './es_search';

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

@@ -125,6 +125,7 @@ import { SearchResponse } from 'elasticsearch';
 import { SearchShardsParams } from 'elasticsearch';
 import { SearchTemplateParams } from 'elasticsearch';
 import { ShallowPromise } from '@kbn/utility-types';
+import { ShardsResponse } from 'elasticsearch';
 import { SnapshotCreateParams } from 'elasticsearch';
 import { SnapshotCreateRepositoryParams } from 'elasticsearch';
 import { SnapshotDeleteParams } from 'elasticsearch';
@@ -330,6 +331,12 @@ export function getDefaultSearchParams(config: SharedGlobalConfig): {
     restTotalHitsAsInt: boolean;
 };
 
+// @internal
+export function getTotalLoaded({ total, failed, successful }: ShardsResponse): {
+    total: number;
+    loaded: number;
+};
+
 // Warning: (ae-missing-release-tag) "IFieldFormatsRegistry" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -730,12 +737,12 @@ export type TSearchStrategyProvider<T extends TStrategyTypes> = (context: ISearc
 // src/plugins/data/server/index.ts:102:26 - (ae-forgotten-export) The symbol "TruncateFormat" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:130:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:130:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:181:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:182:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:183:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:184:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:185:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:188:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:182:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:183:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:184:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:185:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:186:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:189:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/plugin.ts:64:14 - (ae-forgotten-export) The symbol "ISearchSetup" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)

src/plugins/kibana_utils/public/history/redirect_when_missing.tsx

@@ -37,6 +37,7 @@ export function redirectWhenMissing({
   history,
   mapping,
   toastNotifications,
+  onBeforeRedirect,
 }: {
   history: History;
   /**
@@ -48,6 +49,10 @@ export function redirectWhenMissing({
    * Toast notifications service to show toasts in error cases.
    */
   toastNotifications: ToastsSetup;
+  /**
+   * Optional callback invoked directly before a redirect is triggered
+   */
+  onBeforeRedirect?: (error: SavedObjectNotFound) => void;
 }) {
   let localMappingObject: Mapping;
 
@@ -75,6 +80,9 @@ export function redirectWhenMissing({
       text: toMountPoint(<MarkdownSimple>{error.message}</MarkdownSimple>),
     });
 
+    if (onBeforeRedirect) {
+      onBeforeRedirect(error);
+    }
     history.replace(url);
   };
 }

x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx

@@ -13,6 +13,7 @@ import React, {
   useRef,
   useState
 } from 'react';
+import { debounce } from 'lodash';
 import { isRumAgentName } from '../../../../../../../plugins/apm/common/agent_name';
 import { AGENT_NAME } from '../../../../../../../plugins/apm/common/elasticsearch_fieldnames';
 import {
@@ -171,8 +172,13 @@ export function Cytoscape({
         }
       });
     };
+    // debounce hover tracking so it doesn't spam telemetry with redundant events
+    const trackNodeEdgeHover = debounce(
+      () => trackApmEvent({ metric: 'service_map_node_or_edge_hover' }),
+      1000
+    );
     const mouseoverHandler: cytoscape.EventHandler = event => {
-      trackApmEvent({ metric: 'service_map_node_or_edge_hover' });
+      trackNodeEdgeHover();
       event.target.addClass('hover');
       event.target.connectedEdges().addClass('nodeHover');
     };

x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/NoServicesMessage.tsx

@@ -58,7 +58,7 @@ export function NoServicesMessage({ historicalDataFound, status }: Props) {
           <p>
             {i18n.translate('xpack.apm.servicesTable.7xUpgradeServerMessage', {
               defaultMessage: `Upgrading from a pre-7.x version? Make sure you've also upgraded
-              your APM server instance(s) to at least 7.0.`
+              your APM Server instance(s) to at least 7.0.`
             })}
           </p>
           <p>

x-pack/legacy/plugins/maps/public/angular/map_controller.js

@@ -312,7 +312,12 @@ app.controller(
       const savedLayerList = savedMap.getLayerList();
       const oldConfig = savedLayerList ? savedLayerList : initialLayerListConfig;
 
-      return !_.isEqual(layerListConfigOnly, oldConfig);
+      // savedMap stores layerList as a JSON string using JSON.stringify.
+      // JSON.stringify removes undefined properties from objects.
+      // savedMap.getLayerList converts the JSON string back into Javascript array of objects.
+      // Need to perform the same process for layerListConfigOnly to compare apples to apples
+      // and avoid undefined properties in layerListConfigOnly triggering unsaved changes.
+      return !_.isEqual(JSON.parse(JSON.stringify(layerListConfigOnly)), oldConfig);
     }
 
     function isOnMapNow() {

x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js

@@ -28,12 +28,20 @@ export function DynamicColorForm({
     };
     if (type === COLOR_MAP_TYPE.ORDINAL) {
       newColorOptions.useCustomColorRamp = useCustomColorMap;
-      newColorOptions.customColorRamp = customColorMap;
-      newColorOptions.color = color;
+      if (customColorMap) {
+        newColorOptions.customColorRamp = customColorMap;
+      }
+      if (color) {
+        newColorOptions.color = color;
+      }
     } else {
       newColorOptions.useCustomColorPalette = useCustomColorMap;
-      newColorOptions.customColorPalette = customColorMap;
-      newColorOptions.colorCategory = color;
+      if (customColorMap) {
+        newColorOptions.customColorPalette = customColorMap;
+      }
+      if (color) {
+        newColorOptions.colorCategory = color;
+      }
     }
 
     onDynamicStyleChange(styleProperty.getStyleName(), newColorOptions);