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

Jump to bottom

[Infrastructure UI] Fix Lens charts for APM hosts #156372

Merged
merged 1 commit into from
May 2, 2023
Merged

[Infrastructure UI] Fix Lens charts for APM hosts #156372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions x-pack/plugins/infra/public/hooks/use_lens_attributes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,22 @@ export const useLensAttributes = ({
return visualizationAttributes;
}, [dataView, formulaAPI, options, type, visualizationType]);

const injectFilters = (data: { filters: Filter[]; query: Query }): LensAttributes | null => {
const injectFilters = ({
filters,
query = { language: 'kuery', query: '' },
}: {
filters: Filter[];
query?: Query;
}): LensAttributes | null => {
if (!attributes) {
return null;
}
return {
...attributes,
state: {
...attributes.state,
query: data.query,
filters: [...attributes.state.filters, ...data.filters],
query,
filters: [...attributes.state.filters, ...filters],
},
};
};
Expand All @@ -95,7 +101,7 @@ export const useLensAttributes = ({
}: {
timeRange: TimeRange;
filters: Filter[];
query: Query;
query?: Query;
}) => {
return {
openInLens: {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface LensWrapperProps {
id: string;
attributes: LensAttributes | null;
dateRange: TimeRange;
query: Query;
query?: Query;
filters: Filter[];
extraActions: Action[];
lastReloadRequestTime?: number;
Expand Down
19 changes: 7 additions & 12 deletions x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,18 @@ export const Tile = ({
visualizationType: 'metricChart',
});

const hostsFilterQuery = useMemo(() => {
return createHostsFilter(
hostNodes.map((p) => p.name),
dataView
);
const filters = useMemo(() => {
return [
createHostsFilter(
hostNodes.map((p) => p.name),
dataView
),
];
}, [hostNodes, dataView]);

const filters = useMemo(
() => [...searchCriteria.filters, ...searchCriteria.panelFilters, ...[hostsFilterQuery]],
[hostsFilterQuery, searchCriteria.filters, searchCriteria.panelFilters]
);

const extraActionOptions = getExtraActions({
timeRange: searchCriteria.dateRange,
filters,
query: searchCriteria.query,
});

const handleBrushEnd = ({ range }: BrushTriggerEvent['data']) => {
Expand Down Expand Up @@ -156,7 +152,6 @@ export const Tile = ({
lastReloadRequestTime={afterLoadedState.lastReloadRequestTime}
dateRange={afterLoadedState.dateRange}
filters={afterLoadedState.filters}
query={afterLoadedState.query}
onBrushEnd={handleBrushEnd}
loading={loading}
/>
Expand Down
19 changes: 7 additions & 12 deletions x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metric_chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,18 @@ export const MetricChart = ({ title, type, breakdownSize }: MetricChartProps) =>
visualizationType: 'lineChart',
});

const hostsFilterQuery = useMemo(() => {
return createHostsFilter(
currentPage.map((p) => p.name),
dataView
);
const filters = useMemo(() => {
return [
createHostsFilter(
currentPage.map((p) => p.name),
dataView
),
];
}, [currentPage, dataView]);

const filters = [
...afterLoadedState.filters,
...afterLoadedState.panelFilters,
...[hostsFilterQuery],
];
const extraActionOptions = getExtraActions({
timeRange: afterLoadedState.dateRange,
filters,
query: afterLoadedState.query,
});

const extraActions: Action[] = [extraActionOptions.openInLens];
Expand Down Expand Up @@ -132,7 +128,6 @@ export const MetricChart = ({ title, type, breakdownSize }: MetricChartProps) =>
lastReloadRequestTime={afterLoadedState.lastReloadRequestTime}
dateRange={afterLoadedState.dateRange}
filters={filters}
query={afterLoadedState.query}
onBrushEnd={handleBrushEnd}
loading={loading}
hasTitle
Expand Down