Merge remote-tracking branch 'upstream/master' into new-ml-url-generator

.eslintignore

@@ -39,7 +39,7 @@ target
 /x-pack/legacy/plugins/maps/public/vendor/**
 
 # package overrides
-/packages/eslint-config-kibana
+/packages/elastic-eslint-config-kibana
 /packages/kbn-interpreter/src/common/lib/grammar.js
 /packages/kbn-plugin-generator/template
 /packages/kbn-pm/dist

.eslintrc.js

@@ -94,12 +94,6 @@ module.exports = {
         'jsx-a11y/no-onchange': 'off',
       },
     },
-    {
-      files: ['src/plugins/es_ui_shared/**/*.{js,mjs,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
     {
       files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
       rules: {
@@ -125,25 +119,12 @@ module.exports = {
         'jsx-a11y/click-events-have-key-events': 'off',
       },
     },
-    {
-      files: ['x-pack/legacy/plugins/index_management/**/*.{js,mjs,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-        'react-hooks/rules-of-hooks': 'off',
-      },
-    },
     {
       files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,mjs,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
 
     /**
      * Files that require Apache 2.0 headers, settings
@@ -296,10 +277,7 @@ module.exports = {
                 errorMessage: `Plugins may only import from src/core/server and src/core/public.`,
               },
               {
-                target: [
-                  '(src|x-pack)/plugins/*/server/**/*',
-                  '!x-pack/plugins/apm/**/*', // https://github.com/elastic/kibana/issues/67210
-                ],
+                target: ['(src|x-pack)/plugins/*/server/**/*'],
                 from: ['(src|x-pack)/plugins/*/public/**/*'],
                 errorMessage: `Server code can not import from public, use a common directory.`,
               },

.github/CODEOWNERS

@@ -85,7 +85,6 @@
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/observability-ui
-/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
 

docs/developer/getting-started/index.asciidoc

@@ -30,7 +30,7 @@ you can switch to the correct version when using nvm by running:
 nvm use
 ----
 
-Install the latest version of https://yarnpkg.com[yarn].
+Install the latest version of https://classic.yarnpkg.com/en/docs/install[yarn v1].
 
 Bootstrap {kib} and install all the dependencies:
 

docs/developer/getting-started/running-kibana-advanced.asciidoc

@@ -48,7 +48,7 @@ If you’re installing dependencies and seeing an error that looks
 something like
 
 ....
-Unsupported URL Type: link:packages/eslint-config-kibana
+Unsupported URL Type: link:packages/elastic-eslint-config-kibana
 ....
 
 you’re likely running `npm`. To install dependencies in {kib} you

docs/developer/plugin/external-plugin-functional-tests.asciidoc

@@ -13,7 +13,7 @@ To get started copy and paste this example to `test/functional/config.js`:
 ["source","js"]
 -----------
 import { resolve } from 'path';
-import { resolveKibanaPath } from '@kbn/plugin-helpers';
+import { REPO_ROOT } from '@kbn/dev-utils';
 
 import { MyServiceProvider } from './services/my_service';
 import { MyAppPageProvider } from './services/my_app_page';
@@ -24,7 +24,7 @@ export default async function ({ readConfigFile }) {
 
   // read the {kib} config file so that we can utilize some of
   // its services and PageObjects
-  const kibanaConfig = await readConfigFile(resolveKibanaPath('test/functional/config.js'));
+  const kibanaConfig = await readConfigFile(resolve(REPO_ROOT, 'test/functional/config.js'));
 
   return {
     // list paths to the files that contain your plugins tests

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.action_global_apply_filter.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [ACTION\_GLOBAL\_APPLY\_FILTER](./kibana-plugin-plugins-data-public.action_global_apply_filter.md)
+
+## ACTION\_GLOBAL\_APPLY\_FILTER variable
+
+<b>Signature:</b>
+
+```typescript
+ACTION_GLOBAL_APPLY_FILTER = "ACTION_GLOBAL_APPLY_FILTER"
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md

@@ -7,15 +7,8 @@
 <b>Signature:</b>
 
 ```typescript
-init(forceFieldRefresh?: boolean): Promise<this>;
+init(): Promise<this>;
 ```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  forceFieldRefresh | <code>boolean</code> |  |
-
 <b>Returns:</b>
 
 `Promise<this>`

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md

@@ -50,7 +50,7 @@ export declare class IndexPattern implements IIndexPattern
 |  [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) |  |  |
 |  [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) |  |  |
 |  [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) |  |  |
-|  [init(forceFieldRefresh)](./kibana-plugin-plugins-data-public.indexpattern.init.md) |  |  |
+|  [init()](./kibana-plugin-plugins-data-public.indexpattern.init.md) |  |  |
 |  [initFromSpec(spec)](./kibana-plugin-plugins-data-public.indexpattern.initfromspec.md) |  |  |
 |  [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) |  |  |
 |  [isTimeBasedWildcard()](./kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md) |  |  |

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md

@@ -89,6 +89,7 @@
 
 |  Variable | Description |
 |  --- | --- |
+|  [ACTION\_GLOBAL\_APPLY\_FILTER](./kibana-plugin-plugins-data-public.action_global_apply_filter.md) |  |
 |  [AggGroupLabels](./kibana-plugin-plugins-data-public.agggrouplabels.md) |  |
 |  [AggGroupNames](./kibana-plugin-plugins-data-public.agggroupnames.md) |  |
 |  [baseFormattersPublic](./kibana-plugin-plugins-data-public.baseformatterspublic.md) |  |

docs/settings/monitoring-settings.asciidoc

@@ -5,12 +5,12 @@
 <titleabbrev>Monitoring settings</titleabbrev>
 ++++
 
-By default, the Monitoring application is enabled, but data collection
-is disabled.  When you first start {kib} monitoring, you are prompted to
-enable data collection. If you are using {stack-security-features}, 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.
+By default, *{stack-monitor-app}* is enabled, but data collection is disabled.
+When you first start {kib} monitoring, you are prompted to enable data
+collection. If you are using {stack-security-features}, 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
@@ -49,7 +49,7 @@ For more information, see
   in {kib}  to the {es} monitoring cluster and to verify licensing status on the {es}
   monitoring cluster. +
   +
-  Every other request performed by the Stack Monitoring UI to the monitoring {es}
+  Every other request performed by *{stack-monitor-app}* to the monitoring {es}
   cluster uses the authenticated user's credentials, which must be the same on
   both the {es} monitoring cluster and the {es} production cluster. +
   +
@@ -60,7 +60,7 @@ For more information, see
   in {kib}  to the {es} monitoring cluster and to verify licensing status on the {es}
   monitoring cluster. +
   +
-  Every other request performed by the Stack Monitoring UI to the monitoring {es}
+  Every other request performed by *{stack-monitor-app}* to the monitoring {es}
   cluster uses the authenticated user's credentials, which must be the same on
   both the {es} monitoring cluster and the {es} production cluster. +
   +
@@ -83,7 +83,7 @@ These settings control how data is collected from {kib}.
 |===
 | `monitoring.kibana.collection.enabled`
   | Set to `true` (default) to enable data collection from the {kib} NodeJS server
-  for {kib} Dashboards to be featured in the Monitoring.
+  for {kib} dashboards to be featured in *{stack-monitor-app}*.
 
 | `monitoring.kibana.collection.interval`
   | Specifies the number of milliseconds to wait in between data sampling on the
@@ -96,16 +96,26 @@ These settings control how data is collected from {kib}.
 [[monitoring-ui-settings]]
 ==== Monitoring UI settings
 
-These settings adjust how the {kib} Monitoring page displays monitoring data.
+These settings adjust how *{stack-monitor-app}* displays monitoring data.
 However, the defaults work best in most circumstances. For more information
 about configuring {kib}, see
-{kibana-ref}/settings.html[Setting Kibana Server Properties].
+{kibana-ref}/settings.html[Setting {kib} server properties].
 
 [cols="2*<"]
 |===
 | `monitoring.ui.elasticsearch.logFetchCount`
-  | Specifies the number of log entries to display in the Monitoring UI. Defaults to
-  `10`. The maximum value is `50`.
+  | Specifies the number of log entries to display in *{stack-monitor-app}*.
+  Defaults to `10`. The maximum value is `50`.
+
+| `monitoring.ui.enabled`
+  | Set to `false` to hide *{stack-monitor-app}*. The monitoring back-end
+    continues to run as an agent for sending {kib} stats to the monitoring
+    cluster. Defaults to `true`.
+
+| `monitoring.ui.logs.index`
+  | Specifies the name of the indices that are shown on the
+  <<logs-monitor-page,*Logs*>> page in *{stack-monitor-app}*. The default value
+  is `filebeat-*`.
 
 | `monitoring.ui.max_bucket_size`
   | Specifies the number of term buckets to return out of the overall terms list when
@@ -120,18 +130,13 @@ about configuring {kib}, see
   `monitoring.ui.collection.interval` in `elasticsearch.yml`, use the same
   value in this setting.
 
-| `monitoring.ui.enabled`
-  | Set to `false` to hide the Monitoring UI in {kib}. The monitoring back-end
-  continues to run as an agent for sending {kib} stats to the monitoring
-  cluster. Defaults to `true`.
-
 |===
 
 [float]
 [[monitoring-ui-cgroup-settings]]
 ===== Monitoring UI container settings
 
-The Monitoring UI exposes the Cgroup statistics that we collect for you to make
+*{stack-monitor-app}* exposes the Cgroup statistics that we collect for you to make
 better decisions about your container performance, rather than guessing based on
 the overall machine performance. If you are not running your applications in a
 container, then Cgroup statistics are not useful.

docs/setup/settings.asciidoc

@@ -592,7 +592,7 @@ The `server.xsrf.whitelist` setting requires the following format:
 [cols="2*<"]
 |===
 
-| [[settings-xsrf-disableProtection]] `status.xsrf.disableProtection:`
+| [[settings-xsrf-disableProtection]] `server.xsrf.disableProtection:`
  | Setting this to `true` will completely disable Cross-site request forgery protection in Kibana. This is not recommended. *Default: `false`*
 
 | `status.allowAnonymous:`

package.json

@@ -117,15 +117,18 @@
       "**/@types/*/**",
       "**/grunt-*",
       "**/grunt-*/**",
-      "x-pack/typescript"
+      "x-pack/typescript",
+      "@elastic/eui/rehype-react",
+      "@elastic/eui/remark-rehype",
+      "@elastic/eui/remark-rehype/**"
     ]
   },
   "dependencies": {
     "@babel/core": "^7.11.1",
     "@babel/register": "^7.10.5",
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.9.0-rc.2",
-    "@elastic/eui": "27.4.1",
+    "@elastic/eui": "28.2.0",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "^2.5.0",
     "@elastic/request-crypto": "1.1.4",
@@ -227,7 +230,7 @@
     "@babel/parser": "^7.11.2",
     "@babel/types": "^7.11.0",
     "@elastic/apm-rum": "^5.5.0",
-    "@elastic/charts": "19.8.1",
+    "@elastic/charts": "21.0.1",
     "@elastic/ems-client": "7.9.3",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",

packages/eslint-config-kibana/README.md → packages/elastic-eslint-config-kibana/README.md

@@ -1,4 +1,4 @@
-# eslint-config-kibana
+# elastic-eslint-config-kibana
 
 The eslint config used by the kibana team
 

packages/eslint-config-kibana/package.json → packages/elastic-eslint-config-kibana/package.json

@@ -5,15 +5,15 @@
   "main": ".eslintrc.js",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/elastic/eslint-config-kibana.git"
+    "url": "git+https://github.com/elastic/kibana.git"
   },
   "keywords": [],
   "author": "Spencer Alger <email@spalger.com>",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/elastic/kibana/tree/master/packages/eslint-config-kibana"
+    "url": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana"
   },
-  "homepage": "https://github.com/elastic/kibana/tree/master/packages/eslint-config-kibana",
+  "homepage": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana",
   "peerDependencies": {
     "@typescript-eslint/eslint-plugin": "^3.10.0",
     "@typescript-eslint/parser": "^3.10.0",

packages/kbn-dev-utils/package.json

@@ -1,32 +1,38 @@
 {
   "name": "@kbn/dev-utils",
-  "main": "./target/index.js",
   "version": "1.0.0",
-  "license": "Apache-2.0",
   "private": true,
+  "license": "Apache-2.0",
+  "main": "./target/index.js",
   "scripts": {
     "build": "tsc",
     "kbn:bootstrap": "yarn build",
     "kbn:watch": "yarn build --watch"
   },
   "dependencies": {
+    "@babel/core": "^7.11.1",
     "axios": "^0.19.0",
     "chalk": "^4.1.0",
+    "cheerio": "0.22.0",
     "dedent": "^0.7.0",
     "execa": "^4.0.2",
     "exit-hook": "^2.2.0",
     "getopts": "^2.2.5",
+    "globby": "^8.0.1",
     "load-json-file": "^6.2.0",
-    "normalize-path": "^3.0.0",
+    "markdown-it": "^10.0.0",
     "moment": "^2.24.0",
+    "normalize-path": "^3.0.0",
     "rxjs": "^6.5.5",
     "strip-ansi": "^6.0.0",
     "tree-kill": "^1.2.2",
-    "tslib": "^2.0.0"
+    "vinyl": "^2.2.0"
   },
   "devDependencies": {
-    "typescript": "4.0.2",
+    "@kbn/babel-preset": "1.0.0",
     "@kbn/expect": "1.0.0",
-    "chance": "1.0.18"
+    "@types/vinyl": "^2.0.4",
+    "chance": "1.0.18",
+    "typescript": "4.0.2"
   }
 }