Merge branch '7.x' into backport/7.x/pr-53893

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[]

test/common/fixtures/plugins/newsfeed/newsfeed_simulation.ts

@@ -88,7 +88,7 @@ const mockNewsfeed = (version: string) => ({
       badge: null,
       image_url: null,
       publish_on: '2019-06-21T00:00:00',
-      expire_on: '2019-12-31T00:00:00',
+      expire_on: '2040-01-31T00:00:00',
       hash: '39ca7d409c7eb25f4c69a5a6a11309b2f5ced7ca3f9b3a0109517126e0fd91ca',
     },
     {
@@ -100,6 +100,18 @@ const mockNewsfeed = (version: string) => ({
       badge: null,
       image_url: null,
       publish_on: '2019-06-21T00:00:00',
+      expire_on: '2040-01-31T00:00:00',
+      hash: 'db445c9443eb50ea2eb15f20edf89cf0f7dac2b058b11cafc2c8c288b6e4ce2a',
+    },
+    {
+      title: { en: 'This item is expired!' },
+      description: { en: 'This should not show up.' },
+      link_text: { en: 'Generic feed-viewer could go here' },
+      link_url: { en: 'https://feeds-staging.elastic.co' },
+      languages: null,
+      badge: null,
+      image_url: null,
+      publish_on: '2019-06-21T00:00:00',
       expire_on: '2019-12-31T00:00:00',
       hash: 'db445c9443eb50ea2eb15f20edf89cf0f7dac2b058b11cafc2c8c288b6e4ce2a',
     },

test/functional/apps/home/_newsfeed.ts

@@ -25,8 +25,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
   const globalNav = getService('globalNav');
   const PageObjects = getPageObjects(['common', 'newsfeed']);
 
-  // Failing: https://github.com/elastic/kibana/issues/53860
-  describe.skip('Newsfeed', () => {
+  describe('Newsfeed', () => {
     before(async () => {
       await PageObjects.newsfeed.resetPage();
     });

x-pack/legacy/plugins/actions/server/action_type_registry.test.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { taskManagerMock } from '../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 import { ActionTypeRegistry } from './action_type_registry';
 import { ExecutorType } from './types';
 import { ActionExecutor, ExecutorError, TaskRunnerFactory } from './lib';

x-pack/legacy/plugins/actions/server/action_type_registry.ts

@@ -7,7 +7,7 @@
 import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
 import { TaskManagerSetupContract } from './shim';
-import { RunContext } from '../../task_manager';
+import { RunContext } from '../../task_manager/server';
 import { ExecutorError, TaskRunnerFactory } from './lib';
 import { ActionType } from './types';
 import { ActionsConfigurationUtilities } from './actions_config';

x-pack/legacy/plugins/actions/server/actions_client.test.ts

@@ -10,7 +10,7 @@ import { ActionTypeRegistry } from './action_type_registry';
 import { ActionsClient } from './actions_client';
 import { ExecutorType } from './types';
 import { ActionExecutor, TaskRunnerFactory } from './lib';
-import { taskManagerMock } from '../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 import { configUtilsMock } from './actions_config.mock';
 import { getActionsConfigurationUtilities } from './actions_config';
 

x-pack/legacy/plugins/actions/server/builtin_action_types/index.test.ts

@@ -6,7 +6,7 @@
 
 import { ActionExecutor, TaskRunnerFactory } from '../lib';
 import { ActionTypeRegistry } from '../action_type_registry';
-import { taskManagerMock } from '../../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
 import { registerBuiltInActionTypes } from './index';
 import { Logger } from '../../../../../../src/core/server';
 import { loggingServiceMock } from '../../../../../../src/core/server/mocks';

x-pack/legacy/plugins/actions/server/create_execute_function.test.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { taskManagerMock } from '../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 import { createExecuteFunction } from './create_execute_function';
 import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
 

x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts

@@ -7,7 +7,7 @@
 import sinon from 'sinon';
 import { ExecutorError } from './executor_error';
 import { ActionExecutor } from './action_executor';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
+import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
 import { TaskRunnerFactory } from './task_runner_factory';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { actionExecutorMock } from './action_executor.mock';

x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts

@@ -6,7 +6,7 @@
 
 import { ActionExecutorContract } from './action_executor';
 import { ExecutorError } from './executor_error';
-import { RunContext } from '../../../task_manager';
+import { RunContext } from '../../../task_manager/server';
 import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
 import { ActionTaskParams, GetBasePathFunction, SpaceIdToNamespaceFunction } from '../types';
 

x-pack/legacy/plugins/actions/server/shim.ts

@@ -8,7 +8,7 @@ import Hapi from 'hapi';
 import { Legacy } from 'kibana';
 import * as Rx from 'rxjs';
 import { ActionsConfigType } from './types';
-import { TaskManager } from '../../task_manager';
+import { TaskManager } from '../../task_manager/server';
 import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
 import KbnServer from '../../../../../src/legacy/server/kbn_server';
 import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';

x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts

@@ -6,7 +6,7 @@
 
 import { TaskRunnerFactory } from './lib';
 import { AlertTypeRegistry } from './alert_type_registry';
-import { taskManagerMock } from '../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 
 const taskManager = taskManagerMock.create();
 

x-pack/legacy/plugins/alerting/server/alert_type_registry.ts

@@ -7,7 +7,7 @@
 import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
 import { TaskRunnerFactory } from './lib';
-import { RunContext } from '../../task_manager';
+import { RunContext } from '../../task_manager/server';
 import { TaskManagerSetupContract } from './shim';
 import { AlertType } from './types';
 

x-pack/legacy/plugins/alerting/server/alerts_client.test.ts

@@ -7,9 +7,9 @@ import uuid from 'uuid';
 import { schema } from '@kbn/config-schema';
 import { AlertsClient } from './alerts_client';
 import { savedObjectsClientMock, loggingServiceMock } from '../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 import { alertTypeRegistryMock } from './alert_type_registry.mock';
-import { TaskStatus } from '../../task_manager';
+import { TaskStatus } from '../../task_manager/server';
 import { IntervalSchedule } from './types';
 import { resolvable } from './test_utils';
 

x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.test.ts

@@ -7,7 +7,7 @@
 import { Request } from 'hapi';
 import { AlertsClientFactory, ConstructorOpts } from './alerts_client_factory';
 import { alertTypeRegistryMock } from '../alert_type_registry.mock';
-import { taskManagerMock } from '../../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
 import { KibanaRequest } from '../../../../../../src/core/server';
 import { loggingServiceMock } from '../../../../../../src/core/server/mocks';
 

x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts

@@ -7,7 +7,7 @@
 import sinon from 'sinon';
 import { schema } from '@kbn/config-schema';
 import { AlertExecutorOptions } from '../types';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
+import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
 import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
 import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
 import {

x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts

@@ -5,7 +5,7 @@
  */
 
 import { Logger } from '../../../../../../src/core/server';
-import { RunContext } from '../../../task_manager';
+import { RunContext } from '../../../task_manager/server';
 import { createExecutionHandler } from './create_execution_handler';
 import { createAlertInstanceFactory } from './create_alert_instance_factory';
 import { AlertInstance } from './alert_instance';

x-pack/legacy/plugins/alerting/server/shim.ts

@@ -7,7 +7,7 @@
 import Hapi from 'hapi';
 import { Legacy } from 'kibana';
 import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
-import { TaskManager } from '../../task_manager';
+import { TaskManager } from '../../task_manager/server';
 import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
 import KbnServer from '../../../../../src/legacy/server/kbn_server';
 import {

x-pack/legacy/plugins/lens/server/usage/task.ts

@@ -16,7 +16,7 @@ import {
 } from 'elasticsearch';
 import { ESSearchResponse } from '../../../apm/typings/elasticsearch';
 import { XPackMainPlugin } from '../../../xpack_main/server/xpack_main';
-import { RunContext } from '../../../task_manager';
+import { RunContext } from '../../../task_manager/server';
 import { getVisualizationCounts } from './visualization_counts';
 
 // This task is responsible for running daily and aggregating all the Lens click event objects

x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.ts

@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash';
-import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../../task_manager/plugin';
+import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../../task_manager/server/plugin';
 import { PLUGIN_ID, VIS_TELEMETRY_TASK, VIS_USAGE_TYPE } from '../../../../constants';
 
 async function isTaskManagerReady(taskManager: TaskManagerPluginSetupContract | undefined) {

x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/register_usage_collector.ts

@@ -5,7 +5,7 @@
  */
 
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../../task_manager/plugin';
+import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../../task_manager/server/plugin';
 import { getUsageCollector } from './get_usage_collector';
 
 export function registerVisualizationsCollector(

x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/index.ts

@@ -5,12 +5,12 @@
  */
 
 import { CoreSetup, Logger } from 'kibana/server';
-import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../task_manager/plugin';
+import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../task_manager/server/plugin';
 import { PLUGIN_ID, VIS_TELEMETRY_TASK } from '../../../constants';
 import { visualizationsTaskRunner } from './visualizations/task_runner';
 import KbnServer from '../../../../../../../src/legacy/server/kbn_server';
 import { LegacyConfig } from '../../plugin';
-import { TaskInstance } from '../../../../task_manager';
+import { TaskInstance } from '../../../../task_manager/server';
 
 export function registerTasks({
   taskManager,

x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.test.ts

@@ -12,7 +12,7 @@ import {
   getMockTaskInstance,
 } from '../../../../test_utils';
 import { visualizationsTaskRunner } from './task_runner';
-import { TaskInstance } from '../../../../../task_manager';
+import { TaskInstance } from '../../../../../task_manager/server';
 
 describe('visualizationsTaskRunner', () => {
   let mockTaskInstance: TaskInstance;

x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts

@@ -8,7 +8,7 @@ import _, { countBy, groupBy, mapValues } from 'lodash';
 import { APICaller, CoreSetup } from 'kibana/server';
 import { getNextMidnight } from '../../get_next_midnight';
 import { VisState } from '../../../../../../../../src/legacy/core_plugins/visualizations/public';
-import { TaskInstance } from '../../../../../task_manager';
+import { TaskInstance } from '../../../../../task_manager/server';
 import { ESSearchHit } from '../../../../../apm/typings/elasticsearch';
 import { LegacyConfig } from '../../../plugin';
 

x-pack/legacy/plugins/oss_telemetry/server/plugin.ts

@@ -5,7 +5,7 @@
  */
 
 import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
-import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../task_manager/plugin';
+import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../task_manager/server/plugin';
 import { registerCollectors } from './lib/collectors';
 import { registerTasks, scheduleTasks } from './lib/tasks';
 import KbnServer from '../../../../../src/legacy/server/kbn_server';

x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts

@@ -6,8 +6,8 @@
 
 import { APICaller, CoreSetup } from 'kibana/server';
 
-import { TaskInstance } from '../../task_manager';
-import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../task_manager/plugin';
+import { TaskInstance } from '../../task_manager/server';
+import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../task_manager/server/plugin';
 
 export const getMockTaskInstance = (): TaskInstance => ({
   state: { runs: 0, stats: {} },

x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts

@@ -6,10 +6,21 @@
 
 import { JobDocPayload, JobParamPostPayload, ConditionalHeaders, RequestFacade } from '../../types';
 
+interface DocValueField {
+  field: string;
+  format: string;
+}
+
+interface SortOptions {
+  order: string;
+  unmapped_type: string;
+}
+
 export interface JobParamPostPayloadDiscoverCsv extends JobParamPostPayload {
   state?: {
     query: any;
-    sort: any[];
+    sort: Array<Record<string, SortOptions>>;
+    docvalue_fields: DocValueField[];
   };
 }
 

x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts

@@ -84,10 +84,11 @@ export async function generateCsvSearch(
 
   let payloadQuery: QueryFilter | undefined;
   let payloadSort: any[] = [];
+  let docValueFields: any[] | undefined;
   if (jobParams.post && jobParams.post.state) {
     ({
       post: {
-        state: { query: payloadQuery, sort: payloadSort = [] },
+        state: { query: payloadQuery, sort: payloadSort = [], docvalue_fields: docValueFields },
       },
     } = jobParams);
   }
@@ -119,7 +120,15 @@ export async function generateCsvSearch(
         },
       };
     }, {});
-  const docValueFields = indexPatternTimeField ? [indexPatternTimeField] : undefined;
+
+  if (indexPatternTimeField) {
+    if (docValueFields) {
+      docValueFields = [indexPatternTimeField].concat(docValueFields);
+    } else {
+      docValueFields = [indexPatternTimeField];
+    }
+  }
+
   const searchRequest: SearchRequest = {
     index: esIndex,
     body: {