Skip to content

Commit cbf3b04

Browse files
XavierMXavierM
committed
Merge branch 'master' of github.com:elastic/kibana into timeline-import-validation
2 parents f2b0c85 + d932830 commit cbf3b04

239 files changed

Lines changed: 5280 additions & 4449 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap‎

Lines changed: 4 additions & 136 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx‎

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -221,36 +221,18 @@ class TypeSelection extends React.Component<TypeSelectionProps, TypeSelectionSta
221221
defaultMessage:
222222
'This visualization is experimental. The design and implementation are less mature than stable visualizations and might be subject to change.',
223223
});
224-
} else if ('aliasPath' in visType) {
225-
if (visType.stage === 'beta') {
226-
const aliasDescription = i18n.translate('visualizations.newVisWizard.betaDescription', {
227-
defaultMessage:
228-
'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',
229-
});
230-
stage = {
231-
betaBadgeLabel: i18n.translate('visualizations.newVisWizard.betaTitle', {
232-
defaultMessage: 'Beta',
233-
}),
234-
betaBadgeTooltipContent: aliasDescription,
235-
// betaBadgeIconType: 'popout',
236-
};
237-
highlightMsg = aliasDescription;
238-
} else {
239-
const aliasDescription = i18n.translate(
240-
'visualizations.newVisWizard.visTypeAliasDescription',
241-
{
242-
defaultMessage: 'Opens a Kibana application that is outside of Visualize.',
243-
}
244-
);
245-
stage = {
246-
betaBadgeLabel: i18n.translate('visualizations.newVisWizard.visTypeAliasTitle', {
247-
defaultMessage: 'Kibana application',
248-
}),
249-
betaBadgeTooltipContent: aliasDescription,
250-
betaBadgeIconType: 'popout',
251-
};
252-
highlightMsg = aliasDescription;
253-
}
224+
} else if ('aliasPath' in visType && visType.stage === 'beta') {
225+
const aliasDescription = i18n.translate('visualizations.newVisWizard.betaDescription', {
226+
defaultMessage:
227+
'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',
228+
});
229+
stage = {
230+
betaBadgeLabel: i18n.translate('visualizations.newVisWizard.betaTitle', {
231+
defaultMessage: 'Beta',
232+
}),
233+
betaBadgeTooltipContent: aliasDescription,
234+
};
235+
highlightMsg = aliasDescription;
254236
}
255237

256238
const isDisabled = this.state.query !== '' && !visType.highlighted;

‎x-pack/examples/ui_actions_enhanced_examples/public/dashboard_to_url_drilldown/index.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ export class DashboardToUrlDrilldown implements Drilldown<Config, UrlTrigger> {
4444
public readonly order = 8;
4545

4646
readonly minimalLicense = 'gold'; // example of minimal license support
47+
readonly licenseFeatureName = 'Sample URL Drilldown';
4748

4849
public readonly getDisplayName = () => 'Go to URL (example)';
4950

‎x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎x-pack/plugins/apm/common/elasticsearch_fieldnames.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,8 @@ export const TRANSACTION_URL = 'transaction.page.url';
9999
export const CLIENT_GEO = 'client.geo';
100100
export const USER_AGENT_DEVICE = 'user_agent.device.name';
101101
export const USER_AGENT_OS = 'user_agent.os.name';
102+
103+
export const TRANSACTION_TIME_TO_FIRST_BYTE =
104+
'transaction.marks.agent.timeToFirstByte';
105+
export const TRANSACTION_DOM_INTERACTIVE =
106+
'transaction.marks.agent.domInteractive';

‎x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageLoadDistChart.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { BreakdownSeries } from '../PageLoadDistribution/BreakdownSeries';
3535

3636
interface PageLoadData {
3737
pageLoadDistribution: Array<{ x: number; y: number }>;
38-
percentiles: Record<string, number> | undefined;
38+
percentiles: Record<string, number | null> | undefined;
3939
minDuration: number;
4040
maxDuration: number;
4141
}

0 commit comments

Comments
 (0)