Merge branch 'master' into alerting/index-threshold-graph

docs/settings/reporting-settings.asciidoc

@@ -95,6 +95,8 @@ index for any pending Reporting jobs. Defaults to `3000` (3 seconds).
 [[xpack-reporting-q-timeout]]`xpack.reporting.queue.timeout`::
 How long each worker has to produce a report. If your machine is slow or under
 heavy load, you might need to increase this timeout. Specified in milliseconds.
+If a Reporting job execution time goes over this time limit, the job will be
+marked as a failure and there will not be a download available.
 Defaults to `120000` (two minutes).
 
 [float]
@@ -104,6 +106,26 @@ Defaults to `120000` (two minutes).
 Reporting works by capturing screenshots from Kibana. The following settings
 control the capturing process.
 
+`xpack.reporting.capture.timeouts.openUrl`::
+How long to allow the Reporting browser to wait for the initial data of the
+Kibana page to load. Defaults to `30000` (30 seconds).
+
+`xpack.reporting.capture.timeouts.waitForElements`::
+How long to allow the Reporting browser to wait for the visualization panels to
+load on the Kibana page. Defaults to `30000` (30 seconds).
+
+`xpack.reporting.capture.timeouts.renderComplete`::
+How long to allow the Reporting brwoser to wait for each visualization to
+signal that it is done renderings. Defaults to `30000` (30 seconds).
+
+[NOTE]
+============
+If any timeouts from `xpack.reporting.capture.timeouts.*` settings occur when
+running a report job, Reporting will log the error and try to continue
+capturing the page with a screenshot. As a result, a download will be
+available, but there will likely be errors in the visualizations in the report.
+============
+
 `xpack.reporting.capture.maxAttempts`::
 If capturing a report fails for any reason, Kibana will re-attempt othe reporting
 job, as many times as this setting. Defaults to `3`.

src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx

@@ -45,7 +45,10 @@ beforeEach(() => {
   jest.clearAllMocks();
 });
 
-export const waitForPromises = () => new Promise(resolve => setTimeout(resolve, 0));
+const waitForPromises = async () =>
+  act(async () => {
+    await new Promise(resolve => setTimeout(resolve));
+  });
 
 /**
  * this works but logs ugly error messages until we're using React 16.9

src/legacy/core_plugins/timelion/index.ts

@@ -62,14 +62,6 @@ const timelionPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPl
       },
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       hacks: [resolve(__dirname, 'public/legacy')],
-      injectDefaultVars(server) {
-        const config = server.config();
-
-        return {
-          timelionUiEnabled: config.get('timelion.ui.enabled'),
-          kbnIndex: config.get('kibana.index'),
-        };
-      },
       mappings: require('./mappings.json'),
       uiSettingDefaults: {
         'timelion:showTutorial': {

src/legacy/core_plugins/timelion/public/legacy.ts

@@ -18,7 +18,7 @@
  */
 
 import { PluginInitializerContext } from 'kibana/public';
-import { npSetup, npStart } from 'ui/new_platform';
+import { npSetup } from 'ui/new_platform';
 import { plugin } from '.';
 import { TimelionPluginSetupDependencies } from './plugin';
 import { LegacyDependenciesPlugin } from './shim';
@@ -32,4 +32,4 @@ const setupPlugins: Readonly<TimelionPluginSetupDependencies> = {
 const pluginInstance = plugin({} as PluginInitializerContext);
 
 export const setup = pluginInstance.setup(npSetup.core, setupPlugins);
-export const start = pluginInstance.start(npStart.core);
+export const start = pluginInstance.start();

src/legacy/core_plugins/timelion/public/plugin.ts

@@ -16,13 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  PluginInitializerContext,
-  IUiSettingsClient,
-} from 'kibana/public';
+import { CoreSetup, Plugin, PluginInitializerContext, IUiSettingsClient } from 'kibana/public';
 import { getTimeChart } from './panels/timechart/timechart';
 import { Panel } from './panels/panel';
 import { LegacyDependenciesPlugin, LegacyDependenciesPluginSetup } from './shim';
@@ -65,13 +59,7 @@ export class TimelionPlugin implements Plugin<Promise<void>, void> {
     dependencies.timelionPanels.set(timeChartPanel.name, timeChartPanel);
   }
 
-  public start(core: CoreStart) {
-    const timelionUiEnabled = core.injectedMetadata.getInjectedVar('timelionUiEnabled');
-
-    if (timelionUiEnabled === false) {
-      core.chrome.navLinks.update('timelion', { hidden: true });
-    }
-  }
+  public start() {}
 
   public stop(): void {}
 }

src/plugins/timelion/server/config.ts → src/plugins/timelion/config.ts

@@ -17,13 +17,15 @@
  * under the License.
  */
 
-import { schema } from '@kbn/config-schema';
+import { schema, TypeOf } from '@kbn/config-schema';
 
