This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new d516b3a15 improvement: improve log severity text input (#3805)
d516b3a15 is described below
commit d516b3a15d3024ff3019d8d20469494b21ee4879
Author: Yang Chen <[email protected]>
AuthorDate: Wed Oct 8 00:31:31 2025 +0800
improvement: improve log severity text input (#3805)
Co-authored-by: Tomsun28 <[email protected]>
---
.../current/help/alarm_center.md | 2 +-
.../current/help/alert_threshold.md | 4 ++--
.../current/help/log_manage.md | 10 +++++-----
.../current/help/log_stream.md | 6 +++---
.../version-v1.6.x/help/alarm_center.md | 2 +-
.../routes/log/log-manage/log-manage.component.html | 18 +++++++++++++++++-
.../app/routes/log/log-manage/log-manage.component.ts | 4 +++-
.../routes/log/log-stream/log-stream.component.html | 17 ++++++++++++++++-
.../app/routes/log/log-stream/log-stream.component.ts | 2 ++
web-app/src/assets/i18n/zh-CN.json | 18 +++++++++---------
web-app/src/assets/i18n/zh-TW.json | 18 +++++++++---------
11 files changed, 68 insertions(+), 33 deletions(-)
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alarm_center.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alarm_center.md
index 09bc1dc85..0da8bcb15 100644
---
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alarm_center.md
+++
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alarm_center.md
@@ -25,7 +25,7 @@ HertzBeat 的告警中心管理来自两个主要来源的告警：
在显示到告警中心之前，所有告警都会经过几个处理步骤：
1. 分组
- - 基于来源、类型、严重程度和其他属性（标签）对相关告警进行分类
+ - 基于来源、类型、日志级别和其他属性（标签）对相关告警进行分类
- 帮助高效管理大量告警
- 支持针对不同场景的自定义分组规则
2. 收敛
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_threshold.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_threshold.md
index f43165372..03be69e41 100644
---
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_threshold.md
+++
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_threshold.md
@@ -154,7 +154,7 @@ HAVING COUNT(*) > 10
- **括号**: 用于分组和控制求值顺序
- **数字字面量**: 阈值（如 `80`, `90.5`）
- **执行周期**：表达式的执行时间间隔，单位为秒。例如 `300` 表示每 5 分钟评估一次表达式
-- **告警级别**：设定当触发告警时的严重程度，包括：`warning`（警告）、`critical`（严重）、`emergency`（紧急）
+- **告警级别**：设定当触发告警时的日志级别，包括：`warning`（警告）、`critical`（严重）、`emergency`（紧急）
- **触发次数**：表达式连续满足告警条件的次数，超过该次数后才实际触发告警
- **通知模板**：当告警被触发后发送的通知内容模板，支持对象嵌套访问，页面上提供了可用的模板变量供参考
- **附加标签**：给此阈值规则附加标签，当产生告警时，此标签也会附加到告警上
@@ -180,7 +180,7 @@ WHERE level = 'ERROR' AND timestamp >= NOW() - INTERVAL 5
MINUTE
```
- **执行周期**：SQL 查询的执行时间间隔，单位为秒。例如 `300` 表示每 5 分钟执行一次查询
-- **告警级别**：设定当触发告警时的严重程度，包括：`warning`（警告）、`critical`（严重）、`emergency`（紧急）
+- **告警级别**：设定当触发告警时的日志级别，包括：`warning`（警告）、`critical`（严重）、`emergency`（紧急）
- **告警模式**：选择告警发送方式：
- **窗口组模式（group）**：将查询结果作为一个整体告警发送
- **单条模式（individual）**：查询结果中的每行数据都单独发送告警
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/log_manage.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/log_manage.md
index f7442e173..8e1254d73 100644
--- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/log_manage.md
+++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/log_manage.md
@@ -28,8 +28,8 @@ keywords: [开源监控, 日志管理, 日志查询, 日志统计, 日志删除]
| **时间范围** | `timestamp` | 日期时间 | 指定查询的时间窗口 | `2024-01-01 00:00:00` 至
`2024-01-02 00:00:00` | 问题时段定位、性能分析 |
| **跟踪ID** | `traceId` | 字符串 | 分布式系统请求链路跟踪 | `1234567890abcdef` | 链路追踪、请求流程分析 |
| **跨度ID** | `spanId` | 字符串 | 跟踪中特定操作标识 | `abcdef1234567890` | 微服务调用分析 |
-| **严重程度编号** | `severityNumber` | 数字 | OpenTelemetry 标准级别 | `1-24` | 按数字级别过滤 |
-| **严重程度文本** | `severityText` | 字符串 | 人类可读的日志级别 | `ERROR`、`WARN`、`INFO` |
按级别快速筛选 |
+| **日志级别编号** | `severityNumber` | 数字 | OpenTelemetry 标准级别 | `1-24` | 按数字级别过滤 |
+| **日志级别文本** | `severityText` | 字符串 | 人类可读的日志级别 | `ERROR`、`WARN`、`INFO` |
按级别快速筛选 |
### 可视化分析图表
@@ -52,7 +52,7 @@ keywords: [开源监控, 日志管理, 日志查询, 日志统计, 日志删除]
| 图表名称 | 图表类型 | 展示内容 | 主要用途 | 包含指标/级别 |
|---------|---------|---------|---------|-------------|
-| **严重程度分布图** | 饼图 | 不同日志级别的数量分布 | 快速了解日志严重程度分布情况 |
FATAL、ERROR、WARN、INFO、DEBUG |
+| **日志级别分布图** | 饼图 | 不同日志级别的数量分布 | 快速了解日志日志级别分布情况 |
FATAL、ERROR、WARN、INFO、DEBUG |
| **跟踪覆盖率图** | 饼图 | 带有跟踪信息的日志比例 | 分析系统跟踪覆盖情况 | 带 Trace ID 的日志数量<br/>带 Span ID
的日志数量<br/>同时带 Trace 和 Span 的日志数量<br/>无跟踪信息的日志数量 |
| **日志趋势图** | 时间线图 | 按小时统计的日志数量变化趋势 | 分析日志产生的时间模式和异常峰值 |
时间粒度：小时级别统计<br/>分析维度：时间模式识别、异常峰值检测 |
@@ -62,7 +62,7 @@ keywords: [开源监控, 日志管理, 日志查询, 日志统计, 日志删除]
- **时间**：日志生成时间戳
- **观察时间**：日志被观察到的时间
-- **严重程度**：日志级别标签
+- **日志级别**：日志级别标签
- **日志内容**：主要消息内容
- **属性**：日志附加属性信息
- **资源**：资源相关信息
@@ -80,7 +80,7 @@ keywords: [开源监控, 日志管理, 日志查询, 日志统计, 日志删除]
### 基本信息区域
-- **严重程度**：显示级别标签和颜色标识
+- **日志级别**：显示级别标签和颜色标识
- **时间戳**：格式化显示的详细时间
- **跟踪ID**：完整的分布式跟踪标识符
- **跨度ID**：完整的操作跨度标识符
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/log_stream.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/log_stream.md
index 6f3b5cc6e..e9080cef7 100644
--- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/log_stream.md
+++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/log_stream.md
@@ -40,8 +40,8 @@ keywords: [开源监控, 日志流, 实时日志, 日志过滤]
| 过滤条件 | 字段名称 | 数据类型 | 用途说明 | 示例值 | 使用场景 |
|---------|---------|---------|---------|--------|---------|
-| **严重程度编号** | `severityNumber` | 数字 | OpenTelemetry 标准级别 | `9` | 按数字级别精确过滤 |
-| **严重程度文本** | `severityText` | 字符串 | 人类可读的日志级别 | `ERROR`、`WARN`、`INFO` |
按级别快速筛选 |
+| **日志级别编号** | `severityNumber` | 数字 | OpenTelemetry 标准级别 | `9` | 按数字级别精确过滤 |
+| **日志级别文本** | `severityText` | 字符串 | 人类可读的日志级别 | `ERROR`、`WARN`、`INFO` |
按级别快速筛选 |
| **跟踪ID** | `traceId` | 字符串 | 分布式系统请求链路跟踪 | `1234567890abcdef` | 链路追踪、请求流程分析 |
| **跨度ID** | `spanId` | 字符串 | 跟踪中特定操作标识 | `abcdef1234567890` | 微服务调用分析 |
@@ -53,7 +53,7 @@ keywords: [开源监控, 日志流, 实时日志, 日志过滤]
### 基本信息区域
-- **严重程度**：显示级别标签和颜色标识
+- **日志级别**：显示级别标签和颜色标识
- **时间戳**：格式化显示的详细时间
- **跟踪ID**：完整的分布式跟踪标识符
- **跨度ID**：完整的操作跨度标识符
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.6.x/help/alarm_center.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.6.x/help/alarm_center.md
index 09bc1dc85..0da8bcb15 100644
---
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.6.x/help/alarm_center.md
+++
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.6.x/help/alarm_center.md
@@ -25,7 +25,7 @@ HertzBeat 的告警中心管理来自两个主要来源的告警：
在显示到告警中心之前，所有告警都会经过几个处理步骤：
1. 分组
- - 基于来源、类型、严重程度和其他属性（标签）对相关告警进行分类
+ - 基于来源、类型、日志级别和其他属性（标签）对相关告警进行分类
- 帮助高效管理大量告警
- 支持针对不同场景的自定义分组规则
2. 收敛
diff --git a/web-app/src/app/routes/log/log-manage/log-manage.component.html
b/web-app/src/app/routes/log/log-manage/log-manage.component.html
index 5394fd781..cb95696ac 100644
--- a/web-app/src/app/routes/log/log-manage/log-manage.component.html
+++ b/web-app/src/app/routes/log/log-manage/log-manage.component.html
@@ -39,7 +39,23 @@
[(ngModel)]="severityNumber"
style="width: 120px"
/>
- <input *nzSpaceItem nz-input [placeholder]="'log.manage.severity-text' |
i18n" [(ngModel)]="severityText" style="width: 120px" />
+ <input
+ *nzSpaceItem
+ type="text"
+ nz-input
+ [(ngModel)]="severityText"
+ [placeholder]="'log.manage.severity-text' | i18n"
+ [nzAutocomplete]="severityTextAuto"
+ style="width: 120px"
+ />
+ <nz-autocomplete #severityTextAuto>
+ <nz-auto-option nzValue="TRACE">TRACE</nz-auto-option>
+ <nz-auto-option nzValue="DEBUG">DEBUG</nz-auto-option>
+ <nz-auto-option nzValue="INFO">INFO</nz-auto-option>
+ <nz-auto-option nzValue="WARN">WARN</nz-auto-option>
+ <nz-auto-option nzValue="ERROR">ERROR</nz-auto-option>
+ <nz-auto-option nzValue="FATAL">FATAL</nz-auto-option>
+ </nz-autocomplete>
<button *nzSpaceItem nz-button nzType="primary" (click)="query()">
<i nz-icon nzType="search"></i> {{ 'log.manage.search' | i18n }}
</button>
diff --git a/web-app/src/app/routes/log/log-manage/log-manage.component.ts
b/web-app/src/app/routes/log/log-manage/log-manage.component.ts
index e1e3fa4ce..1d448931d 100644
--- a/web-app/src/app/routes/log/log-manage/log-manage.component.ts
+++ b/web-app/src/app/routes/log/log-manage/log-manage.component.ts
@@ -24,6 +24,7 @@ import { I18NService } from '@core';
import { ALAIN_I18N_TOKEN } from '@delon/theme';
import { SharedModule } from '@shared';
import { EChartsOption } from 'echarts';
+import { NzAutocompleteModule } from 'ng-zorro-antd/auto-complete';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzCardModule } from 'ng-zorro-antd/card';
import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
@@ -71,7 +72,8 @@ import { LogService } from '../../../service/log.service';
NzModalModule,
NzCheckboxModule,
NzPopoverModule,
- NzListModule
+ NzListModule,
+ NzAutocompleteModule
],
templateUrl: './log-manage.component.html',
styleUrl: './log-manage.component.less'
diff --git a/web-app/src/app/routes/log/log-stream/log-stream.component.html
b/web-app/src/app/routes/log/log-stream/log-stream.component.html
index 198cb8e22..2e3d3e906 100644
--- a/web-app/src/app/routes/log/log-stream/log-stream.component.html
+++ b/web-app/src/app/routes/log/log-stream/log-stream.component.html
@@ -104,11 +104,26 @@
<div class="filter-item">
<label class="filter-label">{{ 'log.stream.severity-text' | i18n
}}</label>
<nz-input-group [nzPrefix]="severityTextTemplate"
class="filter-input">
- <input type="text" nz-input [(ngModel)]="filterSeverityText"
[placeholder]="'log.stream.severity-text-placeholder' | i18n" />
+ <input
+ type="text"
+ nz-input
+ [(ngModel)]="filterSeverityText"
+ [placeholder]="'log.stream.severity-text-placeholder' | i18n"
+ [nzAutocomplete]="severityTextAuto"
+ />
</nz-input-group>
<ng-template #severityTextTemplate>
<i nz-icon nzType="file-text"></i>
</ng-template>
+
+ <nz-autocomplete #severityTextAuto>
+ <nz-auto-option nzValue="TRACE">TRACE</nz-auto-option>
+ <nz-auto-option nzValue="DEBUG">DEBUG</nz-auto-option>
+ <nz-auto-option nzValue="INFO">INFO</nz-auto-option>
+ <nz-auto-option nzValue="WARN">WARN</nz-auto-option>
+ <nz-auto-option nzValue="ERROR">ERROR</nz-auto-option>
+ <nz-auto-option nzValue="FATAL">FATAL</nz-auto-option>
+ </nz-autocomplete>
</div>
<div class="filter-item">
diff --git a/web-app/src/app/routes/log/log-stream/log-stream.component.ts
b/web-app/src/app/routes/log/log-stream/log-stream.component.ts
index 54f481732..707009c73 100644
--- a/web-app/src/app/routes/log/log-stream/log-stream.component.ts
+++ b/web-app/src/app/routes/log/log-stream/log-stream.component.ts
@@ -24,6 +24,7 @@ import { I18NService } from '@core';
import { ALAIN_I18N_TOKEN } from '@delon/theme';
import { SharedModule } from '@shared';
import { NzAlertModule } from 'ng-zorro-antd/alert';
+import { NzAutocompleteModule } from 'ng-zorro-antd/auto-complete';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzCardModule } from 'ng-zorro-antd/card';
import { NzDividerComponent } from 'ng-zorro-antd/divider';
@@ -52,6 +53,7 @@ interface ExtendedLogEntry {
FormsModule,
NzCardModule,
NzInputModule,
+ NzAutocompleteModule,
NzSelectModule,
NzButtonModule,
NzTagModule,
diff --git a/web-app/src/assets/i18n/zh-CN.json
b/web-app/src/assets/i18n/zh-CN.json
index be7d6fd11..09988ef53 100644
--- a/web-app/src/assets/i18n/zh-CN.json
+++ b/web-app/src/assets/i18n/zh-CN.json
@@ -603,7 +603,7 @@
"log.manage.basic-information": "基本信息",
"log.manage.clear": "清空",
"log.manage.chart.log-trend": "日志趋势",
- "log.manage.chart.severity-distribution": "严重程度分布",
+ "log.manage.chart.severity-distribution": "日志级别分布",
"log.manage.chart.trace-coverage": "跟踪覆盖率",
"log.manage.chart.trace-coverage.complete-trace-info": "完整 Trace 信息",
"log.manage.chart.trace-coverage.with-span": "有 Span ID",
@@ -623,8 +623,8 @@
"log.manage.overview.warning-logs": "警告日志",
"log.manage.reset-all-columns": "重置所有列",
"log.manage.search": "搜索",
- "log.manage.severity-number": "严重程度编号",
- "log.manage.severity-text": "严重程度",
+ "log.manage.severity-number": "日志级别编号",
+ "log.manage.severity-text": "日志级别",
"log.manage.show-statistics": "显示统计",
"log.manage.span-id": "Span ID",
"log.manage.table.column.attributes": "属性",
@@ -633,7 +633,7 @@
"log.manage.table.column.instrumentation": "采集工具",
"log.manage.table.column.observed-time": "观察时间",
"log.manage.table.column.resource": "来源",
- "log.manage.table.column.severity": "严重程度",
+ "log.manage.table.column.severity": "日志级别",
"log.manage.table.column.span-id": "Span ID",
"log.manage.table.column.time": "时间",
"log.manage.table.column.trace-flags": "Trace 标记",
@@ -664,11 +664,11 @@
"log.stream.resource": "个源",
"log.stream.resume": "恢复",
"log.stream.scroll-to-top": "滚动到顶部",
- "log.stream.severity": "严重程度:",
- "log.stream.severity-number": "严重程度编号:",
- "log.stream.severity-number-placeholder": "输入严重程度编号",
- "log.stream.severity-text": "严重程度:",
- "log.stream.severity-text-placeholder": "输入严重程度",
+ "log.stream.severity": "日志级别:",
+ "log.stream.severity-number": "日志级别编号:",
+ "log.stream.severity-number-placeholder": "输入日志级别编号",
+ "log.stream.severity-text": "日志级别:",
+ "log.stream.severity-text-placeholder": "输入日志级别",
"log.stream.show-filters": "显示过滤器",
"log.stream.span": "跨度:",
"log.stream.span-id": "Span ID:",
diff --git a/web-app/src/assets/i18n/zh-TW.json
b/web-app/src/assets/i18n/zh-TW.json
index c6b114c6c..22aff41aa 100644
--- a/web-app/src/assets/i18n/zh-TW.json
+++ b/web-app/src/assets/i18n/zh-TW.json
@@ -595,7 +595,7 @@
"log.manage.basic-information": "基本資訊",
"log.manage.clear": "清空",
"log.manage.chart.log-trend": "日誌趨勢",
- "log.manage.chart.severity-distribution": "嚴重程度分布",
+ "log.manage.chart.severity-distribution": "日誌等級分布",
"log.manage.chart.trace-coverage": "追蹤覆蓋率",
"log.manage.chart.trace-coverage.complete-trace-info": "完整 Trace 資訊",
"log.manage.chart.trace-coverage.with-span": "有 Span ID",
@@ -615,8 +615,8 @@
"log.manage.overview.warning-logs": "警告日誌",
"log.manage.reset-all-columns": "重設所有欄位",
"log.manage.search": "搜尋",
- "log.manage.severity-number": "嚴重程度編號",
- "log.manage.severity-text": "嚴重程度",
+ "log.manage.severity-number": "日誌等級編號",
+ "log.manage.severity-text": "日誌等級",
"log.manage.show-statistics": "顯示統計",
"log.manage.span-id": "Span ID",
"log.manage.table.column.attributes": "屬性",
@@ -625,7 +625,7 @@
"log.manage.table.column.instrumentation": "採集工具",
"log.manage.table.column.observed-time": "觀察時間",
"log.manage.table.column.resource": "來源",
- "log.manage.table.column.severity": "嚴重程度",
+ "log.manage.table.column.severity": "日誌等級",
"log.manage.table.column.span-id": "Span ID",
"log.manage.table.column.time": "時間",
"log.manage.table.column.trace-flags": "Trace 標記",
@@ -656,11 +656,11 @@
"log.stream.resource": "個來源",
"log.stream.resume": "恢復",
"log.stream.scroll-to-top": "捲動到頂部",
- "log.stream.severity": "嚴重程度:",
- "log.stream.severity-number": "嚴重程度編號:",
- "log.stream.severity-number-placeholder": "輸入嚴重程度編號",
- "log.stream.severity-text": "嚴重程度:",
- "log.stream.severity-text-placeholder": "輸入嚴重程度",
+ "log.stream.severity": "日誌等級:",
+ "log.stream.severity-number": "日誌等級編號:",
+ "log.stream.severity-number-placeholder": "輸入日誌等級編號",
+ "log.stream.severity-text": "日誌等級:",
+ "log.stream.severity-text-placeholder": "輸入日誌等級",
"log.stream.show-filters": "顯示過濾器",
"log.stream.span": "跨度:",
"log.stream.span-id": "Span ID:",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
