Merge branch 'alerting/created_at-and-updated_at' of github.com:gmmor…

…ris/kibana into alerting/created_at-and-updated_at

* 'alerting/created_at-and-updated_at' of github.com:gmmorris/kibana:
  Rename `/api/security/oidc` to `/api/security/oidc/callback`. (elastic#53886)
  Updating transitive dependencies to use [email protected] (elastic#53899)
  [Reporting/Tests] consolidate functional test configs (elastic#52671)
  [Reporting] Correct the docvalue_fields params in the search query Download CSV from Dashboard Panel (elastic#52833)
  [Test/Newsfeed] Re-enable test and add news item to be filtered (elastic#53905)
  cleanup server-log action (elastic#53326)
  [Uptime] Delete uptime eslint rule skip (elastic#50912)
  [skip-ci] Expression Lifecycle Docs (elastic#51494)
  [Endpoint] add react router to endpoint app (elastic#53808)
  [SIEM][Detection Engine] Silence 409 errors on signal creation (elastic#53859)
  [Maps] get max_result_window and max_inner_result_window from index settings (elastic#53500)
  [ML] New Platform server shim: update analytics routes to use new platform router (elastic#53521)
  fixes typo on engine detection page (elastic#53877)
  [Maps] push mapbox value extraction from VectorStyle and into DynamicStyleProperty (elastic#53806)
  Fix suggested value for time_zone in range query (elastic#53841)
  Clean up generic hooks, use react-use instead (elastic#53822)

.eslintrc.js

@@ -189,13 +189,6 @@ module.exports = {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: ['x-pack/legacy/plugins/uptime/**/*.{js,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-        'react-hooks/rules-of-hooks': 'off',
-      },
-    },
 
     /**
      * Files that require Apache 2.0 headers, settings

docs/maps/maps-aggregations.asciidoc

@@ -47,6 +47,7 @@ To enable top hits:
 . Set *Entity* to the field that identifies entities in your documents.
 This field will be used in the terms aggregation to group your documents into entity buckets.
 . Set *Documents per entity* to configure the maximum number of documents accumulated per entity.
+This setting is limited to the `index.max_inner_result_window` index setting, which defaults to 100.
 
 [role="screenshot"]
 image::maps/images/top_hits.png[]

docs/maps/vector-layer.asciidoc

@@ -15,7 +15,7 @@ See map.regionmap.* in <<settings>> for details.
 *Documents*:: Vector data from a Kibana index pattern.
 The index must contain at least one field mapped as {ref}/geo-point.html[geo_point] or {ref}/geo-shape.html[geo_shape].
 
-NOTE: Document results are limited to the first 10000 matching documents.
+NOTE: Document results are limited to the `index.max_result_window` index setting, which defaults to 10000.
 Use <<maps-aggregations, aggregations>> to plot large data sets.
 
 *Grid aggregation*:: Geospatial data grouped in grids with metrics for each gridded cell.

docs/user/canvas.asciidoc

@@ -37,6 +37,8 @@ include::{kib-repo-dir}/canvas/canvas-present-workpad.asciidoc[]
 
 include::{kib-repo-dir}/canvas/canvas-share-workpad.asciidoc[]
 
+include::{kib-repo-dir}/canvas/canvas-expression-lifecycle.asciidoc[]
+
 include::{kib-repo-dir}/canvas/canvas-function-reference.asciidoc[]
 
-include::{kib-repo-dir}/canvas/canvas-tinymath-functions.asciidoc[]
+include::{kib-repo-dir}/canvas/canvas-tinymath-functions.asciidoc[]

package.json

@@ -234,7 +234,7 @@
     "react-resize-detector": "^4.2.0",
     "react-router-dom": "^5.1.2",
     "react-sizeme": "^2.3.6",
-    "react-use": "^13.10.2",
+    "react-use": "^13.13.0",
     "reactcss": "1.2.3",
     "redux": "4.0.0",
     "redux-actions": "2.2.1",

src/legacy/core_plugins/console/server/api_server/es_6_0/filter.js

@@ -260,7 +260,7 @@ filters.range = {
     gt: 1,
     lte: 20,
     lt: 20,
-    time_zone: '+1:00',
+    time_zone: '+01:00',
     format: 'dd/MM/yyyy||yyyy',
     execution: { __one_of: ['index', 'fielddata'] },
   },

src/legacy/core_plugins/console/server/api_server/es_6_0/query/dsl.js

@@ -467,7 +467,7 @@ export function queryDsl(api) {
         __one_of: [true, false],
       },
       tie_breaker: 0,
-      time_zone: '+1:00',
+      time_zone: '+01:00',
     },
     simple_query_string: {
       __template: {
@@ -493,7 +493,7 @@ export function queryDsl(api) {
         gt: 10,
         lte: 20,
         lt: 20,
-        time_zone: '+1:00',
+        time_zone: '+01:00',
         boost: 1.0,
         format: 'dd/MM/yyyy||yyyy',
       },

src/legacy/ui/public/vis/editors/default/components/agg_params.tsx

@@ -20,10 +20,11 @@
 import React, { useReducer, useEffect, useMemo } from 'react';
 import { EuiForm, EuiAccordion, EuiSpacer, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import useUnmount from 'react-use/lib/useUnmount';
 
 import { VisState } from 'ui/vis';
-import { aggTypes, AggType, AggParam, AggConfig } from 'ui/agg_types/';
 import { IndexPattern } from 'ui/index_patterns';
+import { aggTypes, AggType, AggParam, AggConfig } from 'ui/agg_types/';
 
 import { DefaultEditorAggSelect } from './agg_select';
 import { DefaultEditorAggParam } from './agg_param';
@@ -44,9 +45,6 @@ import {
 } from './agg_params_state';
 import { editorConfigProviders } from '../../config/editor_config_providers';
 import { FixedParam, TimeIntervalParam, EditorParamConfig } from '../../config/types';
-// TODO: Below import is temporary, use `react-use` lib instead.
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { useUnmount } from '../../../../../../../plugins/kibana_react/public/util/use_unmount';
 import { AggGroupNames } from '../agg_groups';
 import { OnAggParamsChange } from './agg_common_props';
 

src/plugins/expressions/public/expression_renderer.tsx

@@ -22,9 +22,9 @@ import React from 'react';
 import classNames from 'classnames';
 import { Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';
+import useShallowCompareEffect from 'react-use/lib/useShallowCompareEffect';
 import { EuiLoadingChart, EuiProgress } from '@elastic/eui';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { useShallowCompareEffect } from '../../kibana_react/public';
 import { IExpressionLoaderParams, IInterpreterRenderHandlers, RenderError } from './types';
 import { ExpressionAST } from '../common/types';
 import { ExpressionLoader } from './loader';

src/plugins/kibana_react/public/index.ts

@@ -25,4 +25,4 @@ export * from './overlays';
 export * from './ui_settings';
 export * from './field_icon';
 export * from './table_list_view';
-export { toMountPoint, useObservable, useShallowCompareEffect } from './util';
+export { toMountPoint } from './util';

src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx

@@ -24,10 +24,10 @@ import { useUiSetting$ } from './use_ui_setting';
 import { createKibanaReactContext } from '../context';
 import { KibanaServices } from '../context/types';
 import { Subject } from 'rxjs';
-import { useObservable } from '../util/use_observable';
 import { coreMock } from '../../../../core/public/mocks';
+import useObservable from 'react-use/lib/useObservable';
 
-jest.mock('../util/use_observable');
+jest.mock('react-use/lib/useObservable');
 const useObservableSpy = (useObservable as any) as jest.SpyInstance;
 useObservableSpy.mockImplementation((observable, def) => def);
 

src/plugins/kibana_react/public/ui_settings/use_ui_setting.ts

@@ -18,8 +18,8 @@
  */
 
 import { useCallback, useMemo } from 'react';
+import useObservable from 'react-use/lib/useObservable';
 import { useKibana } from '../context';
-import { useObservable } from '../util/use_observable';
 
 /**
  * Returns the current UI-settings value.

src/plugins/kibana_react/public/util/index.ts

@@ -17,7 +17,4 @@
  * under the License.
  */
 
-export * from './use_observable';
-export * from './use_unmount';
 export * from './react_mount';
-export * from './use_shallow_compare_effect';