-export const ConfigSchema = schema.object(
+export const configSchema = schema.object(
   {
     ui: schema.object({ enabled: schema.boolean({ defaultValue: false }) }),
     graphiteUrls: schema.maybe(schema.arrayOf(schema.string())),
   },
   // This option should be removed as soon as we entirely migrate config from legacy Timelion plugin.
   { allowUnknowns: true }
 );
+
+export type ConfigSchema = TypeOf<typeof configSchema>;

src/plugins/timelion/kibana.json

@@ -4,5 +4,5 @@
   "kibanaVersion": "kibana",
   "configPath": ["timelion"],
   "server": true,
-  "ui": false
+  "ui": true
 }

src/plugins/timelion/public/index.ts

@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CoreStart, PluginInitializerContext } from 'kibana/public';
+import { ConfigSchema } from '../config';
+
+export const plugin = (initializerContext: PluginInitializerContext<ConfigSchema>) => ({
+  setup() {},
+  start(core: CoreStart) {
+    if (initializerContext.config.get().ui.enabled === false) {
+      core.chrome.navLinks.update('timelion', { hidden: true });
+    }
+  },
+});

src/plugins/timelion/server/index.ts

@@ -18,11 +18,18 @@
  */
 
 import { PluginInitializerContext } from '../../../../src/core/server';
-import { ConfigSchema } from './config';
+import { configSchema } from '../config';
 import { Plugin } from './plugin';
 
 export { PluginSetupContract } from './plugin';
 
-export const config = { schema: ConfigSchema };
+export const config = {
+  schema: configSchema,
+  exposeToBrowser: {
+    ui: {
+      enabled: true,
+    },
+  },
+};
 export const plugin = (initializerContext: PluginInitializerContext) =>
   new Plugin(initializerContext);

src/plugins/timelion/server/lib/config_manager.ts

@@ -19,14 +19,14 @@
 
 import { PluginInitializerContext } from 'kibana/server';
 import { TypeOf } from '@kbn/config-schema';
