Merge branch 'master' of github.com:elastic/kibana into hosts-overvie…

…w-search-strategy # Conflicts: # x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/index.ts # x-pack/plugins/security_solution/public/hosts/containers/hosts/details/_index.tsx
elastic · Sep 2, 2020 · 622a340 · 622a340
2 parents 80123ec + d932830
commit 622a340
Show file tree

Hide file tree

Showing 238 changed files with 5,279 additions and 4,448 deletions.
diff --git a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
diff --git a/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx b/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx
@@ -221,36 +221,18 @@ class TypeSelection extends React.Component<TypeSelectionProps, TypeSelectionSta
         defaultMessage:
           'This visualization is experimental. The design and implementation are less mature than stable visualizations and might be subject to change.',
       });
-    } else if ('aliasPath' in visType) {
-      if (visType.stage === 'beta') {
-        const aliasDescription = i18n.translate('visualizations.newVisWizard.betaDescription', {
-          defaultMessage:
-            'This visualization is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features',
-        });
-        stage = {
-          betaBadgeLabel: i18n.translate('visualizations.newVisWizard.betaTitle', {
-            defaultMessage: 'Beta',
-          }),
-          betaBadgeTooltipContent: aliasDescription,
-          // betaBadgeIconType: 'popout',
-        };
-        highlightMsg = aliasDescription;
-      } else {
-        const aliasDescription = i18n.translate(
-          'visualizations.newVisWizard.visTypeAliasDescription',
-          {
-            defaultMessage: 'Opens a Kibana application that is outside of Visualize.',
-          }
-        );
-        stage = {
-          betaBadgeLabel: i18n.translate('visualizations.newVisWizard.visTypeAliasTitle', {
-            defaultMessage: 'Kibana application',
-          }),
-          betaBadgeTooltipContent: aliasDescription,
-          betaBadgeIconType: 'popout',
-        };
-        highlightMsg = aliasDescription;
-      }
+    } else if ('aliasPath' in visType && visType.stage === 'beta') {
+      const aliasDescription = i18n.translate('visualizations.newVisWizard.betaDescription', {
+        defaultMessage:
+          'This visualization is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features',
+      });
+      stage = {
+        betaBadgeLabel: i18n.translate('visualizations.newVisWizard.betaTitle', {
+          defaultMessage: 'Beta',
+        }),
+        betaBadgeTooltipContent: aliasDescription,
+      };
+      highlightMsg = aliasDescription;
     }
 
     const isDisabled = this.state.query !== '' && !visType.highlighted;

diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/dashboard_to_url_drilldown/index.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/dashboard_to_url_drilldown/index.tsx
@@ -44,6 +44,7 @@ export class DashboardToUrlDrilldown implements Drilldown<Config, UrlTrigger> {
   public readonly order = 8;
 
   readonly minimalLicense = 'gold'; // example of minimal license support
+  readonly licenseFeatureName = 'Sample URL Drilldown';
 
   public readonly getDisplayName = () => 'Go to URL (example)';
 

diff --git a/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap b/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
@@ -99,3 +99,8 @@ export const TRANSACTION_URL = 'transaction.page.url';
 export const CLIENT_GEO = 'client.geo';
 export const USER_AGENT_DEVICE = 'user_agent.device.name';
 export const USER_AGENT_OS = 'user_agent.os.name';
+
+export const TRANSACTION_TIME_TO_FIRST_BYTE =
+  'transaction.marks.agent.timeToFirstByte';
+export const TRANSACTION_DOM_INTERACTIVE =
+  'transaction.marks.agent.domInteractive';
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageLoadDistChart.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageLoadDistChart.tsx
@@ -35,7 +35,7 @@ import { BreakdownSeries } from '../PageLoadDistribution/BreakdownSeries';
 
 interface PageLoadData {
   pageLoadDistribution: Array<{ x: number; y: number }>;
-  percentiles: Record<string, number> | undefined;
+  percentiles: Record<string, number | null> | undefined;
   minDuration: number;
   maxDuration: number;
 }