Merge branch 'master' into x-pack/mgmt/ls/pipeline-list/sorting

.backportrc.json

@@ -1,5 +1,5 @@
 {
   "upstream": "elastic/kibana",
-  "branches": [{ "name": "7.x", "checked": true }, "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
+  "branches": [{ "name": "7.x", "checked": true }, "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
   "labels": ["backport"]
 }

.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: ~
+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

.eslintignore

@@ -5,7 +5,6 @@ bower_components
 /target
 /.es
 /plugins
-/optimize
 /built_assets
 /html_docs
 /src/fixtures/vislib/mock_data

.eslintrc.js

@@ -31,7 +31,9 @@ const ELASTIC_LICENSE_HEADER = `
 `;
 
 module.exports = {
-  extends: ['@elastic/eslint-config-kibana'],
+  root: true,
+
+  extends: ['@elastic/eslint-config-kibana', 'plugin:@elastic/eui/recommended'],
 
   overrides: [
     /**
@@ -160,6 +162,8 @@ module.exports = {
               {
                 from: ['src/legacy/ui/**/*', 'ui/**/*'],
                 target: [
+                  'test/plugin_functional/plugins/**/public/np_ready/**/*',
+                  'test/plugin_functional/plugins/**/server/np_ready/**/*',
                   'src/legacy/core_plugins/**/public/np_ready/**/*',
                   'src/legacy/core_plugins/**/server/np_ready/**/*',
                   'x-pack/legacy/plugins/**/public/np_ready/**/*',

.github/CODEOWNERS

@@ -5,6 +5,7 @@
 # App Architecture
 /src/plugins/data/ @elastic/kibana-app-arch
 /src/plugins/kibana_utils/ @elastic/kibana-app-arch
+/src/plugins/kibana_react/ @elastic/kibana-app-arch
 
 # APM
 /x-pack/legacy/plugins/apm/  @elastic/apm-ui
@@ -37,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

.github/labeler.yml

@@ -0,0 +1,12 @@
+'Team:AppArch':
+- src/plugins/data/**/*
+- src/plugins/embeddable/**/*
+- src/plugins/kibana_react/**/*
+- src/plugins/kibana_utils/**/*
+- src/legacy/core_plugins/dashboard_embeddable_container/**/*
+- src/legacy/core_plugins/data/**/*
+- src/legacy/core_plugins/embeddable_api/**/*
+- src/legacy/core_plugins/interpreter/**/*
+- src/legacy/ui/public/index_patterns/**/*
+- src/legacy/ui/public/indexed_array/**/*
+- src/legacy/ui/public/new_platform/**/*

.i18nrc.json

@@ -2,6 +2,7 @@
   "paths": {
     "common.ui": "src/legacy/ui",
     "data": "src/legacy/core_plugins/data",
+    "expressions": "src/legacy/core_plugins/expressions",
     "kibana_react": "src/legacy/core_plugins/kibana_react",
     "server": "src/legacy/server",
     "console": "src/legacy/core_plugins/console",
@@ -23,9 +24,11 @@
     "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"
+    "inspector": "src/plugins/inspector",
+    "kibana-react": "src/plugins/kibana_react",
+    "esUi": "src/plugins/es_ui_shared"
   },
   "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
   "translations": []

.sass-lint.yml

@@ -6,32 +6,28 @@ files:
     - 'src/legacy/ui/public/vislib/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
+    - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
 rules:
   quotes:
     - 2
-    -
-      style: 'single'
+    - style: 'single'
   # } else { style on one line, like our JS
   brace-style:
     - 2
-    -
-      style: '1tbs'
+    - style: '1tbs'
   variable-name-format:
     - 2
-    -
-      convention: 'camelcase'
+    - convention: 'camelcase'
   # Needs regex, right now we ignore
   class-name-format: 0
   # Order how you please
   property-sort-order: 0
   hex-notation:
     - 2
-    -
-      style: 'uppercase'
+    - style: 'uppercase'
   mixin-name-format:
     - 2
-    -
-      allow-leading-underscore: false
+    - allow-leading-underscore: false
       convention: 'camelcase'
   # Use none instead of 0 for no border
   border-zero:
@@ -46,8 +42,7 @@ rules:
   indentation: 2
   function-name-format:
     - 2
-    -
-      allow-leading-underscore: false
+    - allow-leading-underscore: false
       convention: 'camelcase'
   # This removes the need for ::hover
   pseudo-element: 0
@@ -61,23 +56,20 @@ rules:
   force-attribute-nesting: 0
   no-qualifying-elements:
     - 2
-    -
-      # Allows input[type=search]
+    - # Allows input[type=search]
       allow-element-with-attribute: 1
   # Files can end without a newline
   final-newline: 0
   # We use some rare duplicate property values for browser variance
   no-duplicate-properties:
     - 2
-    -
-      exclude:
+    - exclude:
         - 'font-size'
         - 'word-break'
   # Put a line-break between sections of CSS, but allow quicky one-liners for legibility
   empty-line-between-blocks:
     - 2
-    -
-      allow-single-line-rulesets: 1
+    - allow-single-line-rulesets: 1
   # Warns are nice for deprecations and development
   no-warn: 0
   # Transition all is useful in certain situations and there's no recent info to suggest slowdown