Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[APM][RUM] adjust data types for uiFilters and range in APM requests #99257

Merged
merged 10 commits into from
May 14, 2021
Merged

[APM][RUM] adjust data types for uiFilters and range in APM requests #99257

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fe8d8d5
adjust data types for uiFilters and range in apm requests
dominiqueclarke May 4, 2021
5b58e20
Merge branch 'master' into fix/56-uptime-adjust-data-types-for-has-ru…
kibanamachine May 4, 2021
c10e3da
Merge branch 'master' of github.com:elastic/kibana into fix/56-uptime…
dominiqueclarke May 12, 2021
44aee1a
update has_rum_data api query types
dominiqueclarke May 12, 2021
1ac495a
Merge branch 'fix/56-uptime-adjust-data-types-for-has-rum-data-api-ca…
dominiqueclarke May 12, 2021
0d334c8
update hasRumData setup type
dominiqueclarke May 12, 2021
9eed989
update has_rum_data query to account for undefined start and end
dominiqueclarke May 14, 2021
65676a8
Merge branch 'master' into fix/56-uptime-adjust-data-types-for-has-ru…
kibanamachine May 14, 2021
4ee8cf4
update observability rangeQuery helper to account for undefined start…
dominiqueclarke May 14, 2021
e91ddad
Merge branch 'fix/56-uptime-adjust-data-types-for-has-rum-data-api-ca…
dominiqueclarke May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ import { ProcessorEvent } from '../../../common/processor_event';
import { rangeQuery } from '../../../server/utils/queries';
import { TRANSACTION_PAGE_LOAD } from '../../../common/transaction_types';

export async function hasRumData({ setup }: { setup: Setup & SetupTimeRange }) {
export async function hasRumData({
setup,
}: {
setup: Setup & Partial<SetupTimeRange>;
}) {
try {
const { start, end } = setup;

Expand All @@ -31,7 +35,18 @@ export async function hasRumData({ setup }: { setup: Setup & SetupTimeRange }) {
},
aggs: {
services: {
filter: rangeQuery(start, end)[0],
...(start && end
? { filter: rangeQuery(start, end)[0] }
: {
// accounts for scenarios in which start and end are undefined
filter: {
range: {
'@timestamp': {
format: 'epoch_millis',
},
},
},
}),
aggs: {
mostTraffic: {
terms: {
Expand Down
7 changes: 6 additions & 1 deletion x-pack/plugins/apm/server/routes/rum_client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import * as t from 'io-ts';
import { jsonRt } from '@kbn/io-ts-utils';
import { isoToEpochRt } from '@kbn/io-ts-utils';
import { LocalUIFilterName } from '../../common/ui_filter';
import {
Setup,
Expand Down Expand Up @@ -264,7 +265,11 @@ const rumJSErrors = createApmServerRoute({
const rumHasDataRoute = createApmServerRoute({
endpoint: 'GET /api/apm/observability_overview/has_rum_data',
params: t.partial({
query: t.intersection([uiFiltersRt, rangeRt]),
query: t.partial({
uiFilters: t.string,
start: isoToEpochRt,
end: isoToEpochRt,
}),
}),
options: { tags: ['access:apm'] },
handler: async (resources) => {
Expand Down