Skip to content

Add support for regex based rule in alerts #353

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
merged 3 commits into from
Apr 1, 2023
Merged

Add support for regex based rule in alerts #353

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18a8cdb
Add support for regex based rule in alerts
nitisht Apr 1, 2023
c4160d3
Fmt fix
nitisht Apr 1, 2023
06af335
clippy fix
nitisht Apr 1, 2023
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
31 changes: 24 additions & 7 deletions server/src/alerts/rule.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ impl ColumnRule {
NumericOperator::GreaterThanEquals => "greater than or equal to",
NumericOperator::LessThan => "less than",
NumericOperator::LessThanEquals => "less than or equal to",
NumericOperator::Regex => "matches regex",
},
value,
repeats
Expand All @@ -138,10 +139,11 @@ impl ColumnRule {
"{} column {} {}, {} times",
column,
match operator {
StringOperator::Exact => "was equal to",
StringOperator::NotExact => "was not equal to",
StringOperator::Contains => "contained",
StringOperator::NotContains => "did not contain",
StringOperator::Exact => "equal to",
StringOperator::NotExact => "not equal to",
StringOperator::Contains => "contains",
StringOperator::NotContains => "does not contain",
StringOperator::Regex => "matches regex",
},
value,
repeats
Expand Down Expand Up @@ -292,9 +294,9 @@ mod tests {
}

pub mod base {
use serde::{Deserialize, Serialize};

use self::ops::{NumericOperator, StringOperator};
use regex::Regex;
use serde::{Deserialize, Serialize};

#[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down Expand Up @@ -328,6 +330,10 @@ pub mod base {
NumericOperator::LessThanEquals => {
number.as_f64().unwrap() <= self.value.as_f64().unwrap()
}
NumericOperator::Regex => {
let re: Regex = regex::Regex::new(&self.value.to_string()).unwrap();
re.is_match(&number.to_string())
}
};

Some(res)
Expand Down Expand Up @@ -361,13 +367,21 @@ pub mod base {
StringOperator::NotContains => !string
.to_ascii_lowercase()
.contains(&self.value.to_ascii_lowercase()),
StringOperator::Regex => {
let re: Regex = regex::Regex::new(&self.value).unwrap();
re.is_match(string)
}
}
} else {
match self.operator {
StringOperator::Exact => string.eq(&self.value),
StringOperator::NotExact => !string.eq(&self.value),
StringOperator::Contains => string.contains(&self.value),
StringOperator::NotContains => !string.contains(&self.value),
StringOperator::Regex => {
let re: Regex = regex::Regex::new(&self.value).unwrap();
re.is_match(string)
}
}
};

Expand All @@ -393,6 +407,8 @@ pub mod base {
LessThan,
#[serde(alias = "<=")]
LessThanEquals,
#[serde(alias = "~")]
Regex,
}

impl Default for NumericOperator {
Expand All @@ -412,7 +428,8 @@ pub mod base {
Contains,
#[serde(alias = "!%")]
NotContains,
// =~ and !~ reserved for regex
#[serde(alias = "~")]
Regex,
}

impl Default for StringOperator {
Expand Down