Skip to content

Revert "[Metrics UI] Fix OR logic on redundant groupBy detection" #116820

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

Merged
Zacqary merged 1 commit into from
Oct 29, 2021
Merged

Revert "[Metrics UI] Fix OR logic on redundant groupBy detection" #116820

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
11 changes: 2 additions & 9 deletions x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,29 +260,22 @@ export const Expressions: React.FC<Props> = (props) => {
[alertParams.groupBy]
);

// Test to see if any of the group fields in groupBy are already filtered down to a single
// group by the filterQuery. If this is the case, then a groupBy is unnecessary, as it would only
// ever produce one group instance
const groupByFilterTestPatterns = useMemo(() => {
if (!alertParams.groupBy) return null;
const groups = !Array.isArray(alertParams.groupBy)
? [alertParams.groupBy]
: alertParams.groupBy;
return groups.map((group: string) => ({
groupName: group,
pattern: new RegExp(`{"match(_phrase)?":{"${group}":"(.*?)"}}`, 'g'),
pattern: new RegExp(`{"match(_phrase)?":{"${group}":"(.*?)"}}`),
}));
}, [alertParams.groupBy]);

const redundantFilterGroupBy = useMemo(() => {
if (!alertParams.filterQuery || !groupByFilterTestPatterns) return [];
return groupByFilterTestPatterns
.map(({ groupName, pattern }) => {
// Test to see if there is ONLY ONE match for this group in the query
// If there are 0 matches, then this query isn't filtering out any groups at all
// If there are 2+ matches, the query is using OR logic (e.g. group:a OR group:b) and will
// still allow for more than one groupBy alert instance.
if (alertParams.filterQuery!.match(pattern)?.length === 1) {
if (pattern.test(alertParams.filterQuery!)) {
return groupName;
}
})
Expand Down