fix merge conflicts

.sass-lint.yml

@@ -8,6 +8,7 @@ files:
     - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/lens/**/*.s+(a|c)ss'
+    - 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
 rules:
   quotes:
     - 2

Jenkinsfile

@@ -294,6 +294,6 @@ def buildXpack() {
 def runErrorReporter() {
   bash """
     source src/dev/ci_setup/setup_env.sh
-    node src/dev/failed_tests/cli
+    node scripts/report_failed_tests
   """
 }

docs/apm/troubleshooting.asciidoc

@@ -0,0 +1,44 @@
+[[troubleshooting]] 
+=== Troubleshooting common problems
+
+If you have something to add to this section, please consider creating a pull request with
+your proposed changes at https://github.com/elastic/kibana.
+
+Also check out the https://discuss.elastic.co/c/apm[APM discussion forum].
+
+==== No APM data found
+
+This section can help with any of the following:
+
+* Data isn't displaying in the APM app
+* You're seeing a message like "No Services Found",
+* You're seeing errors like "Fielddata is disabled on text fields by default..."
+
+There are a number of factors that could be at play here.
+One important thing to double-check first is your index template.
+
+An APM index template must exist for the APM app to work correctly.
+By default, this index template is created by APM Server on startup.
+However, this only happens if `setup.template.enabled` is `true` in `apm-server.yml`.
+You can create the index template manually by running `apm-server setup`.
+Take note that index templates *cannot* be applied retroactively -- they are only applied at index creation time.
+More information is available in {apm-server-ref}/apm-server-configuration.html[Set up and configure].
+
+You can check for the existence of an APM index template using the
+{ref}/indices-get-template.html[Get index template API].
+If you're using the default index naming pattern, that request would be:
+
+[source,js]
+--------------------------------------------------
+GET /_template/apm-{version}
+--------------------------------------------------
+// CONSOLE
+
+If you're not outputting data directly from APM Server to Elasticsearch (perhaps you're using Logstash or Kafka),
+then the index template will not be set up automatically. Instead, you'll need to
+{apm-server-ref}/_manually_loading_template_configuration.html#load-template-manually-alternate[load the template manually].
+
+Finally, this problem can also occur if you've changed the index name that you write APM data to.
+The default index pattern can be found {apm-server-ref}/elasticsearch-output.html#index-option-es[here].
+If you change this setting, you must also configure the `setup.template.name` and `setup.template.pattern` options.
+See {apm-server-ref}/configuration-template.html[Load the Elasticsearch index template].

docs/apm/using-the-apm-ui.asciidoc

@@ -35,3 +35,5 @@ include::metrics.asciidoc[]
 include::agent-configuration.asciidoc[]
 
 include::advanced-queries.asciidoc[]
+
+include::troubleshooting.asciidoc[]

docs/development/core/public/kibana-plugin-public.md

@@ -70,7 +70,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [Plugin](./kibana-plugin-public.plugin.md) | The interface that should be returned by a <code>PluginInitializer</code>. |
 |  [PluginInitializerContext](./kibana-plugin-public.plugininitializercontext.md) | The available core services passed to a <code>PluginInitializer</code> |
 |  [SavedObject](./kibana-plugin-public.savedobject.md) |  |
-|  [SavedObjectAttributes](./kibana-plugin-public.savedobjectattributes.md) | The data for a Saved Object is stored in the <code>attributes</code> key as either an object or an array of objects. |
+|  [SavedObjectAttributes](./kibana-plugin-public.savedobjectattributes.md) | The data for a Saved Object is stored as an object in the <code>attributes</code> property. |
 |  [SavedObjectReference](./kibana-plugin-public.savedobjectreference.md) | A reference to another saved object. |
 |  [SavedObjectsBaseOptions](./kibana-plugin-public.savedobjectsbaseoptions.md) |  |
 |  [SavedObjectsBatchResponse](./kibana-plugin-public.savedobjectsbatchresponse.md) |  |
