Fix conflicts 25809

.ci/jobs.yml

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

.ci/packer_cache.sh

@@ -1,3 +1,16 @@
 #!/usr/bin/env bash
 
+# run setup script that gives us node, yarn, and bootstraps the project
 source "src/dev/ci_setup/setup.sh";
+
+# cache es snapshots
+node scripts/es snapshot --download-only;
+
+# archive cacheable directories
+mkdir -p "$HOME/.kibana/bootstrap_cache"
+tar -cf "$HOME/.kibana/bootstrap_cache/master.tar" \
+  node_modules \
+  packages/*/node_modules \
+  x-pack/node_modules \
+  x-pack/plugins/*/node_modules \
+  .es;

.ci/run.sh

@@ -5,16 +5,23 @@ set -e
 # move to Kibana root
 cd "$(dirname "$0")/.."
 
+./src/dev/ci_setup/load_bootstrap_cache.sh;
+
 case "$JOB" in
-"selenium")
-  ./test/scripts/jenkins_selenium.sh
-  ;;
-"intake")
+kibana-intake)
   ./test/scripts/jenkins_unit.sh
   ;;
-"x-pack")
+kibana-ciGroup*)
+  export CI_GROUP="${JOB##kibana-ciGroup}"
+  ./test/scripts/jenkins_ci_group.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
+  ;;
 *)
   echo "JOB '$JOB' is not implemented."
   exit 1

.eslintignore

@@ -8,8 +8,6 @@ bower_components
 /src/fixtures/vislib/mock_data
 /src/ui/public/angular-bootstrap
 /src/ui/public/flot-charts
-/src/ui/public/kuery/ast/kuery.js
-/src/ui/public/kuery/ast/legacy_kuery.js
 /test/fixtures/scenarios
 /src/core_plugins/console/public/webpackShims
 /src/core_plugins/console/public/tests/webpackShims
@@ -19,6 +17,8 @@ bower_components
 /packages/*/target
 /packages/eslint-config-kibana
 /packages/eslint-plugin-kibana-custom
+/packages/kbn-es-query/src/kuery/ast/kuery.js
+/packages/kbn-es-query/src/kuery/ast/legacy_kuery.js
 /packages/kbn-pm/dist
 /packages/kbn-plugin-generator/sao_template/template
 /packages/kbn-ui-framework/dist
@@ -27,7 +27,7 @@ bower_components
 /x-pack/coverage
 /x-pack/build
 /x-pack/plugins/**/__tests__/fixtures/**
-/x-pack/plugins/canvas/common/lib/grammar.js
+/packages/kbn-interpreter/src/common/lib/grammar.js
 /x-pack/plugins/canvas/canvas_plugin
 /x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
 **/*.js.snap

.eslintrc.js

