Merge branch 'master' into apm-fleet-tutorial

.github/CODEOWNERS

@@ -89,7 +89,7 @@
 # Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
 /x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
 /x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature @elastic/uptime
-/x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
+/x-pack/plugins/apm/public/application/uxApp.tsx @elastic/uptime
 /x-pack/plugins/apm/public/components/app/RumDashboard @elastic/uptime
 /x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
 /x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
@@ -128,7 +128,7 @@
 /x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
 /x-pack/test/functional_with_es_ssl/apps/ml/ @elastic/ml-ui
 
-# ML team owns and maintains the transform plugin despite it living in the Elasticsearch management section.
+# ML team owns and maintains the transform plugin despite it living in the Data management section.
 /x-pack/plugins/transform/  @elastic/ml-ui
 /x-pack/test/accessibility/apps/transform.ts  @elastic/ml-ui
 /x-pack/test/api_integration/apis/transform/ @elastic/ml-ui
@@ -305,29 +305,29 @@
 /x-pack/plugins/enterprise_search/server/collectors/workplace_search/ @elastic/workplace-search-frontend
 /x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/ @elastic/workplace-search-frontend
 
-# Elasticsearch UI
-/src/plugins/dev_tools/ @elastic/es-ui
-/src/plugins/console/  @elastic/es-ui
-/src/plugins/es_ui_shared/  @elastic/es-ui
-/x-pack/plugins/cross_cluster_replication/  @elastic/es-ui
-/x-pack/plugins/index_lifecycle_management/  @elastic/es-ui
-/x-pack/plugins/console_extensions/  @elastic/es-ui
-/x-pack/plugins/grokdebugger/  @elastic/es-ui
-/x-pack/plugins/index_management/  @elastic/es-ui
-/x-pack/plugins/license_api_guard/  @elastic/es-ui
-/x-pack/plugins/license_management/  @elastic/es-ui
-/x-pack/plugins/painless_lab/  @elastic/es-ui
-/x-pack/plugins/remote_clusters/  @elastic/es-ui
-/x-pack/plugins/rollup/  @elastic/es-ui
-/x-pack/plugins/searchprofiler/  @elastic/es-ui
-/x-pack/plugins/snapshot_restore/  @elastic/es-ui
-/x-pack/plugins/upgrade_assistant/  @elastic/es-ui
-/x-pack/plugins/watcher/  @elastic/es-ui
-/x-pack/plugins/ingest_pipelines/  @elastic/es-ui
-/packages/kbn-ace/ @elastic/es-ui
-/packages/kbn-monaco/ @elastic/es-ui
-#CC# /x-pack/plugins/console_extensions/ @elastic/es-ui
-#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/es-ui
+# Stack Management
+/src/plugins/dev_tools/ @elastic/kibana-stack-management 
+/src/plugins/console/  @elastic/kibana-stack-management 
+/src/plugins/es_ui_shared/  @elastic/kibana-stack-management 
+/x-pack/plugins/cross_cluster_replication/  @elastic/kibana-stack-management 
+/x-pack/plugins/index_lifecycle_management/  @elastic/kibana-stack-management 
+/x-pack/plugins/console_extensions/  @elastic/kibana-stack-management 
+/x-pack/plugins/grokdebugger/  @elastic/kibana-stack-management 
+/x-pack/plugins/index_management/  @elastic/kibana-stack-management 
+/x-pack/plugins/license_api_guard/  @elastic/kibana-stack-management 
+/x-pack/plugins/license_management/  @elastic/kibana-stack-management 
+/x-pack/plugins/painless_lab/  @elastic/kibana-stack-management 
+/x-pack/plugins/remote_clusters/  @elastic/kibana-stack-management 
+/x-pack/plugins/rollup/  @elastic/kibana-stack-management 
+/x-pack/plugins/searchprofiler/  @elastic/kibana-stack-management 
+/x-pack/plugins/snapshot_restore/  @elastic/kibana-stack-management 
+/x-pack/plugins/upgrade_assistant/  @elastic/kibana-stack-management 
+/x-pack/plugins/watcher/  @elastic/kibana-stack-management 
+/x-pack/plugins/ingest_pipelines/  @elastic/kibana-stack-management 
+/packages/kbn-ace/ @elastic/kibana-stack-management 
+/packages/kbn-monaco/ @elastic/kibana-stack-management 
+#CC# /x-pack/plugins/console_extensions/ @elastic/kibana-stack-management 
+#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/kibana-stack-management 
 
 # Security Solution
 /x-pack/test/endpoint_api_integration_no_ingest/ @elastic/security-solution

WORKSPACE.bazel

@@ -10,15 +10,15 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch Node.js rules
 http_archive(
   name = "build_bazel_rules_nodejs",
-  sha256 = "10f534e1c80f795cffe1f2822becd4897754d18564612510c59b3c73544ae7c6",
-  urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.5.0/rules_nodejs-3.5.0.tar.gz"],
+  sha256 = "4a5d654a4ccd4a4c24eca5d319d85a88a650edf119601550c95bf400c8cc897e",
+  urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.5.1/rules_nodejs-3.5.1.tar.gz"],
 )
 
 # Now that we have the rules let's import from them to complete the work
 load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
 
 # Assure we have at least a given rules_nodejs version
