Merge remote-tracking branch upstream/master

elastic · Mar 16, 2021 · 7da1ae0 · 7da1ae0
2 parents 04aeeff + bae6021
commit 7da1ae0
Show file tree

Hide file tree

Showing 417 changed files with 7,897 additions and 2,844 deletions.
diff --git a/docs/glossary.asciidoc b/docs/glossary.asciidoc
@@ -2,7 +2,7 @@
 [[glossary]]
 = Glossary
 
-<<a_glos>> | <<b_glos>> | <<c_glos>> | <<d_glos>> | <<e_glos>> | <<f_glos>> | <<g_glos>> | H | I | J | <<k_glos>> | <<l_glos>> | <<m_glos>> | N | O | <<p_glos>> | <<q_glos>> | R | <<s_glos>> | <<t_glos>> | <<u_glos>> | V | <<w_glos>> | X | Y | Z
+<<a_glos>> | <<b_glos>> | <<c_glos>> | <<d_glos>> | <<e_glos>> | <<f_glos>> | <<g_glos>> | H | I | J | <<k_glos>> | <<l_glos>> | <<m_glos>> | N | O | <<p_glos>> | <<q_glos>> | <<r_glos>> | <<s_glos>> | <<t_glos>> | <<u_glos>> | V | <<w_glos>> | X | Y | Z
 
 [float]
 [[a_glos]]
@@ -13,10 +13,10 @@
 +
 --
 // tag::action-def[]
-The alert-specific response that occurs when an alert fires.
-An alert can have multiple actions.
+The rule-specific response that occurs when an alerting rule fires.
+A rule can have multiple actions.
 See
-{kibana-ref}/action-types.html[Action and connector types].
+{kibana-ref}/action-types.html[Connectors and actions].
 // end::action-def[]
 --
 
@@ -28,20 +28,6 @@ Part of {kib} Stack Management.
 See {kibana-ref}/advanced-options.html[Advanced Settings].
 // end::advanced-settings-def[]
 
-[[glossary-alert]] alert ::
-// tag::alert-def[]
-A set of <<glossary-condition,conditions>>, schedules, and <<glossary-action,actions>>
-that enable notifications.
-See <<glossary-alerts-and-actions,Alerts and Actions>>.
-// end::alert-def[]
-
-[[glossary-alerts-and-actions]] Alerts and Actions ::
-// tag::alerts-and-actions-def[]
-A comprehensive view of all your alerts. Enables you to access and
-manage alerts for all {kib} apps from one place.
-See {kibana-ref}/alerting-getting-started.html[Alerts and Actions].
-// end::alerts-and-actions-def[]
-
 [[glossary-annotation]] annotation ::
 // tag::annotation-def[]
 A way to augment a data display with descriptive domain knowledge.
@@ -113,13 +99,13 @@ The cluster location is the weighted centroid for all documents in the grid cell
 
 [[glossary-condition]] condition ::
 // tag::condition-def[]
-Specifies the circumstances that must be met to trigger an alert.
+Specifies the circumstances that must be met to trigger an alerting rule.
 // end::condition-def[]
 
 [[glossary-connector]] connector ::
 // tag::connector-def[]
 A configuration that enables integration with an external system (the destination for an action).
-See {kibana-ref}/action-types.html[Action and connector types].
+See {kibana-ref}/action-types.html[Connectors and actions].
 // end::connector-def[]
 
 [[glossary-console]] Console ::
@@ -335,6 +321,24 @@ A tool that enables you to inspect and analyze search queries to diagnose and de
 See {kibana-ref}/xpack-profiler.html[Query Profiler].
 // end::query-profiler-def[]
 
+[float]
+[[r_glos]]
+== R
+
+[[glossary-rule]] rule ::
+// tag::rule-def[]
+A set of <<glossary-condition,conditions>>, schedules, and <<glossary-action,actions>>
+that enable notifications.
+See <<glossary-rules-and-connectors,Rules and Connectors>>.
+// end::rule-def[]
+
+[[glossary-rules-and-connectors]] Rules and Connectors ::
+// tag::rules-and-connectors-def[]
+A comprehensive view of all your alerting rules. Enables you to access and
+manage rules for all {kib} apps from one place.
+See {kibana-ref}/alerting-getting-started.html[Rules and Connectors].
+// end::rules-and-connectors-def[]
+
 [float]
 [[s_glos]]
 == S

diff --git a/docs/migration/migrate_8_0.asciidoc b/docs/migration/migrate_8_0.asciidoc
@@ -202,5 +202,13 @@ All supported operating systems support using systemd service files.  Any system
 *Impact:*
 Any installations using `.deb` or `.rpm` packages using SysV will need to migrate to systemd.
 
