Merge branch 'master' into elastic-prefix-for-eslint-config-kibana

docs/api/using-api.asciidoc

@@ -61,10 +61,8 @@ For all APIs, you must use a request header. The {kib} APIs support the `kbn-xsr
   By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
 
 * The API endpoint uses the `GET` or `HEAD` operations
-
-* The path is whitelisted using the <<settings, `server.xsrf.whitelist`>> setting
-
-* XSRF protections are disabled using the `server.xsrf.disableProtection` setting
+* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
+* XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
 
 `Content-Type: application/json`::
   Applicable only when you send a payload in the API request. {kib} API requests and responses use JSON. 

docs/apm/api.asciidoc

@@ -40,8 +40,8 @@ users interacting with APM APIs must have <<apm-app-api-user,sufficient privileg
   By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
 
 * The API endpoint uses the `GET` or `HEAD` operations
-* The path is whitelisted using the <<settings, `server.xsrf.whitelist`>> setting
-* XSRF protections are disabled using the `server.xsrf.disableProtection` setting
+* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
+* XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
 
 `Content-Type: application/json`::
   Applicable only when you send a payload in the API request.

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

@@ -9,7 +9,7 @@ Constructs a new instance of the `FieldList` class
 <b>Signature:</b>
 
 ```typescript
-constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: () => void);
+constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: OnNotification);
 ```
 
 ## Parameters
@@ -19,5 +19,5 @@ constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: b
 |  indexPattern | <code>IndexPattern</code> |  |
 |  specs | <code>FieldSpec[]</code> |  |
 |  shortDotsEnable | <code>boolean</code> |  |
-|  onNotification | <code>() =&gt; void</code> |  |
+|  onNotification | <code>OnNotification</code> |  |
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.intervalname.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; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md)
+
+## IndexPattern.intervalName property
+
+<b>Signature:</b>
+
+```typescript
+intervalName: string | undefined;
+```

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

@@ -27,9 +27,12 @@ export declare class IndexPattern implements IIndexPattern
 |  [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) |  | <code>any</code> |  |
 |  [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) |  | <code>any</code> |  |
 |  [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> |  |
 |  [metaFields](./kibana-plugin-plugins-data-public.indexpattern.metafields.md) |  | <code>string[]</code> |  |
+|  [sourceFilters](./kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md) |  | <code>SourceFilter[]</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-public.indexpattern.timefieldname.md) |  | <code>string &#124; undefined</code> |  |
 |  [title](./kibana-plugin-plugins-data-public.indexpattern.title.md) |  | <code>string</code> |  |
+|  [type](./kibana-plugin-plugins-data-public.indexpattern.type.md) |  | <code>string &#124; undefined</code> |  |
 |  [typeMeta](./kibana-plugin-plugins-data-public.indexpattern.typemeta.md) |  | <code>TypeMeta</code> |  |
 
 ## Methods

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

@@ -8,12 +8,26 @@
 
 ```typescript
 prepBody(): {
-        [key: string]: any;
+        title: string;
+        timeFieldName: string | undefined;
+        intervalName: string | undefined;
+        sourceFilters: string | undefined;
+        fields: string | undefined;
+        fieldFormatMap: string | undefined;
+        type: string | undefined;
+        typeMeta: string | undefined;
     };
 ```
 <b>Returns:</b>
 
 `{
-        [key: string]: any;
+        title: string;
+        timeFieldName: string | undefined;
+        intervalName: string | undefined;
+        sourceFilters: string | undefined;
+        fields: string | undefined;
+        fieldFormatMap: string | undefined;
+        type: string | undefined;
+        typeMeta: string | undefined;
     }`
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.sourcefilters.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; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [sourceFilters](./kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md)
+
+## IndexPattern.sourceFilters property
+
+<b>Signature:</b>
+
+```typescript
+sourceFilters?: SourceFilter[];
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.type.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; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [type](./kibana-plugin-plugins-data-public.indexpattern.type.md)
+
+## IndexPattern.type property
+
+<b>Signature:</b>
+
+```typescript
+type: string | undefined;
+```

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

@@ -577,7 +577,7 @@ all http requests to https over the port configured as `server.port`.
  | An array of supported protocols with versions.
 Valid protocols: `TLSv1`, `TLSv1.1`, `TLSv1.2`. *Default: TLSv1.1, TLSv1.2*
 
-| `server.xsrf.whitelist:`
+| [[settings-xsrf-whitelist]] `server.xsrf.whitelist:`
  | It is not recommended to disable protections for
 arbitrary API endpoints. Instead, supply the `kbn-xsrf` header.
 The `server.xsrf.whitelist` setting requires the following format:
@@ -592,6 +592,9 @@ The `server.xsrf.whitelist` setting requires the following format:
 [cols="2*<"]
 |===
 