-check_rules_nodejs_version(minimum_version_string = "3.5.0")
+check_rules_nodejs_version(minimum_version_string = "3.5.1")
 
 # Setup the Node.js toolchain for the architectures we want to support
 #

dev_docs/tutorials/expressions.mdx

@@ -9,23 +9,24 @@ tags: ['kibana', 'onboarding', 'dev', 'architecture']
 
 ## Expressions service
 
-Expression service exposes a registry of reusable functions primary used for fetching and transposing data and a registry of renderer functions that can render data into a DOM element. 
-Adding functions is easy and so is reusing them. An expression is a chain of functions with provided arguments, which given a single input translates to a single output. 
+Expression service exposes a registry of reusable functions primary used for fetching and transposing data and a registry of renderer functions that can render data into a DOM element.
+Adding functions is easy and so is reusing them. An expression is a chain of functions with provided arguments, which given a single input translates to a single output.
 Each expression is representable by a human friendly string which a user can type.
 
 ### creating expressions
 
 Here is a very simple expression string:
 
-    essql 'select column1, column2 from myindex' | mapColumn name=column3 fn='{ column1 + 3 }' | table
-
+```
+essql 'select column1, column2 from myindex' | mapColumn name=column3 fn='{ column1 + 3 }' | table
+```
 
 It consists of 3 functions:
 
  - essql which runs given sql query against elasticsearch and returns the results
  - `mapColumn`, which computes a new column from existing ones;
  - `table`, which prepares the data for rendering in a tabular format.
- 
+
 The same expression could also be constructed in the code:
 
 ```ts
@@ -61,7 +62,7 @@ In addition, on the browser side, there are two additional ways to run expressio
 
 #### React expression renderer component
 
-This is the easiest way to get expressions rendered inside your application.  
+This is the easiest way to get expressions rendered inside your application.
 
 ```ts
 <ReactExpressionRenderer expression={expression} />

docs/user/dashboard/timelion.asciidoc

@@ -4,7 +4,7 @@
 To use *Timelion*, you define a graph by chaining functions together, using the *Timelion*-specific syntax. 
 The syntax enables some features that classical point series charts don't offer, such as pulling data from different indices or data sources into one graph.
 
-deprecated::[7.0.0,"*Timelion* is still supported. The *Timelion app* is deprecated in 7.0, replaced by dashboard features. In the last 7.x minor version and later, the *Timelion app* is removed from {kib}. To prepare for the removal of *Timelion app*, you must migrate *Timelion app* worksheets to a dashboard. For information on how to migrate *Timelion app* worksheets, refer to the link:https://www.elastic.co/guide/en/kibana/7.10/release-notes-7.10.0.html#deprecation-v7.10.0[7.10.0 Release Notes]."]
+deprecated::[7.0.0,"*Timelion* is still supported. The *Timelion app* is deprecated in 7.0, replaced by dashboard features. In 7.16 and later, the *Timelion app* is removed from {kib}. To prepare for the removal of *Timelion app*, you must migrate *Timelion app* worksheets to a dashboard. For information on how to migrate *Timelion app* worksheets, refer to the link:https://www.elastic.co/guide/en/kibana/7.10/release-notes-7.10.0.html#deprecation-v7.10.0[7.10.0 Release Notes]."]
 
 [float]
 ==== Timelion expressions

package.json

@@ -441,7 +441,7 @@
     "@babel/traverse": "^7.12.12",
     "@babel/types": "^7.12.12",
     "@bazel/ibazel": "^0.15.10",
-    "@bazel/typescript": "^3.5.0",
+    "@bazel/typescript": "^3.5.1",
     "@cypress/snapshot": "^2.1.7",
     "@cypress/webpack-preprocessor": "^5.6.0",
     "@elastic/apm-rum": "^5.6.1",

packages/kbn-apm-utils/src/index.ts

@@ -16,6 +16,8 @@ export interface SpanOptions {
   labels?: Record<string, string>;
 }
 
