github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[APM] Update default refresh interval to 60 seconds (#146791)

Browse source 
In https://github.com/elastic/kibana/pull/144389 the default refresh
interval across Kibana was changed from 0 to 60 seconds.

A while ago we opted to not follow the Kibana defaults because they were
non-sensical. This has now been fixed so we may want to start following
them again. However, that's a bigger change. For now I suggest we simply
update the hardcoded default value specified in APM.
This commit is contained in:
Søren Louv-Jansen 2022-12-03 01:15:38 +01:00 • committed by GitHub
parent 939698faf0
commit ec333c607f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
x-pack/plugins/apm/public/components/shared/date_picker/apm_date_picker.tsx
View file

@ -7,7 +7,6 @@
import React from 'react';
import { useApmParams } from '../../../hooks/use_apm_params';
import { DatePicker } from '.';
import { useTimeRangeId } from '../../../context/time_range_id/use_time_range_id';
import {
@ -15,6 +14,8 @@ import {
toNumber,
} from '../../../context/url_params_context/helpers';
export const DEFAULT_REFRESH_INTERVAL = 60000;
export function ApmDatePicker() {
const { query } = useApmParams('/*');
@ -26,12 +27,12 @@ export function ApmDatePicker() {
rangeFrom,
rangeTo,
refreshPaused: refreshPausedFromUrl = 'true',
refreshInterval: refreshIntervalFromUrl = '0',
refreshInterval: refreshIntervalFromUrl,
} = query;
const refreshPaused = toBoolean(refreshPausedFromUrl);
const refreshInterval = toNumber(refreshIntervalFromUrl);
const refreshInterval =
toNumber(refreshIntervalFromUrl) ?? DEFAULT_REFRESH_INTERVAL;
const { incrementTimeRangeId } = useTimeRangeId();

6
x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.test.tsx
View file

@ -23,7 +23,7 @@ describe('MLExplorerLink', () => {
);
expect(href).toMatchInlineSnapshot(
`"/app/ml/explorer?_g=(ml:(jobIds:!(myservicename-mytransactiontype-high_mean_response_time)),refreshInterval:(pause:!t,value:10000),time:(from:now%2Fw,to:now-4h))&_a=(explorer:(mlExplorerFilter:(),mlExplorerSwimlane:()))"`
`"/app/ml/explorer?_g=(ml:(jobIds:!(myservicename-mytransactiontype-high_mean_response_time)),refreshInterval:(pause:!t,value:60000),time:(from:now%2Fw,to:now-4h))&_a=(explorer:(mlExplorerFilter:(),mlExplorerSwimlane:()))"`
);
});
@ -34,12 +34,12 @@ describe('MLExplorerLink', () => {
),
{
search:
'?rangeFrom=2020-07-29T17:27:29.000Z&rangeTo=2020-07-29T18:45:00.000Z&refreshInterval=10000&refreshPaused=true',
'?rangeFrom=2020-07-29T17:27:29.000Z&rangeTo=2020-07-29T18:45:00.000Z&refreshInterval=60000&refreshPaused=true',
} as Location
);
expect(href).toMatchInlineSnapshot(
`"/app/ml/explorer?_g=(ml:(jobIds:!(apm-production-485b-high_mean_transaction_duration)),refreshInterval:(pause:!t,value:10000),time:(from:'2020-07-29T17:27:29.000Z',to:'2020-07-29T18:45:00.000Z'))&_a=(explorer:(mlExplorerFilter:(),mlExplorerSwimlane:()))"`
`"/app/ml/explorer?_g=(ml:(jobIds:!(apm-production-485b-high_mean_transaction_duration)),refreshInterval:(pause:!t,value:60000),time:(from:'2020-07-29T17:27:29.000Z',to:'2020-07-29T18:45:00.000Z'))&_a=(explorer:(mlExplorerFilter:(),mlExplorerSwimlane:()))"`
);
});
});

3
x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx
View file

