Merge branch 'master' of github.com:elastic/kibana into lock_monaco_e…

…ditor

* 'master' of github.com:elastic/kibana: (76 commits)
  Upgrade EUI to 13.8.1 (elastic#45052)
  [ML] Add multi metric job wizard test (elastic#45279)
  [SIEM] Inject/apply KQL changed in refresh button (elastic#45065)
  [Graph] Type persistence (elastic#44985)
  Functional tests: convert more test/services to TS (elastic#45176)
  [ML] Fixes display of matching modules in index data visualizer (elastic#45261)
  [Console] Update indentation behaviour (elastic#45249)
  Convert value provided to PhraseValueInput to string to catch Exception (elastic#45259)
  [Region Map] Fix loading default vector map and base layer setting (elastic#43858)
  [ML] Fixing empty time range when cloning jobs (elastic#45286)
  [ML] Fixing wizard validation delay (elastic#45265)
  [Logs UI] Interpret finished analysis jobs as healthy (elastic#45268)
  [Console] SQL template with triple quote in completion (elastic#45248)
  [ML] Data Frames: Cards as links (elastic#45254)
  fix(code/frontend): should show updating instead of cloning when updating (elastic#45238)
  fix(code/frontend): fix document search result from (elastic#45236)
  disable another flaky suite (elastic#45323) (elastic#45330)
  disable flaky suite (elastic#45105)
  skip flaky suite (elastic#43069)
  skip flaky suite (elastic#45089)
  ...

.ci/jobs.yml

@@ -1,34 +1,21 @@
 JOB:
-  - kibana-intake
-  - x-pack-intake
-  - kibana-firefoxSmoke
+  - intake
+  - firefoxSmoke
   - kibana-ciGroup1
   - kibana-ciGroup2
   - kibana-ciGroup3
   - kibana-ciGroup4
   - kibana-ciGroup5
   - kibana-ciGroup6
-  - kibana-ciGroup7
-  - kibana-ciGroup8
-  - kibana-ciGroup9
-  - kibana-ciGroup10
-  - kibana-ciGroup11
-  - kibana-ciGroup12
-  - kibana-visualRegression
+  # - kibana-visualRegression
 
   # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
-  - x-pack-firefoxSmoke
   - x-pack-ciGroup1
   - x-pack-ciGroup2
   - x-pack-ciGroup3
   - x-pack-ciGroup4
   - x-pack-ciGroup5
-  - x-pack-ciGroup6
-  - x-pack-ciGroup7
-  - x-pack-ciGroup8
-  - x-pack-ciGroup9
-  - x-pack-ciGroup10
-  - x-pack-visualRegression
+  # - x-pack-visualRegression
 
 # `~` is yaml for `null`
 exclude: ~

.ci/run.sh

@@ -11,7 +11,7 @@ source src/dev/ci_setup/setup.sh
 source src/dev/ci_setup/checkout_sibling_es.sh
 
 case "$JOB" in
-kibana-intake)
+intake)
   ./test/scripts/jenkins_unit.sh
   ;;
 kibana-ciGroup*)
@@ -21,22 +21,16 @@ kibana-ciGroup*)
 kibana-visualRegression*)
   ./test/scripts/jenkins_visual_regression.sh
   ;;
-kibana-firefoxSmoke*)
+firefoxSmoke*)
   ./test/scripts/jenkins_firefox_smoke.sh
   ;;
-x-pack-intake)
-  ./test/scripts/jenkins_xpack.sh
-  ;;
 x-pack-ciGroup*)
   export CI_GROUP="${JOB##x-pack-ciGroup}"
   ./test/scripts/jenkins_xpack_ci_group.sh
   ;;
 x-pack-visualRegression*)
   ./test/scripts/jenkins_xpack_visual_regression.sh
   ;;
-x-pack-firefoxSmoke*)
-  ./test/scripts/jenkins_xpack_firefox_smoke.sh
-  ;;
 *)
   echo "JOB '$JOB' is not implemented."
   exit 1

.github/CODEOWNERS

@@ -38,6 +38,7 @@
 /src/legacy/server/saved_objects/  @elastic/kibana-platform
 /src/legacy/ui/public/saved_objects  @elastic/kibana-platform
 /config/kibana.yml @elastic/kibana-platform
+/x-pack/plugins/features/  @elastic/kibana-platform
 
 # Security
 /x-pack/legacy/plugins/security/  @elastic/kibana-security

.i18nrc.json

@@ -23,7 +23,7 @@
     "tileMap": "src/legacy/core_plugins/tile_map",
     "timelion": "src/legacy/core_plugins/timelion",
     "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
-    "tsvb": "src/legacy/core_plugins/metrics",
+    "visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
     "kbnESQuery": "packages/kbn-es-query",
     "inspector": "src/plugins/inspector",
     "kibana-react": "src/plugins/kibana_react",

docs/api/features/get.asciidoc

@@ -11,7 +11,7 @@ experimental[This API is *experimental* and may be changed or removed completely
 [[features-api-get-request]]
 ==== Request
 
-`GET /api/features/v1`
+`GET /api/features`
 
 [[features-api-get-codes]]
 ==== Response code

docs/development/plugin/development-plugin-feature-registration.asciidoc → docs/developer/plugin/development-plugin-feature-registration.asciidoc

@@ -22,7 +22,7 @@ init(server) {
 -----------
 
 ===== Feature details
-Registering a feature consists of the following fields. For more information, consult the {repo}blob/{branch}/x-pack/legacy/plugins/xpack_main/server/lib/feature_registry/feature_registry.ts[feature registry interface].
+Registering a feature consists of the following fields. For more information, consult the {repo}blob/{branch}/x-pack/plugins/features/server/feature_registry.ts[feature registry interface].
 
 
 [cols="1a, 1a, 1a, 1a"]
@@ -45,7 +45,7 @@ Registering a feature consists of the following fields. For more information, co
 |An array of applications this feature enables. Typically, all of your plugin's apps (from `uiExports`) will be included here.
 
 |`privileges` (required)
-|{repo}blob/{branch}/x-pack/legacy/plugins/xpack_main/server/lib/feature_registry/feature_registry.ts[`FeatureWithAllOrReadPrivileges`].
+|{repo}blob/{branch}/x-pack/plugins/features/server/feature.ts[`FeatureWithAllOrReadPrivileges`].
 |see examples below
 |The set of privileges this feature requires to function.
 
@@ -63,7 +63,7 @@ Registering a feature consists of the following fields. For more information, co
 ===== Privilege definition
 The `privileges` section of feature registration allows plugins to implement read/write and read-only modes for their applications.
 
-For a full explanation of fields and options, consult the {repo}blob/{branch}/x-pack/legacy/plugins/xpack_main/server/lib/feature_registry/feature_registry.ts[feature registry interface].
+For a full explanation of fields and options, consult the {repo}blob/{branch}/x-pack/plugins/features/server/feature_registry.ts[feature registry interface].
 
 ==== Using UI Capabilities
 
@@ -142,7 +142,7 @@ init(server) {
   const xpackMainPlugin = server.plugins.xpack_main;
   xpackMainPlugin.registerFeature({
     id: 'dev_tools',
-    name: i18n.translate('xpack.main.featureRegistry.devToolsFeatureName', {
+    name: i18n.translate('xpack.features.devToolsFeatureName', {
       defaultMessage: 'Dev Tools',
     }),
     icon: 'devToolsApp',
@@ -167,7 +167,7 @@ init(server) {
         ui: ['show'],
       },
     },
-    privilegesTooltip: i18n.translate('xpack.main.featureRegistry.devToolsPrivilegesTooltip', {
+    privilegesTooltip: i18n.translate('xpack.features.devToolsPrivilegesTooltip', {
      defaultMessage:
        'User should also be granted the appropriate Elasticsearch cluster and index privileges',
    }),

docs/index.asciidoc

@@ -84,6 +84,6 @@ include::migration.asciidoc[]
 
 include::CHANGELOG.asciidoc[]
 
-include::development/index.asciidoc[]
+include::developer/index.asciidoc[]
 
 include::redirects.asciidoc[]

docs/infrastructure/view-metrics.asciidoc

@@ -4,6 +4,7 @@
 == Viewing infrastructure metrics
 
 When you select *View Metrics* for a component in your infrastructure from the <<infra-ui, Infrastructure app in Kibana>>, you can view detailed metrics for that component, and for any related components.
+You can also view additional component metadata.
 
 [role="screenshot"]
 image::infrastructure/images/infra-view-metrics.png[Infrastructure View Metrics in Kibana]

docs/maps/search.asciidoc

@@ -2,8 +2,9 @@
 [[maps-search]]
 == Searching your data
 
-**Elastic Maps** embeds the query bar for real-time ad hoc search.
+**Elastic Maps** embeds the search bar for real-time search.
 Only layers requesting data from {es} are filtered when you submit a search request.
+Layers narrowed by the search context contain the filter icon image:maps/images/filter_icon.png[] to the right of layer name in the legend.
 
 You can create a layer that requests data from {es} from the following:
 
@@ -13,13 +14,51 @@ You can create a layer that requests data from {es} from the following:
 
 ** Grid aggregation source
 
-** <<terms-join>>
+** <<terms-join>>. The search context is applied to both the terms join and the vector source when the vector source is provided by Elasticsearch documents.
 
 * <<heatmap-layer>> with Grid aggregation source
 
 [role="screenshot"]
 image::maps/images/global_search_bar.png[]
 
+[role="xpack"]
+[[maps-create-filter-from-map]]
+=== Creating filters from your map
+
+You can create two types of filters by interacting with your map:
+
+* <<maps-spatial-filters, Spatial filters>>
+* <<maps-phrase-filter, Phrase filters>>
+
+[float]
+[[maps-spatial-filters]]
+==== Spatial filters
+
+A spatial filter narrow searchs results to documents that either intersect with, are within, or do not intersect with the specified geometry.
+
+You can create spatial filters in two ways:
+
+* Click the tool icon image:maps/images/tools_icon.png[], and then draw a polygon or bounding box on the map to define the spatial filter.
+* Click *Filter by geometry* in a tooltip, and then use the feature's geometry for the spatial filter.
++
+[role="screenshot"]
+image::maps/images/create_spatial_filter.png[]
+
+Spatial filters have the following properties:
+
+* *Geometry label* enables you to provide a meaningful name for your spatial filter.
+* *Spatial field* specifies the geo_point or geo_shape field used to determine if a document matches the spatial relation with the specified geometry.
+* *Spatial relation* determines the {ref}/query-dsl-geo-shape-query.html#_spatial_relations[spatial relation operator] to use at search time. Only available when *Spatial field* is set to geo_shape.
+
+[float]
+[[maps-phrase-filter]]
+==== Phrase filters
+
+A phrase filter narrows search results to documents that contain the specified text.
+You can create a phrase filter by clicking the plus icon image:maps/images/gs_plus_icon.png[] in a feature tooltip.
+
+[role="screenshot"]
+image::maps/images/create_phrase_filter.png[]
 
 [role="xpack"]
 [[maps-layer-based-filtering]]
@@ -43,6 +82,18 @@ This can also occur with a single layer with an {es} source and a <<terms-join>>
 
 Searching across multiple indices might sometimes result in empty layers.
 The most common cause for empty layers are searches for a field that exists in one index, but does not exist in other indices.
+
+[float]
+[[maps-disable-search-for-layer]]
+==== Disable search for layer
+
+To prevent the global search bar from applying search context to a layer, clear the *Apply global filter to layer* checkbox in Layer settings.
+Disabling the search context applies to the layer source and all <<terms-join, term joins>> configured for the layer.
+
+[float]
+[[maps-add-index-search]]
+==== Use _index in your search
+
 Add {ref}/mapping-index-field.html[_index] to your search to include documents from indices that do not contain a search field.
 
 For example, suppose you have a vector layer showing the `kibana_sample_data_logs` documents

package.json

@@ -105,7 +105,7 @@
     "@babel/register": "^7.5.5",
     "@elastic/charts": "^11.1.1",
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "13.6.1",
+    "@elastic/eui": "13.8.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.3",
@@ -230,7 +230,7 @@
     "request": "^2.88.0",
     "reselect": "^3.0.1",
     "resize-observer-polyfill": "^1.5.0",
-    "rimraf": "2.6.3",
+    "rimraf": "2.7.1",
     "rison-node": "1.0.2",
     "rxjs": "^6.2.1",
     "script-loader": "0.7.2",

packages/kbn-eslint-import-resolver-kibana/package.json

@@ -10,11 +10,11 @@
     "url": "https://github.com/elastic/kibana/tree/master/packages/kbn-eslint-import-resolver-kibana"
   },
   "dependencies": {
-    "debug": "^2.6.6",
+    "debug": "^2.6.9",
     "eslint-import-resolver-node": "0.3.2",
     "eslint-import-resolver-webpack": "0.11.1",
     "glob-all": "^3.1.0",
-    "lru-cache": "^4.1.3",
+    "lru-cache": "^4.1.5",
     "resolve": "^1.7.1",
     "webpack": "^4.39.2"
   }

packages/kbn-ui-framework/package.json

@@ -46,7 +46,7 @@
     "grunt-babel": "^8.0.0",
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-copy": "^1.0.0",
-    "highlight.js": "9.15.8",
+    "highlight.js": "9.15.10",
     "html": "1.0.0",
     "html-loader": "^0.5.5",
     "imports-loader": "^0.8.0",

src/cli/cluster/cluster_manager.js

@@ -24,6 +24,7 @@ import opn from 'opn';
 import { debounce, invoke, bindAll, once, uniq } from 'lodash';
 import * as Rx from 'rxjs';
 import { first, mapTo, filter, map, take } from 'rxjs/operators';
+import { REPO_ROOT } from '@kbn/dev-utils';
 
 import Log from '../log';
 import Worker from './worker';
@@ -102,8 +103,15 @@ export default class ClusterManager {
 
     if (opts.watch) {
       const pluginPaths = config.get('plugins.paths');
-      const scanDirs = config.get('plugins.scanDirs');
-      const extraPaths = [...pluginPaths, ...scanDirs];
+      const scanDirs = [
+        ...config.get('plugins.scanDirs'),
+        resolve(REPO_ROOT, 'src/plugins'),
+        resolve(REPO_ROOT, 'x-pack/plugins'),
+      ];
+      const extraPaths = [
+        ...pluginPaths,
+        ...scanDirs,
+      ];
 
       const extraIgnores = scanDirs
         .map(scanDir => resolve(scanDir, '*'))

src/core/server/http/http_service.mock.ts

@@ -99,4 +99,5 @@ export const httpServiceMock = {
   createSetupContract: createSetupContractMock,
   createOnPreAuthToolkit: createOnPreAuthToolkitMock,
   createAuthToolkit: createAuthToolkitMock,
+  createRouter: createRouterMock,
 };

src/legacy/core_plugins/console/public/src/autocomplete.js

@@ -345,7 +345,14 @@ export default function (editor) {
     let valueToInsert = termAsString;
     let templateInserted = false;
     if (context.addTemplate && !_.isUndefined(term.template) && !_.isNull(term.template)) {
-      const indentedTemplateLines = utils.jsonToString(term.template, true).split('\n');
+      let indentedTemplateLines;
+      // In order to allow triple quoted strings in template completion we check the `__raw_`
+      // attribute to determine whether this template should go through JSON formatting.
+      if (term.template.__raw && term.template.value) {
+        indentedTemplateLines = term.template.value.split('\n');
+      } else {
+        indentedTemplateLines = utils.jsonToString(term.template, true).split('\n');
+      }
       let currentIndentation = session.getLine(context.rangeToReplace.start.row);
       currentIndentation = currentIndentation.match(/^\s*/)[0];
       for (let i = 1; i < indentedTemplateLines.length; i++) // skip first line