@@ -104,7 +104,8 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [PluginInitializer](./kibana-plugin-public.plugininitializer.md) | The <code>plugin</code> export at the root of a plugin's <code>public</code> directory should conform to this interface. |
 |  [PluginOpaqueId](./kibana-plugin-public.pluginopaqueid.md) |  |
 |  [RecursiveReadonly](./kibana-plugin-public.recursivereadonly.md) |  |
-|  [SavedObjectAttribute](./kibana-plugin-public.savedobjectattribute.md) |  |
+|  [SavedObjectAttribute](./kibana-plugin-public.savedobjectattribute.md) | Type definition for a Saved Object attribute value |
+|  [SavedObjectAttributeSingle](./kibana-plugin-public.savedobjectattributesingle.md) | Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-public.savedobjectattribute.md) |
 |  [SavedObjectsClientContract](./kibana-plugin-public.savedobjectsclientcontract.md) | SavedObjectsClientContract as implemented by the [SavedObjectsClient](./kibana-plugin-public.savedobjectsclient.md) |
 |  [ToastInput](./kibana-plugin-public.toastinput.md) |  |
 |  [UiSettingsClientContract](./kibana-plugin-public.uisettingsclientcontract.md) | [UiSettingsClient](./kibana-plugin-public.uisettingsclient.md) |

docs/development/core/public/kibana-plugin-public.savedobject.attributes.md

@@ -4,7 +4,7 @@
 
 ## SavedObject.attributes property
 
-The data for a Saved Object is stored in the `attributes` key as either an object or an array of objects.
+The data for a Saved Object is stored as an object in the `attributes` property.
 
 <b>Signature:</b>
 

docs/development/core/public/kibana-plugin-public.savedobject.md

@@ -15,7 +15,7 @@ export interface SavedObject<T extends SavedObjectAttributes = any>
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [attributes](./kibana-plugin-public.savedobject.attributes.md) | <code>T</code> | The data for a Saved Object is stored in the <code>attributes</code> key as either an object or an array of objects. |
+|  [attributes](./kibana-plugin-public.savedobject.attributes.md) | <code>T</code> | The data for a Saved Object is stored as an object in the <code>attributes</code> property. |
 |  [error](./kibana-plugin-public.savedobject.error.md) | <code>{</code><br/><code>        message: string;</code><br/><code>        statusCode: number;</code><br/><code>    }</code> |  |
 |  [id](./kibana-plugin-public.savedobject.id.md) | <code>string</code> | The ID of this Saved Object, guaranteed to be unique for all objects of the same <code>type</code> |
 |  [migrationVersion](./kibana-plugin-public.savedobject.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |

docs/development/core/public/kibana-plugin-public.savedobjectattribute.md

@@ -4,9 +4,10 @@
 
 ## SavedObjectAttribute type
 
+Type definition for a Saved Object attribute value
 
 <b>Signature:</b>
 
 ```typescript
-export declare type SavedObjectAttribute = string | number | boolean | null | undefined | SavedObjectAttributes | SavedObjectAttributes[];
+export declare type SavedObjectAttribute = SavedObjectAttributeSingle | SavedObjectAttributeSingle[];
 ```

docs/development/core/public/kibana-plugin-public.savedobjectattributes.md

@@ -4,7 +4,7 @@
 
 ## SavedObjectAttributes interface
 
-The data for a Saved Object is stored in the `attributes` key as either an object or an array of objects.
+The data for a Saved Object is stored as an object in the `attributes` property.
 
 <b>Signature:</b>
 

docs/development/core/public/kibana-plugin-public.savedobjectattributesingle.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [SavedObjectAttributeSingle](./kibana-plugin-public.savedobjectattributesingle.md)
+
+## SavedObjectAttributeSingle type
+
+Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-public.savedobjectattribute.md)
+
+<b>Signature:</b>
+
+```typescript
+export declare type SavedObjectAttributeSingle = string | number | boolean | null | undefined | SavedObjectAttributes;
+```

