Merge branch 'master' of github.com:elastic/kibana into improve-node-…

…options-usage

docs/code/code-basic-nav.asciidoc

@@ -17,4 +17,9 @@ Clicking *Blame* shows the most recent commit per line.
 [role="screenshot"]
 image::images/code-blame.png[]
 
+[float]
+==== Branch selector
+You can use the Branch selector to view different branches of a repo. Note that code intelligence and search index are not available for any branch other than master branch.
+
+
 include::code-semantic-nav.asciidoc[]

docs/code/code-install-lang-server.asciidoc

@@ -16,6 +16,10 @@ You can check the status of the language servers and get installation instructio
 [role="screenshot"]
 image::images/code-lang-server-status.png[]
 
+[float]
+=== Ctag language server
+*Code* also uses a Ctag language server to generate symbol information and code intelligence when a dedicated language server is not available. The code intelligence information generated by the Ctag language server is less accurate but covers more languages.
+
 
 
 include::code-basic-nav.asciidoc[]

docs/settings/code-settings.asciidoc

@@ -40,3 +40,6 @@ Maximal number of workspaces each language server allows to span. Defaults to `5
 
 `xpack.code.codeNodeUrl`::
 URL of the Code node. This config is only needed when multiple Kibana instances are set up as a cluster. Defaults to ``
+
+`xpack.code.verbose`::
+Set this config to `true` to log all events. Defaults to `false`

x-pack/legacy/plugins/reporting/public/components/report_listing.tsx

@@ -12,6 +12,7 @@ declare module '@elastic/eui' {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import moment from 'moment';
+import { get } from 'lodash';
 import React, { Component } from 'react';
 import chrome from 'ui/chrome';
 import { toastNotifications } from 'ui/notify';
@@ -381,19 +382,13 @@ class ReportListingUi extends Component<Props, State> {
 
   private onTableChange = ({ page }: { page: { index: number } }) => {
     const { index: pageIndex } = page;
-
-    this.setState(
-      {
-        page: pageIndex,
-      },
-      this.fetchJobs
-    );
+    this.setState(() => ({ page: pageIndex }), this.fetchJobs);
   };
 
   private fetchJobs = async () => {
     // avoid page flicker when poller is updating table - only display loading screen on first load
     if (this.isInitialJobsFetch) {
-      this.setState({ isLoading: true });
+      this.setState(() => ({ isLoading: true }));
     }
 
     let jobs: JobQueueEntry[];
@@ -419,35 +414,37 @@ class ReportListingUi extends Component<Props, State> {
         );
       }
       if (this.mounted) {
-        this.setState({ isLoading: false, jobs: [], total: 0 });
+        this.setState(() => ({ isLoading: false, jobs: [], total: 0 }));
       }
       return;
     }
 
     if (this.mounted) {
-      this.setState({
+      this.setState(() => ({
         isLoading: false,
         total,
         jobs: jobs.map(
-          (job: JobQueueEntry): Job => ({
-            id: job._id,
-            type: job._source.jobtype,
-            object_type: job._source.payload.type,
-            object_title: job._source.payload.title,
-            created_by: job._source.created_by,
-            created_at: job._source.created_at,
-            started_at: job._source.started_at,
-            completed_at: job._source.completed_at,
-            status: job._source.status,
-            statusLabel:
-              jobStatusLabelsMap.get(job._source.status as JobStatuses) || job._source.status,
-            max_size_reached: job._source.output ? job._source.output.max_size_reached : false,
-            attempts: job._source.attempts,
-            max_attempts: job._source.max_attempts,
-            csv_contains_formulas: job._source.output.csv_contains_formulas,
-          })
+          (job: JobQueueEntry): Job => {
+            const { _source: source } = job;
+            return {
+              id: job._id,
+              type: source.jobtype,
+              object_type: source.payload.type,
+              object_title: source.payload.title,
+              created_by: source.created_by,
+              created_at: source.created_at,
+              started_at: source.started_at,
+              completed_at: source.completed_at,
+              status: source.status,
+              statusLabel: jobStatusLabelsMap.get(source.status as JobStatuses) || source.status,
+              max_size_reached: source.output ? source.output.max_size_reached : false,
+              attempts: source.attempts,
+              max_attempts: source.max_attempts,
+              csv_contains_formulas: get(source, 'output.csv_contains_formulas'),
+            };
+          }
         ),
-      });
+      }));
     }
   };
 

x-pack/test/functional/apps/license_management/home_page.ts

@@ -13,6 +13,7 @@ export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProvi
   const log = getService('log');
 
   describe('Home page', function() {
+    this.tags(['skipCloud']);
     before(async () => {
       await pageObjects.common.navigateToApp('licenseManagement');
     });

x-pack/test/functional/config.js

@@ -116,12 +116,13 @@ export default async function ({ readConfigFile }) {
       resolve(__dirname, './apps/dev_tools'),
       resolve(__dirname, './apps/apm'),
       resolve(__dirname, './apps/index_patterns'),
-      resolve(__dirname, './apps/license_management'),
       resolve(__dirname, './apps/index_management'),
       resolve(__dirname, './apps/index_lifecycle_management'),
       resolve(__dirname, './apps/snapshot_restore'),
       resolve(__dirname, './apps/cross_cluster_replication'),
       resolve(__dirname, './apps/remote_clusters'),
+      // This license_management file must be last because it is destructive.
+      resolve(__dirname, './apps/license_management'),
     ],
 
     // define the name and providers for services that should be