@@ -102,7 +102,7 @@ module.exports = {
      * Files that ARE NOT allowed to use devDependencies
      */
     {
-      files: ['packages/kbn-ui-framework/**/*', 'x-pack/**/*'],
+      files: ['packages/kbn-ui-framework/**/*', 'x-pack/**/*', 'packages/kbn-interpreter/**/*'],
       rules: {
         'import/no-extraneous-dependencies': [
           'error',
@@ -124,6 +124,8 @@ module.exports = {
         'packages/kbn-ui-framework/generator-kui/**/*',
         'packages/kbn-ui-framework/Gruntfile.js',
         'packages/kbn-es/src/**/*',
+        'packages/kbn-interpreter/tasks/**/*',
+        'packages/kbn-interpreter/src/plugin/**/*',
         'x-pack/{dev-tools,tasks,scripts,test,build_chromium}/**/*',
         'x-pack/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*',
         'x-pack/**/*.test.js',

.i18nrc.json

@@ -11,11 +11,17 @@
     "tableVis": "src/core_plugins/table_vis",
     "regionMap": "src/core_plugins/region_map",
     "statusPage": "src/core_plugins/status_page",
+    "tagCloud": "src/core_plugins/tagcloud",
+    "tagCloud": "src/core_plugins/tagcloud",
     "tileMap": "src/core_plugins/tile_map",
     "timelion": "src/core_plugins/timelion",
+    "tsvb": "src/core_plugins/metrics",
     "tagCloud": "src/core_plugins/tagcloud",
+    "tsvb": "src/core_plugins/metrics",
+    "xpack.graph": "x-pack/plugins/graph",
     "xpack.grokDebugger": "x-pack/plugins/grokdebugger",
     "xpack.idxMgmt": "x-pack/plugins/index_management",
+    "xpack.infra": "x-pack/plugins/infra",
     "xpack.licenseMgmt": "x-pack/plugins/license_management",
     "xpack.monitoring": "x-pack/plugins/monitoring",
     "xpack.rollupJobs": "x-pack/plugins/rollup",
@@ -25,6 +31,8 @@
   },
   "exclude": [
     "src/ui/ui_render/bootstrap/app_bootstrap.js",
-    "src/ui/ui_render/ui_render_mixin.js"
+    "src/ui/ui_render/ui_render_mixin.js",
+    "x-pack/plugins/infra/public/utils/loading_state/loading_result.ts",
+    "x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts"
   ]
 }

README.md

@@ -5,7 +5,6 @@ Kibana is your window into the [Elastic Stack](https://www.elastic.co/products).
 - [Getting Started](#getting-started)
   - [Using a Kibana Release](#using-a-kibana-release)
   - [Building and Running Kibana, and/or Contributing Code](#building-and-running-kibana-andor-contributing-code)
-  - [Snapshot Builds](#snapshot-builds)
 - [Documentation](#documentation)
 - [Version Compatibility with Elasticsearch](#version-compatibility-with-elasticsearch)
 - [Questions? Problems? Suggestions?](#questions-problems-suggestions)

docs/development/visualize/development-create-visualization.asciidoc

@@ -31,7 +31,6 @@ You should also register the visualization with `VisTypesRegistryProvider`.
 
 ["source","js"]
 -----------
-import { CATEGORY } from 'ui/vis/vis_category';
 import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
 
@@ -43,7 +42,6 @@ const MyNewVisType = (Private) => {
     title: 'My New Vis',
     icon: 'my_icon',
     description: 'Cool new chart',
-    category: CATEGORY.OTHER
     ...
   });
 }
@@ -59,7 +57,7 @@ The list of common parameters:
 - *image*: instead of an icon you can provide a SVG image (imported)
 - *legacyIcon*: (DEPRECATED) <string> provide a class name (e.g. for a font awesome icon)
 - *description*: description of your visualization as shown in kibana
-- *category*: the category your visualization falls into (one of `ui/vis/vis_category` values)
+- *hidden*: <bool> if set to true, will hide the type from showing up in the visualization wizard
 - *visConfig*: object holding visualization parameters
 - *visConfig.defaults*: object holding default visualization configuration
 - *visualization*: A constructor function for a Visualization.
@@ -71,8 +69,8 @@ The list of common parameters:
 - *options.showQueryBar*: <bool> show or hide query bar (defaults to true)
 - *options.showFilterBar*: <bool> show or hide filter bar (defaults to true)
 - *options.showIndexSelection*: <bool> show or hide index selection (defaults to true)
-- *stage*: <string> Set this to "experimental" or "labs" to mark your visualization as experimental. 
-Labs visualizations can also be disabled from the advanced settings. (defaults to "production")
+- *stage*: <string> Set this to "experimental" to mark your visualization as experimental.
+Experimental visualizations can also be disabled from the advanced settings. (defaults to "production")
 - *feedbackMessage*: <string> You can provide a message (which can contain HTML), that will be appended 
 to the experimental notification in visualize, if your visualization is experimental or in lab mode.
 

docs/development/visualize/development-embedding-visualizations.asciidoc

@@ -55,4 +55,4 @@ The returned `EmbeddedVisualizeHandler` itself has the following methods and pro
 - `removeRenderCompleteListener(listener)`: removes an event listener from the handler again
 
 You can find the detailed `EmbeddedVisualizeHandler` documentation in its
-{repo}blob/{branch}/src/ui/public/visualize/loader/embedded_visualize_handler.js[source code].
+{repo}blob/{branch}/src/ui/public/visualize/loader/embedded_visualize_handler.ts[source code].

docs/monitoring/elasticsearch-details.asciidoc

@@ -98,3 +98,35 @@ image::monitoring/images/monitoring-index-advanced.png["Elasticsearch Index Adva
 
 The Advanced index view can be used to diagnose issues that generally involve
 more advanced knowledge of {es}, such as wasteful index memory usage.
+
+[float]
+[[jobs-page]]
+==== Jobs
+
+To view {ml} job metrics, click **Jobs**. For each job in your cluster, it shows
+information such as its status, the number of records processed, the size of the
+model, the number of forecasts, and the node that runs the job.
+
+image::monitoring/images/monitoring-jobs.png["Machine learning jobs",link="images/monitoring-jobs.png"]
+
+[float]
+[[ccr-overview-page]]
+==== CCR
+
+beta[]
+
+To view {ccr} metrics, click **CCR**. For each follower index on the cluster, it 
+shows information such as the leader index, an indication of how much the
+follower index is lagging behind the leader index, the last fetch time, the
+number of operations synced, and error messages. If you select a follower index,
+you can view the same information for each shard. For example:
+
+image::monitoring/images/monitoring-ccr.png["Cross-cluster replication",link="images/monitoring-ccr.png"]
+
+If you select a shard, you can see graphs for the fetch and operation delays. 
+You can also see advanced information, which contains the results from the 
+{ref}/ccr-get-follow-stats.html[get follower stats API]. For example:
+
+image::monitoring/images/monitoring-ccr-shard.png["Cross-cluster replication shard details",link="images/monitoring-ccr-shard.png"]
+
+For more information, see {stack-ov}/xpack-ccr.html[Cross-cluster replication].

docs/settings/monitoring-settings.asciidoc

@@ -6,8 +6,11 @@
 ++++
 
 By default, the Monitoring application is enabled, but data collection
-is disabled.  When you first start {kib} monitoring, you will be prompted to
-enable data collection.
+is disabled.  When you first start {kib} monitoring, you are prompted to
+enable data collection. If you are using {security}, you must be 
+signed in as a user with the `cluster:manage` privilege to enable
+data collection. The built-in `superuser` role has this privilege and the
+built-in `elastic` user has this role. 
 
 You can adjust how monitoring data is
 collected from {kib} and displayed in {kib} by configuring settings in the

package.json

@@ -88,10 +88,12 @@
     "@kbn/babel-preset": "1.0.0",
     "@kbn/config-schema": "1.0.0",
     "@kbn/datemath": "5.0.0",
+    "@kbn/es-query": "1.0.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/pm": "1.0.0",
     "@kbn/test-subj-selector": "0.2.1",
     "@kbn/ui-framework": "1.0.0",
+    "@kbn/interpreter": "1.0.0",
     "JSONStream": "1.1.1",
     "abortcontroller-polyfill": "^1.1.9",
     "angular": "1.6.9",
@@ -145,7 +147,6 @@
     "js-yaml": "3.4.1",
     "json-stringify-pretty-compact": "1.0.4",
     "json-stringify-safe": "5.0.1",
-    "jstimezonedetect": "1.0.5",
     "leaflet": "1.0.3",
     "leaflet-draw": "0.4.10",
     "leaflet-responsive-popup": "0.2.0",
@@ -198,6 +199,8 @@
     "rxjs": "^6.2.1",
     "script-loader": "0.7.2",
     "semver": "^5.5.0",
+    "socket.io": "^2.1.1",
+    "stream-stream": "^1.2.6",
     "style-loader": "0.19.0",
     "tar": "2.2.0",
     "tinygradient": "0.3.0",
@@ -244,7 +247,7 @@
     "@types/boom": "^7.2.0",
     "@types/chance": "^1.0.0",
     "@types/classnames": "^2.2.3",
-    "@types/d3": "^5.0.0",
+    "@types/d3": "^3.5.41",
     "@types/dedent": "^0.7.0",
     "@types/del": "^3.0.1",
     "@types/elasticsearch": "^5.0.26",
@@ -258,6 +261,7 @@
     "@types/hapi": "^17.0.18",
     "@types/has-ansi": "^3.0.0",
     "@types/hoek": "^4.1.3",
+    "@types/humps": "^1.1.2",
     "@types/jest": "^23.3.1",
     "@types/joi": "^13.4.2",
     "@types/jquery": "^3.3.6",
@@ -384,4 +388,4 @@
     "node": "8.11.4",
     "yarn": "^1.10.1"
   }
-}
+}

packages/kbn-datemath/package.json

@@ -8,7 +8,7 @@
   "typings": "target/index.d.ts",
   "scripts": {
     "build": "babel src --out-dir target --copy-files",
-    "kbn:bootstrap": "yarn build",
+    "kbn:bootstrap": "yarn build --quiet",
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {

packages/kbn-dev-utils/index.d.ts

@@ -18,3 +18,4 @@
  */
 
 export * from './src/tooling_log';
+export * from './src/serializers';

packages/kbn-dev-utils/package.json

@@ -7,7 +7,8 @@
   "private": true,
   "scripts": {
     "build": "babel src --out-dir target",
-    "kbn:bootstrap": "yarn build"
+    "kbn:bootstrap": "yarn build --quiet",
+    "kbn:watch": "yarn build --watch"
   },
   "dependencies": {
     "chalk": "^2.4.1",

packages/kbn-dev-utils/src/index.js

@@ -19,3 +19,4 @@
 
 export { withProcRunner } from './proc_runner';
 export { ToolingLog, ToolingLogTextWriter, pickLevelFromFlags } from './tooling_log';
+export { createAbsolutePathSerializer } from './serializers';

packages/kbn-dev-utils/src/serializers/absolute_path_serializer.d.ts

@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export function createAbsolutePathSerializer(
+  rootPath: string
+): { print(...args: any[]): string; test(value: any): boolean };

src/ui/public/filter_manager/lib/index.js → packages/kbn-dev-utils/src/serializers/absolute_path_serializer.js

@@ -17,8 +17,9 @@
  * under the License.
  */
 
-export { buildExistsFilter } from './exists';
-export { buildPhraseFilter } from './phrase';
-export { buildPhrasesFilter } from './phrases';
-export { buildQueryFilter } from './query';
-export { buildRangeFilter } from './range';
+export function createAbsolutePathSerializer(rootPath) {
+  return {
+    print: value => value.replace(rootPath, '<absolute path>').replace(/\\/g, '/'),
+    test: value => typeof value === 'string' && value.startsWith(rootPath),
+  };
+}

packages/kbn-dev-utils/src/serializers/index.d.ts

@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { createAbsolutePathSerializer } from './absolute_path_serializer';