+[float]
+=== Platform removed from root folder name for `.tar.gz` and `.zip` archives
+
+*Details:*
+The output directory after extracting an archive no longer includes the target platform.  For example, `kibana-8.0.0-linux-aarch64.tar.gz` will produce a folder named `kibana-8.0.0`.
+
+*Impact:*
+Configuration management tools and automation will need to be updated to use the new directory.
 
 // end::notable-breaking-changes[]
diff --git a/docs/setup/install/targz.asciidoc b/docs/setup/install/targz.asciidoc
@@ -34,7 +34,7 @@ The Linux archive for Kibana v{version} can be downloaded and installed as follo
 curl -O https://artifacts.elastic.co/downloads/kibana/kibana-{version}-linux-x86_64.tar.gz
 curl https://artifacts.elastic.co/downloads/kibana/kibana-{version}-linux-x86_64.tar.gz.sha512 | shasum -a 512 -c - <1>
 tar -xzf kibana-{version}-linux-x86_64.tar.gz
-cd kibana-{version}-linux-x86_64/ <2>
+cd kibana-{version}/ <2>
 --------------------------------------------
 <1> Compares the SHA of the downloaded `.tar.gz` archive and the published checksum, which should output
     `kibana-{version}-linux-x86_64.tar.gz: OK`.
@@ -82,7 +82,7 @@ The Darwin archive for Kibana v{version} can be downloaded and installed as foll
 curl -O https://artifacts.elastic.co/downloads/kibana/kibana-{version}-darwin-x86_64.tar.gz
 curl https://artifacts.elastic.co/downloads/kibana/kibana-{version}-darwin-x86_64.tar.gz.sha512 | shasum -a 512 -c - <1>
 tar -xzf kibana-{version}-darwin-x86_64.tar.gz
-cd kibana-{version}-darwin-x86_64/ <2>
+cd kibana-{version}/ <2>
 --------------------------------------------
 <1> Compares the SHA of the downloaded `.tar.gz` archive and the published checksum, which should output
     `kibana-{version}-darwin-x86_64.tar.gz: OK`.

diff --git a/packages/elastic-eslint-config-kibana/package.json b/packages/elastic-eslint-config-kibana/package.json
@@ -16,5 +16,8 @@
   "bugs": {
     "url": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana"
   },
-  "homepage": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana"
+  "homepage": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana",
+  "dependencies": {
+    "@kbn/dev-utils": "link:../kbn-dev-utils"
+  }
 }