+type Span = Exclude<typeof agent.currentSpan, undefined | null>;
+
 export function parseSpanOptions(optionsOrName: SpanOptions | string) {
   const options = typeof optionsOrName === 'string' ? { name: optionsOrName } : optionsOrName;
 
@@ -30,7 +32,7 @@ const runInNewContext = <T extends (...args: any[]) => any>(cb: T): ReturnType<T
 
 export async function withSpan<T>(
   optionsOrName: SpanOptions | string,
-  cb: () => Promise<T>
+  cb: (span?: Span) => Promise<T>
 ): Promise<T> {
   const options = parseSpanOptions(optionsOrName);
 
@@ -71,13 +73,17 @@ export async function withSpan<T>(
       span.addLabels(labels);
     }
 
-    return cb()
+    return cb(span)
       .then((res) => {
-        span.outcome = 'success';
+        if (!span.outcome || span.outcome === 'unknown') {
+          span.outcome = 'success';
+        }
         return res;
       })
       .catch((err) => {
-        span.outcome = 'failure';
+        if (!span.outcome || span.outcome === 'unknown') {
+          span.outcome = 'failure';
+        }
         throw err;
       })
       .finally(() => {

packages/kbn-legacy-logging/BUILD.bazel

@@ -25,6 +25,7 @@ NPM_MODULE_EXTRA_FILES = [
 
 SRC_DEPS = [
   "//packages/kbn-config-schema",
+  "//packages/kbn-utils",
   "@npm//@elastic/numeral",
   "@npm//@hapi/hapi",
   "@npm//chokidar",

packages/kbn-test/src/functional_test_runner/public_types.ts

@@ -74,6 +74,12 @@ export interface GenericFtrProviderContext<
   getService(serviceName: 'failureMetadata'): FailureMetadata;
   getService<T extends keyof ServiceMap>(serviceName: T): ServiceMap[T];
 
+  /**
+   * Get the instance of a page object
+   * @param pageObjectName
+   */
+  getPageObject<K extends keyof PageObjectMap>(pageObjectName: K): PageObjectMap[K];
+
   /**
    * Get a map of PageObjects
    * @param pageObjects

src/plugins/discover/public/application/components/discover_grid/discover_grid.scss

@@ -47,6 +47,9 @@
 
 // We only truncate if the cell is not a control column.
 .euiDataGridHeader {
+  // This display property is temporary until https://github.com/elastic/eui/issues/4729 is resolved.
+  display: flex;
+
   .euiDataGridHeaderCell__content {
     @include euiTextTruncate;
     overflow: hidden;

src/plugins/discover/public/application/components/top_nav/open_options_popover.tsx

@@ -11,11 +11,21 @@ import ReactDOM from 'react-dom';
 import { I18nStart } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiSpacer, EuiButton, EuiText, EuiWrappingPopover, EuiCode } from '@elastic/eui';
+import {
+  EuiSpacer,
+  EuiButton,
+  EuiText,
+  EuiWrappingPopover,
+  EuiCode,
+  EuiHorizontalRule,
+  EuiButtonEmpty,
+  EuiTextAlign,
+} from '@elastic/eui';
 import { getServices } from '../../../kibana_services';
 import './open_options_popover.scss';
 import { DOC_TABLE_LEGACY } from '../../../../common';
 
+const container = document.createElement('div');
 let isOpen = false;
 
 interface OptionsPopoverProps {
@@ -77,11 +87,29 @@ export function OptionsPopover(props: OptionsPopoverProps) {
             defaultMessage: 'Get started',
           })}
         </EuiButton>
+        <EuiHorizontalRule margin="s" />
+        <EuiTextAlign textAlign="center">
+          <EuiButtonEmpty
+            iconType="gear"
+            size="s"
+            href={addBasePath(`/app/management/kibana/settings?query=category:(discover)`)}
+          >
+            {i18n.translate('discover.openOptionsPopover.gotToAllSettings', {
+              defaultMessage: 'All Discover options',
+            })}
+          </EuiButtonEmpty>
+        </EuiTextAlign>
       </div>
     </EuiWrappingPopover>
   );
 }
 
+function onClose() {
+  ReactDOM.unmountComponentAtNode(container);
+  document.body.removeChild(container);
+  isOpen = false;
+}
+
 export function openOptionsPopover({
   I18nContext,
   anchorElement,
@@ -90,17 +118,11 @@ export function openOptionsPopover({
   anchorElement: HTMLElement;
 }) {
   if (isOpen) {
+    onClose();
     return;
   }
 
   isOpen = true;
-  const container = document.createElement('div');
-  const onClose = () => {
-    ReactDOM.unmountComponentAtNode(container);
-    document.body.removeChild(container);
-    isOpen = false;
-  };
-
   document.body.appendChild(container);
 
   const element = (

src/plugins/discover/public/url_generator.ts

@@ -6,16 +6,10 @@
  * Side Public License, v 1.
  */
 
-import {
-  TimeRange,
-  Filter,
-  Query,
-  esFilters,
-  QueryState,
-  RefreshInterval,
-} from '../../data/public';
+import type { UrlGeneratorsDefinition } from '../../share/public';
+import type { TimeRange, Filter, Query, QueryState, RefreshInterval } from '../../data/public';
+import { esFilters } from '../../data/public';
 import { setStateToKbnUrl } from '../../kibana_utils/public';
-import { UrlGeneratorsDefinition } from '../../share/public';
 
 export const DISCOVER_APP_URL_GENERATOR = 'DISCOVER_APP_URL_GENERATOR';
 
@@ -71,10 +65,12 @@ export interface DiscoverUrlGeneratorState {
    * Used interval of the histogram
    */
   interval?: string;
+
   /**
    * Array of the used sorting [[field,direction],...]
    */
   sort?: string[][];
+
   /**
    * id of the used saved query
    */