Merge branch 'master' into uptime_revert-router-base-name

elastic · Nov 11, 2019 · e72f77a · e72f77a
2 parents 73e6757 + a72cb85
commit e72f77a
Show file tree

Hide file tree

Showing 257 changed files with 2,590 additions and 1,897 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,5 @@ package-lock.json
 *.sublime-*
 npm-debug.log*
 .tern-project
+x-pack/legacy/plugins/apm/tsconfig.json
+apm.tsconfig.json
diff --git a/docs/user/ml/index.asciidoc b/docs/user/ml/index.asciidoc
@@ -24,7 +24,7 @@ can then optionally import that data into an {es} index.
 
 You need the following permissions to use the Data Visualizer with file upload:
 
-* cluster privileges: `monitor`, `manage_index_pipelines`
+* cluster privileges: `monitor`, `manage_ingest_pipelines`
 * index privileges: `read`, `manage`, `index`
 
 For more information, see {ref}/security-privileges.html[Security privileges] 

diff --git a/packages/kbn-babel-preset/node_preset.js b/packages/kbn-babel-preset/node_preset.js
@@ -25,7 +25,7 @@ module.exports = (_, options = {}) => {
         test: [/x-pack[\/\\]legacy[\/\\]plugins[\/\\]task_manager/],
         plugins: [
           [
-            'filter-imports',
+            require.resolve('babel-plugin-filter-imports'),
             {
               imports: {
                 perf_hooks: ['performance'],

diff --git a/packages/kbn-es-query/src/es_query/migrate_filter.js b/packages/kbn-es-query/src/es_query/migrate_filter.js
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { getConvertedValueForField } from '../filters';
+import { getConvertedValueForField } from '../utils/filters';
 
 export function migrateFilter(filter, indexPattern) {
   if (filter.match) {

diff --git a/packages/kbn-es-query/src/filters/__tests__/phrase.js b/packages/kbn-es-query/src/filters/__tests__/phrase.js
diff --git a/packages/kbn-es-query/src/filters/__tests__/query.js b/packages/kbn-es-query/src/filters/__tests__/query.js
diff --git a/packages/kbn-es-query/src/filters/__tests__/range.js b/packages/kbn-es-query/src/filters/__tests__/range.js
diff --git a/packages/kbn-es-query/src/filters/exists.js b/packages/kbn-es-query/src/filters/exists.js