@ -10,6 +10,7 @@ import { EuiLink } from '@elastic/eui';
import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
import { DEFAULT_REFRESH_INTERVAL } from '../../date_picker/apm_date_picker';
interface Props {
children?: ReactNode;
@ -48,7 +49,7 @@ export function useExplorerHref({ jobId }: { jobId: string }) {
pageState: {
jobIds: [jobId],
timeRange: { from: rangeFrom, to: rangeTo },
refreshInterval: { pause: true, value: 10000 },
refreshInterval: { pause: true, value: DEFAULT_REFRESH_INTERVAL },
},
});

8
x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.test.tsx
View file

@ -23,7 +23,7 @@ describe('MLSingleMetricLink', () => {
);
expect(href).toMatchInlineSnapshot(
`"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(myservicename-mytransactiontype-high_mean_response_time)),refreshInterval:(pause:!t,value:10000),time:(from:now%2Fw,to:now-4h))&_a=(timeseriesexplorer:(mlTimeSeriesExplorer:()))"`
`"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(myservicename-mytransactiontype-high_mean_response_time)),refreshInterval:(pause:!t,value:60000),time:(from:now%2Fw,to:now-4h))&_a=(timeseriesexplorer:(mlTimeSeriesExplorer:()))"`
);
});
it('should produce the correct URL with jobId, serviceName, and transactionType', async () => {
@ -42,7 +42,7 @@ describe('MLSingleMetricLink', () => {
);
expect(href).toMatchInlineSnapshot(
`"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(myservicename-mytransactiontype-high_mean_response_time)),refreshInterval:(pause:!t,value:10000),time:(from:now%2Fw,to:now-4h))&_a=(timeseriesexplorer:(mlTimeSeriesExplorer:(entities:(service.name:opbeans-test,transaction.type:request))))"`
`"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(myservicename-mytransactiontype-high_mean_response_time)),refreshInterval:(pause:!t,value:60000),time:(from:now%2Fw,to:now-4h))&_a=(timeseriesexplorer:(mlTimeSeriesExplorer:(entities:(service.name:opbeans-test,transaction.type:request))))"`
);
});
@ -57,12 +57,12 @@ describe('MLSingleMetricLink', () => {
),
{
search:
'?rangeFrom=2020-07-29T17:27:29.000Z&rangeTo=2020-07-29T18:45:00.000Z&refreshInterval=10000&refreshPaused=true',
'?rangeFrom=2020-07-29T17:27:29.000Z&rangeTo=2020-07-29T18:45:00.000Z&refreshInterval=60000&refreshPaused=true',
} as Location
);
expect(href).toMatchInlineSnapshot(
`"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(apm-production-485b-high_mean_transaction_duration)),refreshInterval:(pause:!t,value:10000),time:(from:'2020-07-29T17:27:29.000Z',to:'2020-07-29T18:45:00.000Z'))&_a=(timeseriesexplorer:(mlTimeSeriesExplorer:(entities:(service.name:opbeans-java,transaction.type:request))))"`
`"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(apm-production-485b-high_mean_transaction_duration)),refreshInterval:(pause:!t,value:60000),time:(from:'2020-07-29T17:27:29.000Z',to:'2020-07-29T18:45:00.000Z'))&_a=(timeseriesexplorer:(mlTimeSeriesExplorer:(entities:(service.name:opbeans-java,transaction.type:request))))"`
);
});
});

3
x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx
View file

@ -10,6 +10,7 @@ import { EuiLink } from '@elastic/eui';
import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
import { DEFAULT_REFRESH_INTERVAL } from '../../date_picker/apm_date_picker';
interface Props {
children?: ReactNode;
@ -74,7 +75,7 @@ function useSingleMetricHref({
pageState: {
jobIds: [jobId],
timeRange: { from: rangeFrom, to: rangeTo },
refreshInterval: { pause: true, value: 10000 },
refreshInterval: { pause: true, value: DEFAULT_REFRESH_INTERVAL },
...entities,
},
});