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.

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

[alarm] refactor new alarm #2902

Merged
merged 77 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
efba1f6
[improve] update backend monitor tags to label
tomsun28 Dec 17, 2024
62e84cf
[improve] update alarm fra
tomsun28 Dec 19, 2024
c8eec91
Merge branch 'master' into new-alarm
tomsun28 Dec 24, 2024
ac5f1b3
[improve] update alarm stru
tomsun28 Dec 24, 2024
6b781c4
[improve] update alarm
tomsun28 Dec 25, 2024
e15418e
[improve] update alarm
tomsun28 Dec 25, 2024
469ec93
[improve] update alarm
tomsun28 Dec 25, 2024
5a790f4
[improve] update alarm
tomsun28 Dec 25, 2024
557fa93
[improve] update alarm
tomsun28 Dec 25, 2024
5bd9d21
[improve] update alarm
tomsun28 Dec 25, 2024
bf3f6d6
[improve] update alarm
tomsun28 Dec 25, 2024
78db1b1
[improve] update alarm
tomsun28 Dec 25, 2024
4741cc9
[improve] update alarm
tomsun28 Dec 25, 2024
ef49b72
[webapp] update alert pojo
tomsun28 Dec 25, 2024
604de18
[webapp] update alert pojo
tomsun28 Dec 25, 2024
a7438fb
[improve] update alarm
tomsun28 Dec 25, 2024
d7a4e92
[improve] update alarm
tomsun28 Dec 25, 2024
f5acbfe
[improve] update alarm
tomsun28 Dec 25, 2024
d97830c
[improve] update alarm
tomsun28 Dec 25, 2024
dc247d0
[improve] update alarm
tomsun28 Dec 25, 2024
cae868d
[improve] update alarm
tomsun28 Dec 25, 2024
bcd8e76
[improve] update alarm
tomsun28 Dec 25, 2024
e3b5de7
[improve] update alarm
tomsun28 Dec 25, 2024
107581a
[improve] update alarm
tomsun28 Dec 25, 2024
d7794f5
[improve] update alarm
tomsun28 Dec 25, 2024
e7122b9
[improve] update alarm
tomsun28 Dec 25, 2024
81934a0
[improve] update alarm
tomsun28 Dec 25, 2024
17798de
[improve] update alarm
tomsun28 Dec 25, 2024
46c5271
Update hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/cal…
tomsun28 Dec 25, 2024
ff4b4fa
Update hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/red…
tomsun28 Dec 25, 2024
fa3d43b
Update hertzbeat-common/src/main/java/org/apache/hertzbeat/common/ent…
tomsun28 Dec 25, 2024
8f321c0
Update hertzbeat-base/pom.xml
tomsun28 Dec 25, 2024
7cbd5ce
Update hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/red…
tomsun28 Dec 25, 2024
79196c6
Update hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/cal…
tomsun28 Dec 25, 2024
a8b6204
Update hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/ser…
tomsun28 Dec 25, 2024
da6be30
Update hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/ser…
tomsun28 Dec 25, 2024
be6724e
Update hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/ser…
tomsun28 Dec 25, 2024
1555cf1
Update hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/ser…
tomsun28 Dec 25, 2024
abd9dd1
Update hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/red…
tomsun28 Dec 25, 2024
48ba387
Update hertzbeat-base/pom.xml
tomsun28 Dec 25, 2024
0c3e0bb
Update hertzbeat-common/src/main/java/org/apache/hertzbeat/common/ent…
tomsun28 Dec 25, 2024
0753a7e
Update hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/cal…
tomsun28 Dec 25, 2024
fdc667d
Update hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/cal…
tomsun28 Dec 25, 2024
0e1901a
Update hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/red…
tomsun28 Dec 25, 2024
0089821
Merge branch 'master' into new-alarm
tomsun28 Dec 25, 2024
201c6cf
[improve] update alarm
tomsun28 Dec 26, 2024
5e36d75
[improve] update alarm
tomsun28 Dec 26, 2024
2df0abb
[improve] update alarm
tomsun28 Dec 26, 2024
238a2b8
[improve] update alarm
tomsun28 Dec 26, 2024
8333382
Merge branch 'master' into new-alarm
Calvin979 Dec 27, 2024
2a3a61c
Merge branch 'master' into new-alarm
tomsun28 Dec 28, 2024
022bbcb
Merge branch 'master' into new-alarm
tomsun28 Dec 30, 2024
45dcb3d
[improve] update alarm
tomsun28 Dec 30, 2024
b85eb1a
[feature] update alert define and add realtime, periodic threshold (#…
tomsun28 Jan 1, 2025
6c29b2e
Merge branch 'master' into new-alarm
tomsun28 Jan 1, 2025
cfaef28
[refactor] support alarm threshold bind monitors (#2933)
tomsun28 Jan 1, 2025
65d3c41
Merge branch 'master' into new-alarm
tomsun28 Jan 1, 2025
d73c09c
[improve] update alarm define
tomsun28 Jan 2, 2025
798edcb
[alarm] update alarm center ui and group alarm config (#2938)
tomsun28 Jan 2, 2025
7682cf4
[alarm] support alarm inhibit web ui (#2940)
tomsun28 Jan 2, 2025
9224d31
[alarm] combine common labels and update ui (#2944)
tomsun28 Jan 3, 2025
9344d3f
Merge branch 'master' into new-alarm
tomsun28 Jan 3, 2025
1755dbe
[improve] update labels
tomsun28 Jan 3, 2025
3d9a124
[improve] fix license
tomsun28 Jan 3, 2025
4f8e352
[improve] fix test
tomsun28 Jan 3, 2025
b529b26
Merge branch 'master' into new-alarm
tomsun28 Jan 3, 2025
3c4bcfe
[improve] fix test
tomsun28 Jan 3, 2025
9c33d8b
[improve] fix test
tomsun28 Jan 3, 2025
5f1ada4
AlarmInhibitReduce
a-little-fool Jan 3, 2025
6d604cc
AlarmInhibitReduce
a-little-fool Jan 3, 2025
e66040d
[improve] fix annotation
a-little-fool Jan 3, 2025
61c8bad
[improve] fix
tomsun28 Jan 3, 2025
7e19ed8
[improve] update group reduce
tomsun28 Jan 4, 2025
fa81d56
[improve] update group reduce
tomsun28 Jan 4, 2025
18b60eb
[impove] update alarm and labels relate ui (#2946)
tomsun28 Jan 4, 2025
c91a098
Merge branch 'master' into new-alarm
tomsun28 Jan 4, 2025
1fa25cf
Merge branch 'master' into new-alarm
zqr10159 Jan 4, 2025
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
Prev Previous commit
Next Next commit
[improve] fix test
Signed-off-by: tomsun28 <[email protected]>
  • Loading branch information
tomsun28 committed Jan 3, 2025
commit 3c4bcfeeb0d181ee05a6267d89e819c2618fc7d3
67 changes: 66 additions & 1 deletion web-app/src/assets/i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -779,5 +779,70 @@
"validation.goal.required": "Please enter a description of the goal",
"validation.standard.required": "Please enter a metric",
"expand": "Expand",
"collapse": "Collapse"
"collapse": "Collapse",
"alert.setting.template.vars.app": "Application Name",
"alert.setting.template.vars.metric": "Metric Name",
"alert.setting.template.vars.field": "Field Name",
"alert.setting.template.vars.value": "Trigger Value",
"alert.setting.template.vars.threshold": "Threshold Expression",
"alert.setting.template.vars.tags": "Tag Information",
"alert.setting.template.vars.time": "Trigger Time",
"alert.setting.template.vars.tip": "Insert metrics or operators",
"alert.setting.expr.operator.equals": "Equals",
"alert.setting.expr.operator.not-equals": "Not Equals",
"alert.setting.expr.operator.greater": "Greater Than",
"alert.setting.expr.operator.greater-equals": "Greater Than or Equal",
"alert.setting.expr.operator.less": "Less Than",
"alert.setting.expr.operator.less-equals": "Less Than or Equal",
"alert.setting.expr.operator.and": "And",
"alert.setting.expr.operator.or": "Or",
"alert.setting.expr.operator.brackets": "Brackets",
"alert.setting.type.realtime.desc": "Real-time calculation of collected metrics, trigger alert immediately when threshold is reached",
"alert.setting.type.periodic.desc": "Periodically execute PromQL queries, trigger alerts based on results",
"alert.setting.period": "Execution Period",
"alert.setting.period.tip": "Time interval for periodic threshold calculation, in seconds, minimum 60 seconds",
"alert.setting.period.placeholder": "Please enter execution period, minimum 60 seconds",
"alert.setting.bind.monitors": "Associated Monitors",
"alert.setting.bind.monitors.tip": "Configure this threshold rule to apply to specific monitoring tasks, default is not associated with all",
"alert.setting.bind.available": "Available Monitors",
"alert.setting.bind.selected": "Selected Monitors",
"alert.setting.bind.manage": "Manage Associations",
"alert.setting.bind.need-save": "Please select metric type before associating monitors",
"alert.group-converge.group-wait": "Wait Time",
"alert.group-converge.group-interval": "Interval Time",
"alert.group-converge.repeat-interval": "Repeat Interval",
"alert.group-converge.seconds": "Seconds",
"alert.group-converge.group-labels": "Group Labels",
"alert.group-converge.group-labels.add": "Add Label",
"alert.group-converge.group-labels.input": "Press Enter after inputting custom label",
"alert.group-converge.group-labels.placeholder": "Please enter label",
"alert.group-converge.name.tip": "Name to identify this grouping strategy, must be unique",
"alert.group-converge.group-labels.tip": "Group alert messages by alert label keys, support multiple label keys like alertname, severity, instance etc",
"alert.group-converge.group-wait.tip": "Wait time after new alert, similar alerts received during this time will be grouped, default 30 seconds",
"alert.group-converge.group-interval.tip": "Minimum interval for sending grouped alert notifications, avoid too frequent notifications, default 5 minutes",
"alert.group-converge.repeat-interval.tip": "Minimum notification interval for repeat alerts, avoid sending repeated notifications for continuous alerts, default 4 hours",
"alert.inhibit.source_labels": "Source Labels",
"alert.inhibit.source_labels.tip": "When alerts contain these labels, they will inhibit target alerts",
"alert.inhibit.target_labels": "Target Labels",
"alert.inhibit.target_labels.tip": "Alerts matching these labels will be inhibited",
"alert.inhibit.equal_labels": "Equal Labels",
"alert.inhibit.equal_labels.tip": "Source and target alerts must have equal values for these label keys, common keys like alertname, instance, severity etc",
"alert.inhibit.equal_labels.placeholder": "Press Enter after entering label name, or select from dropdown",
"alert.inhibit.equal_labels.more": "{{count}} more labels",
"alert.inhibit.equal_labels.common": "Common Labels",
"alert.inhibit.equal_labels.custom": "Custom Labels",
"alert.inhibit.name": "Inhibit Rule Name",
"alert.inhibit.name.tip": "Name to identify this inhibit rule, must be unique",
"alert.inhibit.enable": "Enable",
"alert.inhibit.enable.tip": "Whether to enable this inhibit rule",
"alert.inhibit.new": "New Inhibit Rule",
"alert.inhibit.edit": "Edit Inhibit Rule",
"alert.inhibit.delete": "Delete Inhibit Rule",
"alert.help.inhibit": "Alert inhibition is used to configure inhibition relationships between alerts. When an alert occurs, it can inhibit other alerts from being generated. For example, when a server goes down, all alerts on that server can be inhibited.",
"alert.help.inhibit.link": "https://hertzbeat.apache.org/docs/help/alert_inhibit",
"common.button.confirm": "Confirm",
"annotation": "Annotation",
"annotation.bind": "Bind Annotation",
"annotation.bind.tip": "You can use annotations to mark entity information, such as binding annotations of important events to resources.",
"label": "Label"
}
69 changes: 68 additions & 1 deletion web-app/src/assets/i18n/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -791,5 +791,72 @@
"validation.date.required": "請選擇起止日期",
"validation.goal.required": "請輸入目標描述",
"validation.standard.required": "請輸入衡量標准",
"validation.required": "請填充必填項! "
"validation.required": "請填充必填項! ",
"alert.setting.template.vars.app": "應用名稱",
"alert.setting.template.vars.metric": "指標名稱",
"alert.setting.template.vars.field": "欄位名稱",
"alert.setting.template.vars.value": "觸發值",
"alert.setting.template.vars.threshold": "閾值表達式",
"alert.setting.template.vars.tags": "標籤信息",
"alert.setting.template.vars.time": "觸發時間",
"alert.setting.template.vars.tip": "插入指標或操作符",
"alert.setting.expr.operator.equals": "等於",
"alert.setting.expr.operator.not-equals": "不等於",
"alert.setting.expr.operator.greater": "大於",
"alert.setting.expr.operator.greater-equals": "大於等於",
"alert.setting.expr.operator.less": "小於",
"alert.setting.expr.operator.less-equals": "小於等於",
"alert.setting.expr.operator.and": "與",
"alert.setting.expr.operator.or": "或",
"alert.setting.expr.operator.brackets": "括號",
"alert.setting.type.realtime.desc": "實時計算採集的指標數據,觸發閾值時立即告警",
"alert.setting.type.periodic.desc": "週期性執行 PromQL 查詢,根據結果觸發閾值告警",
"alert.setting.period": "執行週期",
"alert.setting.period.tip": "週期性執行閾值計算的時間間隔,單位秒,最小60秒",
"alert.setting.period.placeholder": "請輸入執行週期,最小60秒",
"alert.setting.bind.monitors": "關聯監控",
"alert.setting.bind.monitors.tip": "配置此閾值規則應用到指定監控任務,默認不關聯應用全部",
"alert.setting.bind.available": "可選監控",
"alert.setting.bind.selected": "已選監控",
"alert.setting.bind.manage": "關聯監控",
"alert.setting.bind.need-save": "請先選擇指標類型再進行監控關聯",
"alert.group-converge.group-wait": "等待時間",
"alert.group-converge.group-interval": "間隔時間",
"alert.group-converge.repeat-interval": "重複間隔",
"alert.group-converge.seconds": "秒",
"alert.group-converge.group-labels": "分組標籤",
"alert.group-converge.group-labels.add": "添加標籤",
"alert.group-converge.group-labels.input": "輸入自定義標籤後按回車",
"alert.group-converge.group-labels.placeholder": "請輸入標籤",
"alert.group-converge.name.tip": "標識此分組策略的名稱,需要唯一",
"alert.group-converge.group-labels.tip": "根據告警標籤Key對告警消息進行分組,支持配置多個標籤Key,如 alertname、severity、instance 等",
"alert.group-converge.group-wait.tip": "新告警產生後等待時間,在此時間內收到的相同告警將被分組,默認30秒",
"alert.group-converge.group-interval.tip": "發送分組告警通知的最小時間間隔,避免告警通知過於頻繁,默認5分鐘",
"alert.group-converge.repeat-interval.tip": "重複告警的最小通知間隔,對於持續觸發的告警,避免重複發送通知,默認4小時",
"alert.inhibit.source_labels": "源標籤",
"alert.inhibit.source_labels.tip": "當告警包含這些標籤時,將會抑制目標告警",
"alert.inhibit.target_labels": "目標標籤",
"alert.inhibit.target_labels.tip": "匹配這些標籤的告警將被抑制",
"alert.inhibit.equal_labels": "相等標籤",
"alert.inhibit.equal_labels.tip": "源告警和目標告警這些標籤Key和對應值必須相等,常用標籤Key如 alertname、instance、severity 等",
"alert.inhibit.equal_labels.placeholder": "輸入標籤名稱後按回車,或從下拉列表選擇",
"alert.inhibit.equal_labels.more": "還有 {{count}} 個標籤",
"alert.inhibit.equal_labels.common": "常用標籤",
"alert.inhibit.equal_labels.custom": "自定義標籤",
"alert.inhibit.name": "抑制規則名稱",
"alert.inhibit.name.tip": "標識此抑制規則的名稱,需要唯一",
"alert.inhibit.enable": "是否啟用",
"alert.inhibit.enable.tip": "是否啟用此抑制規則",
"alert.inhibit.new": "新增抑制規則",
"alert.inhibit.edit": "編輯抑制規則",
"alert.inhibit.delete": "刪除抑制規則",
"alert.help.inhibit": "告警抑制用於配置告警之間的抑制關係。當某個告警發生時,可以抑制其他告警的產生。例如,當服務器宕機時,可以抑制該服務器上的所有告警。",
"alert.help.inhibit.link": "https://hertzbeat.apache.org/zh-cn/docs/help/alert_inhibit",
"common.button.confirm": "確認",
"annotation": "註解",
"annotation.bind": "綁定註解",
"annotation.bind.tip": "您可以使用註解對實體信息進行標記,例如給資源綁定重要事件的註解。",
"label": "標籤",
"expand": "展開",
"collapse": "收起"
}
Loading