Merge branch 'master' into nls/traffic-chart

.ci/build_docker.sh

@@ -7,4 +7,8 @@ cd "$(dirname "${0}")"
 cp /usr/local/bin/runbld ./
 cp /usr/local/bin/bash_standard_lib.sh ./
 
-docker build -t kibana-ci -f ./Dockerfile .
+if which docker >/dev/null; then
+    docker build -t kibana-ci -f ./Dockerfile .
+else
+    echo "Docker binary is not available. Skipping the docker build this time."
+fi

.github/CODEOWNERS

@@ -132,7 +132,7 @@
 /x-pack/test/functional_basic/apps/transform/ @elastic/ml-ui
 
 # Maps
-/x-pack/plugins/maps/ @elastic/kibana-gis
+#CC# /x-pack/plugins/maps/ @elastic/kibana-gis
 /x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
 /x-pack/test/functional/apps/maps/ @elastic/kibana-gis
 /x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis

README.md

@@ -13,7 +13,7 @@ Kibana is your window into the [Elastic Stack](https://www.elastic.co/products).
 
 If you just want to try Kibana out, check out the [Elastic Stack Getting Started Page](https://www.elastic.co/start) to give it a whirl.
 
-If you're interested in diving a bit deeper and getting a taste of Kibana's capabilities, head over to the [Kibana Getting Started Page](https://www.elastic.co/guide/en/kibana/current/getting-started.html).
+If you're interested in diving a bit deeper and getting a taste of Kibana's capabilities, head over to the [Kibana Getting Started Page](https://www.elastic.co/guide/en/kibana/current/get-started.html).
 
 ### Using a Kibana Release
 

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

@@ -8,8 +8,6 @@
 
 ```typescript
 getFieldAttrs: () => {
-        [x: string]: {
-            customLabel: string;
-        };
+        [x: string]: FieldAttrSet;
     };
 ```

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

@@ -27,7 +27,7 @@ export declare class IndexPattern implements IIndexPattern
 |  [flattenHit](./kibana-plugin-plugins-data-public.indexpattern.flattenhit.md) |  | <code>(hit: Record&lt;string, any&gt;, deep?: boolean) =&gt; Record&lt;string, any&gt;</code> |  |
 |  [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) |  | <code>FormatFieldFn</code> |  |
 |  [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) |  | <code>{</code><br/><code>        (hit: Record&lt;string, any&gt;, type?: string): any;</code><br/><code>        formatField: FormatFieldFn;</code><br/><code>    }</code> |  |
-|  [getFieldAttrs](./kibana-plugin-plugins-data-public.indexpattern.getfieldattrs.md) |  | <code>() =&gt; {</code><br/><code>        [x: string]: {</code><br/><code>            customLabel: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
+|  [getFieldAttrs](./kibana-plugin-plugins-data-public.indexpattern.getfieldattrs.md) |  | <code>() =&gt; {</code><br/><code>        [x: string]: FieldAttrSet;</code><br/><code>    }</code> |  |
 |  [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md) |  | <code>() =&gt; {</code><br/><code>        fieldAttrs?: string &#124; undefined;</code><br/><code>        title?: string &#124; undefined;</code><br/><code>        timeFieldName?: string &#124; undefined;</code><br/><code>        intervalName?: string &#124; undefined;</code><br/><code>        fields?: string &#124; undefined;</code><br/><code>        sourceFilters?: string &#124; undefined;</code><br/><code>        fieldFormatMap?: string &#124; undefined;</code><br/><code>        typeMeta?: string &#124; undefined;</code><br/><code>        type?: string &#124; undefined;</code><br/><code>    }</code> | Get last saved saved object fields |
 |  [id](./kibana-plugin-plugins-data-public.indexpattern.id.md) |  | <code>string</code> |  |
 |  [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md) |  | <code>string &#124; undefined</code> |  |

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinputprops.disablelanguageswitcher.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; [QueryStringInputProps](./kibana-plugin-plugins-data-public.querystringinputprops.md) &gt; [disableLanguageSwitcher](./kibana-plugin-plugins-data-public.querystringinputprops.disablelanguageswitcher.md)
+
+## QueryStringInputProps.disableLanguageSwitcher property
+
+<b>Signature:</b>
+
+```typescript
+disableLanguageSwitcher?: boolean;
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinputprops.icontype.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; [QueryStringInputProps](./kibana-plugin-plugins-data-public.querystringinputprops.md) &gt; [iconType](./kibana-plugin-plugins-data-public.querystringinputprops.icontype.md)
+
+## QueryStringInputProps.iconType property
+
+<b>Signature:</b>
+
+```typescript
+iconType?: string;
+```

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

@@ -18,6 +18,8 @@ export interface QueryStringInputProps
 |  [className](./kibana-plugin-plugins-data-public.querystringinputprops.classname.md) | <code>string</code> |  |
 |  [dataTestSubj](./kibana-plugin-plugins-data-public.querystringinputprops.datatestsubj.md) | <code>string</code> |  |
 |  [disableAutoFocus](./kibana-plugin-plugins-data-public.querystringinputprops.disableautofocus.md) | <code>boolean</code> |  |
+|  [disableLanguageSwitcher](./kibana-plugin-plugins-data-public.querystringinputprops.disablelanguageswitcher.md) | <code>boolean</code> |  |
+|  [iconType](./kibana-plugin-plugins-data-public.querystringinputprops.icontype.md) | <code>string</code> |  |
 |  [indexPatterns](./kibana-plugin-plugins-data-public.querystringinputprops.indexpatterns.md) | <code>Array&lt;IIndexPattern &#124; string&gt;</code> |  |
 |  [isInvalid](./kibana-plugin-plugins-data-public.querystringinputprops.isinvalid.md) | <code>boolean</code> |  |
 |  [languageSwitcherPopoverAnchorPosition](./kibana-plugin-plugins-data-public.querystringinputprops.languageswitcherpopoveranchorposition.md) | <code>PopoverAnchorPosition</code> |  |

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getfieldattrs.md

@@ -8,8 +8,6 @@
 
 ```typescript
 getFieldAttrs: () => {
-        [x: string]: {
-            customLabel: string;
-        };
+        [x: string]: FieldAttrSet;
     };
 ```

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

@@ -27,7 +27,7 @@ export declare class IndexPattern implements IIndexPattern
 |  [flattenHit](./kibana-plugin-plugins-data-server.indexpattern.flattenhit.md) |  | <code>(hit: Record&lt;string, any&gt;, deep?: boolean) =&gt; Record&lt;string, any&gt;</code> |  |
 |  [formatField](./kibana-plugin-plugins-data-server.indexpattern.formatfield.md) |  | <code>FormatFieldFn</code> |  |
 |  [formatHit](./kibana-plugin-plugins-data-server.indexpattern.formathit.md) |  | <code>{</code><br/><code>        (hit: Record&lt;string, any&gt;, type?: string): any;</code><br/><code>        formatField: FormatFieldFn;</code><br/><code>    }</code> |  |
-|  [getFieldAttrs](./kibana-plugin-plugins-data-server.indexpattern.getfieldattrs.md) |  | <code>() =&gt; {</code><br/><code>        [x: string]: {</code><br/><code>            customLabel: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
+|  [getFieldAttrs](./kibana-plugin-plugins-data-server.indexpattern.getfieldattrs.md) |  | <code>() =&gt; {</code><br/><code>        [x: string]: FieldAttrSet;</code><br/><code>    }</code> |  |
 |  [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-server.indexpattern.getoriginalsavedobjectbody.md) |  | <code>() =&gt; {</code><br/><code>        fieldAttrs?: string &#124; undefined;</code><br/><code>        title?: string &#124; undefined;</code><br/><code>        timeFieldName?: string &#124; undefined;</code><br/><code>        intervalName?: string &#124; undefined;</code><br/><code>        fields?: string &#124; undefined;</code><br/><code>        sourceFilters?: string &#124; undefined;</code><br/><code>        fieldFormatMap?: string &#124; undefined;</code><br/><code>        typeMeta?: string &#124; undefined;</code><br/><code>        type?: string &#124; undefined;</code><br/><code>    }</code> | Get last saved saved object fields |
 |  [id](./kibana-plugin-plugins-data-server.indexpattern.id.md) |  | <code>string</code> |  |
 |  [intervalName](./kibana-plugin-plugins-data-server.indexpattern.intervalname.md) |  | <code>string &#124; undefined</code> |  |

docs/management/advanced-options.asciidoc

@@ -454,7 +454,8 @@ of buckets to try to represent.
 
 [horizontal]
 [[visualization-colormapping]]`visualization:colorMapping`::
-Maps values to specified colors in visualizations.
+**This setting is deprecated and will not be supported as of 8.0.**
+Maps values to specific colors in *Visualize* charts and *TSVB*. This setting does not apply to *Lens*.
 
 [[visualization-dimmingopacity]]`visualization:dimmingOpacity`::
 The opacity of the chart items that are dimmed when highlighting another element

docs/settings/alert-action-settings.asciidoc

@@ -9,7 +9,7 @@ Alerts and actions are enabled by default in {kib}, but require you configure th
 
 . <<using-kibana-with-security,Set up {kib} to work with {stack} {security-features}>>.
 . <<configuring-tls-kib-es,Set up TLS encryption between {kib} and {es}>>.
-. <<general-alert-action-settings,Specify a value for `xpack.encryptedSavedObjects.encryptionKey`>>.
+. If you are using an *on-premises* Elastic Stack deployment, <<general-alert-action-settings,specify a value for `xpack.encryptedSavedObjects.encryptionKey`>>.
 
 You can configure the following settings in the `kibana.yml` file.
 

docs/user/dashboard/drilldowns.asciidoc

@@ -3,7 +3,7 @@
 == Create custom dashboard actions
 
 Custom dashboard actions, also known as drilldowns, allow you to create
-workflows for analyzing and troubleshooting your data. Drilldowns apply only to the panel that you created the drilldown from, and are not shared across all of the panels. Each panel can have multiple drilldowns. 
+workflows for analyzing and troubleshooting your data. Drilldowns apply only to the panel that you created the drilldown from, and are not shared across all of the panels. Each panel can have multiple drilldowns.
 
 Third-party developers can create drilldowns. To learn how to code drilldowns, refer to {kib-repo}blob/{branch}/x-pack/examples/ui_actions_enhanced_examples[this example plugin].
 
@@ -28,7 +28,7 @@ Dashboard drilldowns enable you to open a dashboard from another dashboard,
 taking the time range, filters, and other parameters with you,
 so the context remains the same. Dashboard drilldowns help you to continue your analysis from a new perspective.
 
-For example, if you have a dashboard that shows the overall status of multiple data center, 
+For example, if you have a dashboard that shows the overall status of multiple data center,
 you can create a drilldown that navigates from the overall status dashboard to a dashboard
 that shows a single data center or server.
 
@@ -41,14 +41,14 @@ Destination URLs can be dynamic, depending on the dashboard context or user inte
 For example, if you have a dashboard that shows data from a Github repository, you can create a URL drilldown
 that opens Github from the dashboard.
 
-Some panels support multiple interactions, also known as triggers. 
+Some panels support multiple interactions, also known as triggers.
 The <<variables,variables>> you use to create a <<url_templating, URL template>> depends on the trigger you choose. URL drilldowns support these types of triggers:
 
 * *Single click* &mdash; A single data point in the visualization.
 
 * *Range selection* &mdash; A range of values in a visualization.
 
-For example, *Single click* has `{{event.value}}` and *Range selection* has `{{event.from}}` and `{{event.to}}`. 
+For example, *Single click* has `{{event.value}}` and *Range selection* has `{{event.from}}` and `{{event.to}}`.
 
 To disable URL drilldowns on your {kib} instance, disable the plugin:
 
@@ -77,20 +77,20 @@ The following panels support dashboard and URL drilldowns.
 ^| X
 
 | Controls
-^| 
-^| 
+^|
+^|
 
 | Data Table
 ^| X
 ^| X
 
 | Gauge
-^| 
-^| 
+^|
+^|
 
 | Goal
-^| 
-^| 
+^|
+^|
 
 | Heat map
 ^| X
@@ -106,35 +106,35 @@ The following panels support dashboard and URL drilldowns.
 
 | Maps
 ^| X
-^| 
+^| X
 
 | Markdown
-^| 
-^| 
+^|
+^|
 
 | Metric
-^| 
-^| 
+^|
+^|
 
 | Pie
 ^| X
 ^| X
 
 | TSVB
 ^| X
-^| 
+^|
 
 | Tag Cloud
 ^| X
 ^| X
 
 | Timelion
 ^| X
-^| 
+^|
 
 | Vega
 ^| X
-^| 
+^|
 
 | Vertical Bar
 ^| X
@@ -192,7 +192,7 @@ image::images/drilldown_create.png[Create drilldown with entries for drilldown n
 
 . Click *Create drilldown*.
 +
-The drilldown is stored as dashboard metadata. 
+The drilldown is stored as dashboard metadata.
 
 . Save the dashboard.
 +
@@ -226,7 +226,7 @@ image:images/url_drilldown_go_to_github.gif[Drilldown on pie chart that navigate
 
 .. Select *Go to URL*.
 
-.. Enter the URL template: 
+.. Enter the URL template:
 +
 [source, bash]
 ----
@@ -240,7 +240,7 @@ image:images/url_drilldown_url_template.png[URL template input]
 
 .. Click *Create drilldown*.
 +
-The drilldown is stored as dashboard metadata. 
+The drilldown is stored as dashboard metadata.
 
 . Save the dashboard.
 +

examples/embeddable_examples/public/book/book_embeddable_factory.tsx

@@ -127,9 +127,10 @@ export class BookEmbeddableFactoryDefinition
 
   private async unwrapMethod(savedObjectId: string): Promise<BookSavedObjectAttributes> {
     const { savedObjectsClient } = await this.getStartServices();
-    const savedObject: SimpleSavedObject<BookSavedObjectAttributes> = await savedObjectsClient.get<
-      BookSavedObjectAttributes
-    >(this.type, savedObjectId);
+    const savedObject: SimpleSavedObject<BookSavedObjectAttributes> = await savedObjectsClient.get<BookSavedObjectAttributes>(
+      this.type,
+      savedObjectId
+    );
     return { ...savedObject.attributes };
   }
 
@@ -163,9 +164,9 @@ export class BookEmbeddableFactoryDefinition
 
   private async getAttributeService() {
     if (!this.attributeService) {
-      this.attributeService = (await this.getStartServices()).getAttributeService<
-        BookSavedObjectAttributes
-      >(this.type, {
+      this.attributeService = (
+        await this.getStartServices()
+      ).getAttributeService<BookSavedObjectAttributes>(this.type, {
         saveMethod: this.saveMethod.bind(this),
         unwrapMethod: this.unwrapMethod.bind(this),
         checkForDuplicateTitle: this.checkForDuplicateTitleMethod.bind(this),

package.json

@@ -92,6 +92,7 @@
     "**/load-grunt-config/lodash": "^4.17.20",
     "**/minimist": "^1.2.5",
     "**/node-jose/node-forge": "^0.10.0",
+    "**/prismjs": "1.22.0",
     "**/request": "^2.88.2",
     "**/trim": "0.0.3",
     "**/typescript": "4.0.2"
@@ -131,6 +132,7 @@
     "@kbn/config-schema": "link:packages/kbn-config-schema",
     "@kbn/i18n": "link:packages/kbn-i18n",
     "@kbn/interpreter": "link:packages/kbn-interpreter",
+    "@kbn/legacy-logging": "link:packages/kbn-legacy-logging",
     "@kbn/logging": "link:packages/kbn-logging",
     "@kbn/monaco": "link:packages/kbn-monaco",
     "@kbn/std": "link:packages/kbn-std",
@@ -419,7 +421,6 @@
     "@types/cmd-shim": "^2.0.0",
     "@types/color": "^3.0.0",
     "@types/compression-webpack-plugin": "^2.0.2",
-    "@types/console-stamp": "^0.2.32",
     "@types/cypress-cucumber-preprocessor": "^1.14.1",
     "@types/cytoscape": "^3.14.0",
     "@types/d3": "^3.5.43",
@@ -510,7 +511,7 @@
     "@types/pdfmake": "^0.1.15",
     "@types/pegjs": "^0.10.1",
     "@types/pngjs": "^3.4.0",
-    "@types/prettier": "^2.0.2",
+    "@types/prettier": "^2.1.5",
     "@types/pretty-ms": "^5.0.0",
     "@types/prop-types": "^15.7.3",
     "@types/proper-lockfile": "^3.0.1",
@@ -602,7 +603,6 @@
     "clean-webpack-plugin": "^3.0.0",
     "cmd-shim": "^2.1.0",
     "compare-versions": "3.5.1",
-    "console-stamp": "^0.2.9",
     "constate": "^1.3.2",
     "copy-to-clipboard": "^3.0.8",
     "copy-webpack-plugin": "^6.0.2",
@@ -627,7 +627,7 @@
     "enzyme-adapter-utils": "^1.13.0",
     "enzyme-to-json": "^3.4.4",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.11.0",
+    "eslint-config-prettier": "^6.15.0",
     "eslint-import-resolver-node": "0.3.2",
     "eslint-import-resolver-webpack": "0.11.1",
     "eslint-module-utils": "2.5.0",
@@ -763,7 +763,7 @@
     "postcss": "^7.0.32",
     "postcss-loader": "^3.0.0",
     "postcss-prefix-selector": "^1.7.2",
-    "prettier": "^2.1.1",
+    "prettier": "^2.2.0",
     "pretty-ms": "5.0.0",
     "proxyquire": "1.8.0",
     "querystring": "^0.2.0",

packages/kbn-config/src/__mocks__/env.ts

@@ -30,7 +30,6 @@ export function getEnvOptions(options: DeepPartial<EnvOptions> = {}): EnvOptions
     configs: options.configs || [],
     cliArgs: {
       dev: true,
-      open: false,
       quiet: false,
       silent: false,
       watch: false,