-import { ConfigSchema } from '../config';
+import { configSchema } from '../../config';
 
 export class ConfigManager {
   private esShardTimeout: number = 0;
   private graphiteUrls: string[] = [];
 
   constructor(config: PluginInitializerContext['config']) {
-    config.create<TypeOf<typeof ConfigSchema>>().subscribe(configUpdate => {
+    config.create<TypeOf<typeof configSchema>>().subscribe(configUpdate => {
       this.graphiteUrls = configUpdate.graphiteUrls || [];
     });
 

src/plugins/timelion/server/plugin.ts

@@ -26,7 +26,7 @@ import {
   RecursiveReadonly,
 } from '../../../../src/core/server';
 import { deepFreeze } from '../../../../src/core/utils';
-import { ConfigSchema } from './config';
+import { configSchema } from '../config';
 import loadFunctions from './lib/load_functions';
 import { functionsRoute } from './routes/functions';
 import { validateEsRoute } from './routes/validate_es';
@@ -48,7 +48,7 @@ export class Plugin {
 
   public async setup(core: CoreSetup): Promise<RecursiveReadonly<PluginSetupContract>> {
     const config = await this.initializerContext.config
-      .create<TypeOf<typeof ConfigSchema>>()
+      .create<TypeOf<typeof configSchema>>()
       .pipe(first())
       .toPromise();
 

x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx

@@ -21,7 +21,6 @@ import { isValidPlatinumLicense } from '../../../../../../../plugins/apm/common/
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ServiceMapAPIResponse } from '../../../../../../../plugins/apm/server/lib/service_map/get_service_map';
 import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
-import { useCallApmApi } from '../../../hooks/useCallApmApi';
 import { useDeepObjectIdentity } from '../../../hooks/useDeepObjectIdentity';
 import { useLicense } from '../../../hooks/useLicense';
 import { useLoadingIndicator } from '../../../hooks/useLoadingIndicator';
@@ -33,6 +32,7 @@ import { getCytoscapeElements } from './get_cytoscape_elements';
 import { PlatinumLicensePrompt } from './PlatinumLicensePrompt';
 import { Popover } from './Popover';
 import { useRefDimensions } from './useRefDimensions';
+import { callApmApi } from '../../../services/rest/createCallApmApi';
 
 interface ServiceMapProps {
   serviceName?: string;
@@ -61,7 +61,6 @@ ${theme.euiColorLightShade}`,
 const MAX_REQUESTS = 5;
 
 export function ServiceMap({ serviceName }: ServiceMapProps) {
-  const callApmApi = useCallApmApi();
   const license = useLicense();
   const { search } = useLocation();
   const { urlParams, uiFilters } = useUrlParams();
@@ -137,7 +136,7 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
         }
       }
     },
-    [params, setIsLoading, callApmApi, responses.length, notifications.toasts]
+    [params, setIsLoading, responses.length, notifications.toasts]
   );
 
   useEffect(() => {

x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/DeleteButton.tsx

@@ -8,10 +8,9 @@ import React, { useState } from 'react';
 import { EuiButtonEmpty } from '@elastic/eui';
 import { NotificationsStart } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
-import { useCallApmApi } from '../../../../../hooks/useCallApmApi';
 import { Config } from '../index';
 import { getOptionLabel } from '../../../../../../../../../plugins/apm/common/agent_configuration_constants';
-import { APMClient } from '../../../../../services/rest/createCallApmApi';
+import { callApmApi } from '../../../../../services/rest/createCallApmApi';
 import { useApmPluginContext } from '../../../../../hooks/useApmPluginContext';
 
 interface Props {
@@ -22,7 +21,6 @@ interface Props {
 export function DeleteButton({ onDeleted, selectedConfig }: Props) {
   const [isDeleting, setIsDeleting] = useState(false);
   const { toasts } = useApmPluginContext().core.notifications;
-  const callApmApi = useCallApmApi();
 
   return (
     <EuiButtonEmpty
@@ -31,7 +29,7 @@ export function DeleteButton({ onDeleted, selectedConfig }: Props) {
       iconSide="right"
       onClick={async () => {
         setIsDeleting(true);
-        await deleteConfig(callApmApi, selectedConfig, toasts);
+        await deleteConfig(selectedConfig, toasts);
         setIsDeleting(false);
         onDeleted();
       }}
@@ -45,7 +43,6 @@ export function DeleteButton({ onDeleted, selectedConfig }: Props) {
 }
 
 async function deleteConfig(
-  callApmApi: APMClient,
   selectedConfig: Config,
   toasts: NotificationsStart['toasts']
 ) {

x-pack/legacy/plugins/apm/public/components/shared/ServiceForm/index.tsx → x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/ServiceSection.tsx

@@ -10,12 +10,12 @@ import { i18n } from '@kbn/i18n';
 import {
   omitAllOption,
   getOptionLabel
-} from '../../../../../../../plugins/apm/common/agent_configuration_constants';
-import { useFetcher } from '../../../hooks/useFetcher';
-import { SelectWithPlaceholder } from '../SelectWithPlaceholder';
+} from '../../../../../../../../../plugins/apm/common/agent_configuration_constants';
+import { useFetcher } from '../../../../../hooks/useFetcher';
+import { SelectWithPlaceholder } from '../../../../shared/SelectWithPlaceholder';
 
 const SELECT_PLACEHOLDER_LABEL = `- ${i18n.translate(
-  'xpack.apm.settings.agentConf.flyOut.serviceForm.selectPlaceholder',
+  'xpack.apm.settings.agentConf.flyOut.serviceSection.selectPlaceholder',
   { defaultMessage: 'Select' }
 )} -`;
 
@@ -27,7 +27,7 @@ interface Props {
   onEnvironmentChange: (env: string) => void;
 }
 
-export function ServiceForm({
+export function ServiceSection({
   isReadOnly,
   serviceName,
   onServiceNameChange,
@@ -60,7 +60,7 @@ export function ServiceForm({
   );
 
   const ALREADY_CONFIGURED_TRANSLATED = i18n.translate(
-    'xpack.apm.settings.agentConf.flyOut.serviceForm.alreadyConfiguredOption',
+    'xpack.apm.settings.agentConf.flyOut.serviceSection.alreadyConfiguredOption',
     { defaultMessage: 'already configured' }
   );
 
@@ -83,7 +83,7 @@ export function ServiceForm({
       <EuiTitle size="xs">
         <h3>
           {i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.serviceForm.title',
+            'xpack.apm.settings.agentConf.flyOut.serviceSection.title',
             { defaultMessage: 'Service' }
           )}
         </h3>
@@ -93,13 +93,13 @@ export function ServiceForm({
 
       <EuiFormRow
         label={i18n.translate(
-          'xpack.apm.settings.agentConf.flyOut.serviceForm.serviceNameSelectLabel',
+          'xpack.apm.settings.agentConf.flyOut.serviceSection.serviceNameSelectLabel',
           { defaultMessage: 'Name' }
         )}
         helpText={
           !isReadOnly &&
           i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.serviceForm.serviceNameSelectHelpText',
+            'xpack.apm.settings.agentConf.flyOut.serviceSection.serviceNameSelectHelpText',
             { defaultMessage: 'Choose the service you want to configure.' }
           )
         }
@@ -124,13 +124,13 @@ export function ServiceForm({
 
       <EuiFormRow
         label={i18n.translate(
-          'xpack.apm.settings.agentConf.flyOut.serviceForm.serviceEnvironmentSelectLabel',
+          'xpack.apm.settings.agentConf.flyOut.serviceSection.serviceEnvironmentSelectLabel',
           { defaultMessage: 'Environment' }
         )}
         helpText={
           !isReadOnly &&
           i18n.translate(
-            'xpack.apm.settings.agentConf.flyOut.serviceForm.serviceEnvironmentSelectHelpText',
+            'xpack.apm.settings.agentConf.flyOut.serviceSection.serviceEnvironmentSelectHelpText',
             {
               defaultMessage:
                 'Only a single environment per configuration is supported.'