Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 7 additions & 9 deletions server/src/handlers/logstream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,13 @@ pub async fn put_alert(req: HttpRequest, body: web::Json<serde_json::Value>) ->
}
.to_http(),
},
Err(e) => {
return response::ServerResponse {
msg: format!(
"failed to set alert configuration for log stream {} due to err: {}",
stream_name, e
),
code: StatusCode::BAD_REQUEST,
}
.to_http();
Err(e) => response::ServerResponse {
msg: format!(
"failed to set alert configuration for log stream {} due to err: {}",
stream_name, e
),
code: StatusCode::BAD_REQUEST,
}
.to_http(),
}
}
8 changes: 4 additions & 4 deletions server/src/validator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ const DENIED_NAMES: &[&str] = &[
"select", "from", "where", "group", "by", "order", "limit", "offset", "join", "and",
];

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Alerts {
pub alerts: Vec<Alert>,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Alert {
pub name: String,
Expand All @@ -43,7 +43,7 @@ pub struct Alert {
pub target: Vec<Target>,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Rule {
pub field: String,
Expand All @@ -52,7 +52,7 @@ pub struct Rule {
pub within: String,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Target {
pub name: String,
Expand Down