docs/development/core/server/kibana-plugin-server.md

@@ -76,7 +76,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [RouteConfig](./kibana-plugin-server.routeconfig.md) | Route specific configuration. |
 |  [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md) | Additional route options. |
 |  [SavedObject](./kibana-plugin-server.savedobject.md) |  |
-|  [SavedObjectAttributes](./kibana-plugin-server.savedobjectattributes.md) | The data for a Saved Object is stored in the <code>attributes</code> key as either an object or an array of objects. |
+|  [SavedObjectAttributes](./kibana-plugin-server.savedobjectattributes.md) | The data for a Saved Object is stored as an object in the <code>attributes</code> property. |
 |  [SavedObjectReference](./kibana-plugin-server.savedobjectreference.md) | A reference to another saved object. |
 |  [SavedObjectsBaseOptions](./kibana-plugin-server.savedobjectsbaseoptions.md) |  |
 |  [SavedObjectsBulkCreateObject](./kibana-plugin-server.savedobjectsbulkcreateobject.md) |  |
@@ -152,7 +152,8 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [ResponseErrorAttributes](./kibana-plugin-server.responseerrorattributes.md) | Additional data to provide error details. |
 |  [ResponseHeaders](./kibana-plugin-server.responseheaders.md) | Http response headers to set. |
 |  [RouteMethod](./kibana-plugin-server.routemethod.md) | The set of common HTTP methods supported by Kibana routing. |
-|  [SavedObjectAttribute](./kibana-plugin-server.savedobjectattribute.md) |  |
+|  [SavedObjectAttribute](./kibana-plugin-server.savedobjectattribute.md) | Type definition for a Saved Object attribute value |
+|  [SavedObjectAttributeSingle](./kibana-plugin-server.savedobjectattributesingle.md) | Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-server.savedobjectattribute.md) |
 |  [SavedObjectsClientContract](./kibana-plugin-server.savedobjectsclientcontract.md) | Saved Objects is Kibana's data persisentence mechanism allowing plugins to use Elasticsearch for storing plugin state.<!-- -->\#\# SavedObjectsClient errors<!-- -->Since the SavedObjectsClient has its hands in everything we are a little paranoid about the way we present errors back to to application code. Ideally, all errors will be either:<!-- -->1. Caused by bad implementation (ie. undefined is not a function) and as such unpredictable 2. An error that has been classified and decorated appropriately by the decorators in [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md)<!-- -->Type 1 errors are inevitable, but since all expected/handle-able errors should be Type 2 the <code>isXYZError()</code> helpers exposed at <code>SavedObjectsErrorHelpers</code> should be used to understand and manage error responses from the <code>SavedObjectsClient</code>.<!-- -->Type 2 errors are decorated versions of the source error, so if the elasticsearch client threw an error it will be decorated based on its type. That means that rather than looking for <code>error.body.error.type</code> or doing substring checks on <code>error.body.error.reason</code>, just use the helpers to understand the meaning of the error:<!-- -->\`\`\`<!-- -->js if (SavedObjectsErrorHelpers.isNotFoundError(error)) { // handle 404 }<!-- -->if (SavedObjectsErrorHelpers.isNotAuthorizedError(error)) { // 401 handling should be automatic, but in case you wanted to know }<!-- -->// always rethrow the error unless you handle it throw error; \`\`\`<!-- -->\#\#\# 404s from missing index<!-- -->From the perspective of application code and APIs the SavedObjectsClient is a black box that persists objects. One of the internal details that users have no control over is that we use an elasticsearch index for persistance and that index might be missing.<!-- -->At the time of writing we are in the process of transitioning away from the operating assumption that the SavedObjects index is always available. Part of this transition is handling errors resulting from an index missing. These used to trigger a 500 error in most cases, and in others cause 404s with different error messages.<!-- -->From my (Spencer) perspective, a 404 from the SavedObjectsApi is a 404; The object the request/call was targeting could not be found. This is why \#14141 takes special care to ensure that 404 errors are generic and don't distinguish between index missing or document missing.<!-- -->\#\#\# 503s from missing index<!-- -->Unlike all other methods, create requests are supposed to succeed even when the Kibana index does not exist because it will be automatically created by elasticsearch. When that is not the case it is because Elasticsearch's <code>action.auto_create_index</code> setting prevents it from being created automatically so we throw a special 503 with the intention of informing the user that their Elasticsearch settings need to be updated.<!-- -->See [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md) |
 |  [SavedObjectsClientWrapperFactory](./kibana-plugin-server.savedobjectsclientwrapperfactory.md) | Describes the factory used to create instances of Saved Objects Client Wrappers. |
 

