diff --git a/web/src/locales/en-US/alert.js b/web/src/locales/en-US/alert.js index 288f76cd..e77009ca 100644 --- a/web/src/locales/en-US/alert.js +++ b/web/src/locales/en-US/alert.js @@ -206,6 +206,8 @@ export default { "alert.rule.table.columnns.objects": "Objects", "alert.rule.table.columnns.schedule": "Schedule", "alert.rule.table.columnns.expression": "Expression", + "alert.rule.table.columnns.condition.type": "Condition Type", + "alert.rule.table.columnns.condition": "Condition", "alert.rule.table.columnns.status": "Status", "alert.rule.table.columnns.status.failed": "Connect failed", "alert.rule.table.columnns.status.succeeded": "Connect succeeded", diff --git a/web/src/locales/zh-CN/alert.js b/web/src/locales/zh-CN/alert.js index 5dd2ec99..318eed43 100644 --- a/web/src/locales/zh-CN/alert.js +++ b/web/src/locales/zh-CN/alert.js @@ -194,6 +194,8 @@ export default { "alert.rule.table.columnns.objects": "告警对象", "alert.rule.table.columnns.schedule": "计划周期", "alert.rule.table.columnns.expression": "告警规则", + "alert.rule.table.columnns.condition.type": "触发条件类型", + "alert.rule.table.columnns.condition": "触发条件", "alert.rule.table.columnns.status": "运行状态", "alert.rule.table.columnns.status.failed": "连接失败", "alert.rule.table.columnns.status.succeeded": "连接成功", diff --git a/web/src/pages/Alerting/Rule/components/RuleCard.jsx b/web/src/pages/Alerting/Rule/components/RuleCard.jsx index 371f4089..cc64ff3f 100644 --- a/web/src/pages/Alerting/Rule/components/RuleCard.jsx +++ b/web/src/pages/Alerting/Rule/components/RuleCard.jsx @@ -94,6 +94,7 @@ const RuleCard = ({ ruleID, data = {} }) => { ); }; const clusters = useGlobalClusters(); + const isBucketDiff = !!(data && data.bucket_conditions) return (
@@ -158,10 +159,16 @@ const RuleCard = ({ ruleID, data = {} }) => { {data?.expression} - - Condition + + {formatMessage({ id: "alert.rule.table.columnns.condition.type" })} - + {isBucketDiff ? formatMessage({id: `alert.rule.form.label.buckets_diff`}) : formatMessage({id: `alert.rule.form.label.metrics_value`})} + + + + {formatMessage({ id: "alert.rule.table.columnns.condition" })} + + @@ -173,6 +180,9 @@ const Conditions = ({ items }) => { return (items || []).map((item) => { let operator = ""; switch (item.operator) { + case "equals": + operator = "="; + break; case "gte": operator = ">="; break; @@ -185,11 +195,29 @@ const Conditions = ({ items }) => { case "lte": operator = "<="; break; + case "range": + operator = "range"; + break; } return (
- {operator} - {item.values[0]} + {item.type && ({formatMessage({id: `alert.rule.form.label.${item.type}`})})} + { + operator === 'range' ? ( + <> + {`>=`} + {item.values[0]} + {`&`} + {`<=`} + {item.values[1]} + + ) : ( + <> + {operator} + {item.values[0]} + + ) + }
);