+| [[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:`
  | If authentication is enabled,
 setting this to `true` enables unauthenticated users to access the {kib}

src/cli/serve/serve.js

@@ -149,7 +149,7 @@ function applyConfigOverrides(rawConfig, opts, extraCliOptions) {
   );
 
   merge(extraCliOptions);
-  merge(readKeystore(get('path.data')));
+  merge(readKeystore());
 
   return rawConfig;
 }

src/plugins/data/common/index_patterns/fields/field_list.ts

@@ -64,7 +64,7 @@ export class FieldList extends Array<IndexPatternField> implements IIndexPattern
     indexPattern: IndexPattern,
     specs: FieldSpec[] = [],
     shortDotsEnable = false,
-    onNotification = () => {}
+    onNotification: OnNotification = () => {}
   ) {
     super();
     this.indexPattern = indexPattern;

src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts

@@ -43,8 +43,21 @@ jest.mock('../../field_mapping', () => {
       id: true,
       title: true,
       fieldFormatMap: {
+        _serialize: jest.fn().mockImplementation(() => {}),
         _deserialize: jest.fn().mockImplementation(() => []),
       },
+      fields: {
+        _serialize: jest.fn().mockImplementation(() => {}),
+        _deserialize: jest.fn().mockImplementation((fields) => fields),
+      },
+      sourceFilters: {
+        _serialize: jest.fn().mockImplementation(() => {}),
+        _deserialize: jest.fn().mockImplementation(() => undefined),
+      },
+      typeMeta: {
+        _serialize: jest.fn().mockImplementation(() => {}),
+        _deserialize: jest.fn().mockImplementation(() => undefined),
+      },
     })),
   };
 });

src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts

@@ -56,14 +56,14 @@ interface IndexPatternDeps {
 }
 
 export class IndexPattern implements IIndexPattern {
-  [key: string]: any;
-
   public id?: string;
   public title: string = '';
   public fieldFormatMap: any;
   public typeMeta?: TypeMeta;
   public fields: IIndexPatternFieldList & { toSpec: () => FieldSpec[] };
   public timeFieldName: string | undefined;
+  public intervalName: string | undefined;
+  public type: string | undefined;
   public formatHit: any;
   public formatField: any;
   public flattenHit: any;
@@ -72,7 +72,7 @@ export class IndexPattern implements IIndexPattern {
   private version: string | undefined;
   private savedObjectsClient: SavedObjectsClientCommon;
   private patternCache: PatternCache;
-  private sourceFilters?: SourceFilter[];
+  public sourceFilters?: SourceFilter[];
   private originalBody: { [key: string]: any } = {};
   public fieldsFetcher: any; // probably want to factor out any direct usage and change to private
   private shortDotsEnable: boolean = false;
@@ -126,7 +126,7 @@ export class IndexPattern implements IIndexPattern {
     this.shortDotsEnable = shortDotsEnable;
     this.metaFields = metaFields;
 
-    this.fields = new FieldList(this, [], this.shortDotsEnable, this.onUnknownType);
+    this.fields = new FieldList(this, [], this.shortDotsEnable, this.onNotification);
 
     this.apiClient = apiClient;
     this.fieldsFetcher = createFieldsFetcher(this, apiClient, metaFields);
@@ -226,10 +226,13 @@ export class IndexPattern implements IIndexPattern {
       response[name] = fieldMapping._deserialize(response[name]);
     });
 
-    // give index pattern all of the values
-    const fieldList = this.fields;
-    _.assign(this, response);
-    this.fields = fieldList;
+    this.title = response.title;
+    this.timeFieldName = response.timeFieldName;
+    this.intervalName = response.intervalName;
+    this.sourceFilters = response.sourceFilters;
+    this.fieldFormatMap = response.fieldFormatMap;
+    this.type = response.type;
+    this.typeMeta = response.typeMeta;
 
     if (!this.title && this.id) {
       this.title = this.id;
@@ -430,18 +433,16 @@ export class IndexPattern implements IIndexPattern {
   }
 
   prepBody() {
-    const body: { [key: string]: any } = {};
-
-    // serialize json fields
-    _.forOwn(this.mapping, (fieldMapping, fieldName) => {
-      if (!fieldName || this[fieldName] == null) return;
-
-      body[fieldName] = fieldMapping._serialize
-        ? fieldMapping._serialize(this[fieldName])
-        : this[fieldName];
-    });
-
-    return body;
+    return {
+      title: this.title,
+      timeFieldName: this.timeFieldName,
+      intervalName: this.intervalName,
+      sourceFilters: this.mapping.sourceFilters._serialize!(this.sourceFilters),
+      fields: this.mapping.fields._serialize!(this.fields),
+      fieldFormatMap: this.mapping.fieldFormatMap._serialize!(this.fieldFormatMap),
+      type: this.type,
+      typeMeta: this.mapping.typeMeta._serialize!(this.mapping),
+    };
   }
 
   getFormatterForField(field: IndexPatternField | IndexPatternField['spec']): FieldFormat {
@@ -485,10 +486,14 @@ export class IndexPattern implements IIndexPattern {
   async save(saveAttempts: number = 0): Promise<void | Error> {
     if (!this.id) return;
     const body = this.prepBody();
-    // What keys changed since they last pulled the index pattern
-    const originalChangedKeys = Object.keys(body).filter(
-      (key) => body[key] !== this.originalBody[key]
-    );
+
+    const originalChangedKeys: string[] = [];
+    Object.entries(body).forEach(([key, value]) => {
+      if (value !== this.originalBody[key]) {
+        originalChangedKeys.push(key);
+      }
+    });
+
     return this.savedObjectsClient
       .update(savedObjectType, this.id, body, { version: this.version })
       .then((resp) => {
@@ -519,8 +524,12 @@ export class IndexPattern implements IIndexPattern {
             // and ensure we ignore the key if the server response
             // is the same as the original response (since that is expected
             // if we made a change in that key)
-            const serverChangedKeys = Object.keys(updatedBody).filter((key) => {
-              return updatedBody[key] !== body[key] && this.originalBody[key] !== updatedBody[key];
+
+            const serverChangedKeys: string[] = [];
+            Object.entries(updatedBody).forEach(([key, value]) => {
+              if (value !== (body as any)[key] && value !== this.originalBody[key]) {
+                serverChangedKeys.push(key);
+              }
             });
 
             let unresolvedCollision = false;
@@ -545,7 +554,7 @@ export class IndexPattern implements IIndexPattern {
 
             // Set the updated response on this object
             serverChangedKeys.forEach((key) => {
-              this[key] = samePattern[key];
+              (this as any)[key] = (samePattern as any)[key];
             });
             this.version = samePattern.version;