docs/development/core/server/kibana-plugin-server.savedobject.attributes.md

@@ -4,7 +4,7 @@
 
 ## SavedObject.attributes property
 
-The data for a Saved Object is stored in the `attributes` key as either an object or an array of objects.
+The data for a Saved Object is stored as an object in the `attributes` property.
 
 <b>Signature:</b>
 

docs/development/core/server/kibana-plugin-server.savedobject.md

@@ -15,7 +15,7 @@ export interface SavedObject<T extends SavedObjectAttributes = any>
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [attributes](./kibana-plugin-server.savedobject.attributes.md) | <code>T</code> | The data for a Saved Object is stored in the <code>attributes</code> key as either an object or an array of objects. |
+|  [attributes](./kibana-plugin-server.savedobject.attributes.md) | <code>T</code> | The data for a Saved Object is stored as an object in the <code>attributes</code> property. |
 |  [error](./kibana-plugin-server.savedobject.error.md) | <code>{</code><br/><code>        message: string;</code><br/><code>        statusCode: number;</code><br/><code>    }</code> |  |
 |  [id](./kibana-plugin-server.savedobject.id.md) | <code>string</code> | The ID of this Saved Object, guaranteed to be unique for all objects of the same <code>type</code> |
 |  [migrationVersion](./kibana-plugin-server.savedobject.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |

docs/development/core/server/kibana-plugin-server.savedobjectattribute.md

@@ -4,9 +4,10 @@
 
 ## SavedObjectAttribute type
 
+Type definition for a Saved Object attribute value
 
 <b>Signature:</b>
 
 ```typescript
-export declare type SavedObjectAttribute = string | number | boolean | null | undefined | SavedObjectAttributes | SavedObjectAttributes[];
+export declare type SavedObjectAttribute = SavedObjectAttributeSingle | SavedObjectAttributeSingle[];
 ```

docs/development/core/server/kibana-plugin-server.savedobjectattributes.md

@@ -4,7 +4,7 @@
 
 ## SavedObjectAttributes interface
 
-The data for a Saved Object is stored in the `attributes` key as either an object or an array of objects.
+The data for a Saved Object is stored as an object in the `attributes` property.
 
 <b>Signature:</b>
 

docs/development/core/server/kibana-plugin-server.savedobjectattributesingle.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectAttributeSingle](./kibana-plugin-server.savedobjectattributesingle.md)
+
+## SavedObjectAttributeSingle type
+
+Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-server.savedobjectattribute.md)
+
+<b>Signature:</b>
+
+```typescript
+export declare type SavedObjectAttributeSingle = string | number | boolean | null | undefined | SavedObjectAttributes;
+```

package.json