diff --git a/packages/elastic-eslint-config-kibana/react.js b/packages/elastic-eslint-config-kibana/react.js
@@ -1,5 +1,5 @@
-const semver = require('semver')
-const PKG = require('../../package.json')
+const semver = require('semver');
+const { kibanaPackageJson: PKG } = require('@kbn/dev-utils');
 
 module.exports = {
   plugins: [

diff --git a/packages/elastic-eslint-config-kibana/typescript.js b/packages/elastic-eslint-config-kibana/typescript.js
@@ -4,7 +4,7 @@
 // as this package was moved from typescript-eslint-parser to @typescript-eslint/parser
 
 const semver = require('semver');
-const PKG = require('../../package.json');
+const { kibanaPackageJson: PKG } = require('@kbn/dev-utils');
 
 const eslintConfigPrettierTypescriptEslintRules = require('eslint-config-prettier/@typescript-eslint').rules;
 

diff --git a/packages/kbn-dev-utils/src/plugin_list/generate_plugin_list.ts b/packages/kbn-dev-utils/src/plugin_list/generate_plugin_list.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import Fs from 'fs';
 import Path from 'path';
 
 import normalizePath from 'normalize-path';
@@ -48,7 +49,7 @@ NOTE:
     node scripts/build_plugin_list_docs
 
   You can update the template within ${normalizePath(
-    Path.relative(REPO_ROOT, Path.resolve(__dirname, __filename))
+    Path.relative(REPO_ROOT, Fs.realpathSync(Path.resolve(__dirname, __filename)))
   )}
 
 ////

diff --git a/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts b/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
@@ -150,9 +150,9 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
 
   expect(bar.cache.getReferencedFiles()).toMatchInlineSnapshot(`
     Array [
+      <absolute path>/node_modules/@kbn/optimizer/postcss.config.js,
       <absolute path>/node_modules/css-loader/package.json,
       <absolute path>/node_modules/style-loader/package.json,
-      <absolute path>/packages/kbn-optimizer/postcss.config.js,
       <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/plugins/bar/kibana.json,
       <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/plugins/bar/public/index.scss,
       <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/plugins/bar/public/index.ts,

diff --git a/packages/kbn-optimizer/src/optimizer/observe_worker.ts b/packages/kbn-optimizer/src/optimizer/observe_worker.ts
@@ -63,6 +63,7 @@ function usingWorkerProc<T>(
     (): ProcResource => {
       const proc = execa.node(require.resolve('../worker/run_worker'), [], {
         nodeOptions: [
+          ...process.execArgv,
           ...(inspectFlag && config.inspectWorkers
             ? [`${inspectFlag}=${inspectPortCounter++}`]
             : []),

diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts
@@ -224,6 +224,7 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
       alias: {
         core_app_image_assets: Path.resolve(worker.repoRoot, 'src/core/public/core_app/images'),
       },
+      symlinks: false,
     },
 
     performance: {

diff --git a/packages/kbn-pm/webpack.config.js b/packages/kbn-pm/webpack.config.js
@@ -23,6 +23,7 @@ module.exports = {
 
   resolve: {
     extensions: ['.ts', '.js'],
+    symlinks: false,
   },
 
   module: {

diff --git a/packages/kbn-test/src/functional_tests/lib/paths.js b/packages/kbn-test/src/functional_tests/lib/paths.js
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { REPO_ROOT } from '@kbn/utils';
 import { resolve, relative } from 'path';
 
 // resolve() treats relative paths as relative to process.cwd(),
@@ -16,7 +17,7 @@ function resolveRelative(path) {
 
 export const KIBANA_EXEC = 'node';
 export const KIBANA_EXEC_PATH = resolveRelative('scripts/kibana');
-export const KIBANA_ROOT = resolve(__dirname, '../../../../../');
+export const KIBANA_ROOT = REPO_ROOT;
 export const KIBANA_FTR_SCRIPT = resolve(KIBANA_ROOT, 'scripts/functional_test_runner');
 export const PROJECT_ROOT = resolve(__dirname, '../../../../../../');
 export const FUNCTIONAL_CONFIG_PATH = resolve(KIBANA_ROOT, 'test/functional/config');

diff --git a/packages/kbn-test/src/functional_tests/lib/run_kibana_server.js b/packages/kbn-test/src/functional_tests/lib/run_kibana_server.js
@@ -62,11 +62,15 @@ function collectCliArgs(config, { installDir, extraKbnOpts }) {
   const buildArgs = config.get('kbnTestServer.buildArgs') || [];
   const sourceArgs = config.get('kbnTestServer.sourceArgs') || [];
   const serverArgs = config.get('kbnTestServer.serverArgs') || [];
+  const execArgv = process.execArgv || [];
 
   return pipe(
     serverArgs,
     (args) => (installDir ? args.filter((a) => a !== '--oss') : args),
-    (args) => (installDir ? [...buildArgs, ...args] : [KIBANA_EXEC_PATH, ...sourceArgs, ...args]),
+    (args) =>
+      installDir
+        ? [...buildArgs, ...args]
+        : [...execArgv, KIBANA_EXEC_PATH, ...sourceArgs, ...args],
     (args) => args.concat(extraKbnOpts || [])
   );
 }

diff --git a/packages/kbn-test/src/legacy_es/es_test_config.js b/packages/kbn-test/src/legacy_es/es_test_config.js
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { kibanaPackageJson as pkg } from '@kbn/dev-utils';
 import url, { format as formatUrl } from 'url';
-import pkg from '../../../../package.json';
 import { adminTestUser } from '../kbn';
 
 export const esTestConfig = new (class EsTestConfig {

diff --git a/packages/kbn-test/src/mocha/junit_report_generation.js b/packages/kbn-test/src/mocha/junit_report_generation.js
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { REPO_ROOT } from '@kbn/utils';
 import { dirname, relative } from 'path';
 import { writeFileSync, mkdirSync } from 'fs';
 import { inspect } from 'util';
@@ -21,7 +22,7 @@ const dateNow = Date.now.bind(Date);
 export function setupJUnitReportGeneration(runner, options = {}) {
   const {
     reportName = 'Unnamed Mocha Tests',
-    rootDirectory = dirname(require.resolve('../../../../package.json')),
+    rootDirectory = REPO_ROOT,
     getTestMetadata = () => ({}),
   } = options;
 

diff --git a/packages/kbn-ui-shared-deps/webpack.config.js b/packages/kbn-ui-shared-deps/webpack.config.js
@@ -101,6 +101,7 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({
       moment: MOMENT_SRC,
     },
     extensions: ['.js', '.ts'],
+    symlinks: false,
   },
 
   optimization: {

diff --git a/packages/kbn-utils/src/repo_root.ts b/packages/kbn-utils/src/repo_root.ts
@@ -7,7 +7,6 @@
  */
 
 import Path from 'path';
-import Fs from 'fs';
 
 import loadJsonFile from 'load-json-file';
 
@@ -31,7 +30,7 @@ const findKibanaPackageJson = () => {
   // search for the kibana directory, since this file is moved around it might
   // not be where we think but should always be a relatively close parent
   // of this directory
-  const startDir = Fs.realpathSync(__dirname);
+  const startDir = __dirname;
   const { root: rootDir } = Path.parse(startDir);
   let cursor = startDir;
   while (true) {