github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[APM] Fix Memory Chart Percentages (#28905) (#28911)

Browse source
This commit is contained in:
Søren Louv-Jansen 2019-01-17 13:25:12 +01:00 • committed by GitHub
parent 01eaa6454c
commit 7d8b93771b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/apm/public/components/app/ServiceDetails/MemoryUsageChart.tsx
View file

@ -29,7 +29,7 @@ export function MemoryUsageChart({ data, hoverXHandlers }: Props) {
noHits={data.totalHits === 0}
series={data.series}
tickFormatY={(y: number | null) => `${(y || 0) * 100}%`}
formatTooltipValue={(c: Coordinate) => asPercent(c.y || 0)}
formatTooltipValue={(c: Coordinate) => asPercent(c.y || 0, 1)}
yMax={1}
/>
</React.Fragment>

10
x-pack/plugins/apm/public/store/selectors/chartSelectors.ts
View file

@ -107,14 +107,20 @@ export function getMemorySeries(
data: series.maximumPercentMemoryUsed,
type: 'linemark',
color: colors.apmBlue,
legendValue: asPercent(overallValues.maximumPercentMemoryUsed || 0)
legendValue: asPercent(
overallValues.maximumPercentMemoryUsed || 0,
1
)
},
{
title: 'System average',
data: series.averagePercentMemoryUsed,
type: 'linemark',
color: colors.apmGreen,
legendValue: asPercent(overallValues.averagePercentMemoryUsed || 0)
legendValue: asPercent(
overallValues.averagePercentMemoryUsed || 0,
1
)
}
];

4
x-pack/plugins/apm/public/utils/__test__/formatters.test.ts
View file

@ -30,11 +30,11 @@ describe('formatters', () => {
describe('asPercent', () => {
it('should divide and format item as percent', () => {
expect(asPercent(3725, 10000, 'n/a')).toEqual('37.25%');
expect(asPercent(3725, 10000, 'n/a')).toEqual('37.3%');
});
it('should format when numerator is 0', () => {
expect(asPercent(0, 1, 'n/a')).toEqual('0.00%');
expect(asPercent(0, 1, 'n/a')).toEqual('0.0%');
});
it('should return fallback when denominator is undefined', () => {

4
x-pack/plugins/apm/public/utils/formatters.ts
View file

@ -136,7 +136,7 @@ export function tpmUnit(type?: string) {
export function asPercent(
numerator: number,
denominator?: number,
denominator: number | undefined,
fallbackResult = ''
) {
if (!denominator) {
@ -144,5 +144,5 @@ export function asPercent(
}
const decimal = numerator / denominator;
return numeral(decimal).format('0.00%');
return numeral(decimal).format('0.0%');
}