@@ -105,7 +105,7 @@
   "dependencies": {
     "@babel/core": "^7.5.5",
     "@babel/register": "^7.5.5",
-    "@elastic/charts": "^12.1.0",
+    "@elastic/charts": "^13.4.0",
     "@elastic/datemath": "5.0.2",
     "@elastic/eui": "14.4.0",
     "@elastic/filesaver": "1.1.2",
@@ -166,7 +166,7 @@
     "globby": "^8.0.1",
     "good-squeeze": "2.1.0",
     "h2o2": "^8.1.2",
-    "handlebars": "4.3.3",
+    "handlebars": "4.3.5",
     "hapi": "^17.5.3",
     "hapi-auth-cookie": "^9.0.0",
     "history": "^4.9.0",
@@ -267,6 +267,7 @@
     "@babel/parser": "^7.5.5",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/types": "^7.5.5",
+    "@elastic/elasticsearch": "^7.4.0",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
     "@elastic/github-checks-reporter": "0.0.20b3",
@@ -281,7 +282,6 @@
     "@kbn/utility-types": "1.0.0",
     "@microsoft/api-documenter": "7.4.3",
     "@microsoft/api-extractor": "7.4.2",
-    "@octokit/rest": "^15.10.0",
     "@percy/agent": "^0.11.0",
     "@types/angular": "^1.6.56",
     "@types/angular-mocks": "^1.7.0",

packages/kbn-dev-utils/src/kbn_client/errors.ts → packages/kbn-dev-utils/src/axios/errors.ts

@@ -28,15 +28,9 @@ export interface AxiosResponseError<T> extends AxiosError {
 }
 
 export const isAxiosRequestError = (error: any): error is AxiosRequestError => {
-  return error && error.code === undefined && error.response === undefined;
+  return error && error.config && error.response === undefined;
 };
 
-export const isAxiosResponseError = (error: any): error is AxiosResponseError<any> => {
-  return error && error.code !== undefined && error.response !== undefined;
-};
-
-export const isConcliftOnGetError = (error: any) => {
-  return (
-    isAxiosResponseError(error) && error.config.method === 'GET' && error.response.status === 409
-  );
+export const isAxiosResponseError = <T = any>(error: any): error is AxiosResponseError<T> => {
+  return error && error.response && error.response.status !== undefined;
 };

src/legacy/core_plugins/vis_type_metric/public/shim/index.ts → packages/kbn-dev-utils/src/axios/index.ts

@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export * from './legacy_dependencies_plugin';
+export * from './errors';

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

@@ -18,9 +18,15 @@
  */
 
 export { withProcRunner } from './proc_runner';
-export { ToolingLog, ToolingLogTextWriter, pickLevelFromFlags } from './tooling_log';
+export {
+  ToolingLog,
+  ToolingLogTextWriter,
+  pickLevelFromFlags,
+  ToolingLogCollectingWriter,
+} from './tooling_log';
 export { createAbsolutePathSerializer } from './serializers';
 export { CA_CERT_PATH, ES_KEY_PATH, ES_CERT_PATH } from './certs';
 export { run, createFailError, createFlagError, combineErrors, isFailError, Flags } from './run';
 export { REPO_ROOT } from './constants';
 export { KbnClient } from './kbn_client';
+export * from './axios';

packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts

@@ -21,9 +21,15 @@ import Url from 'url';
 
 import Axios from 'axios';
 
-import { isAxiosRequestError, isConcliftOnGetError } from './errors';
+import { isAxiosRequestError, isAxiosResponseError } from '../axios';
 import { ToolingLog } from '../tooling_log';
 
+const isConcliftOnGetError = (error: any) => {
+  return (
+    isAxiosResponseError(error) && error.config.method === 'GET' && error.response.status === 409
+  );
+};
+
 export const uriencode = (
   strings: TemplateStringsArray,
   ...values: Array<string | number | boolean>

packages/kbn-dev-utils/src/tooling_log/index.ts

@@ -20,3 +20,4 @@
 export { ToolingLog } from './tooling_log';
 export { ToolingLogTextWriter, ToolingLogTextWriterConfig } from './tooling_log_text_writer';
 export { pickLevelFromFlags, LogLevel } from './log_levels';
+export { ToolingLogCollectingWriter } from './tooling_log_collecting_writer';