feat: 工具配置增强、站点拨测与日志中心多项改进
- 工具配置:新增卸载 API/UI、Go 工具链、流水线构建自动安装依赖 - 修复 ListTools VerifyTool 递归栈溢出导致获取工具配置失败 - Node.js Alpine 安装改用 unofficial-builds musl 预编译包与 index.json 解析 LTS - 站点拨测:详情页路由、告警自动恢复、并发拨测与默认可观测频率 - 日志中心:RBAC、查询构建器、ES/Loki 增强与审计 request/response 展示 - 发布配置:构建节点、流水线远程执行、Deploy RBAC 导航拆分
This commit is contained in:
1 parent
cde7bbe540
commit
7e1c8f583c
84 files changed
+7729
-1507
No files matched your search
@@ -0,0 +1,24 @@
|
||||
package siteprobe
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"ezops/model"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// ResolveRecoveredProbeAlerts 拨测恢复后立即关闭探测类活跃告警 // Logan.Li
|
||||
func ResolveRecoveredProbeAlerts(db *gorm.DB, taskID uint, lastResult string) {
|
||||
if lastResult != "success" {
|
||||
return
|
||||
}
|
||||
now := time.Now()
|
||||
db.Model(&model.SiteAlert{}).
|
||||
Where("task_id = ? AND status = ? AND trigger_type IN ?",
|
||||
taskID, model.SiteAlertStatusActive,
|
||||
[]string{"probe_fail", "probe_timeout", "http_status_error"}).
|
||||
Updates(map[string]interface{}{
|
||||
"status": model.SiteAlertStatusResolved, "resolved_at": now,
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package siteprobe
|
||||
|
||||
import "strings"
|
||||
|
||||
// DefaultProbeFrequency 各协议推荐默认拨测间隔(秒)// Logan.Li
|
||||
func DefaultProbeFrequency(taskType string) int {
|
||||
switch strings.ToLower(taskType) {
|
||||
case "ssl":
|
||||
return 3600 // 证书日级变化,1 小时足够
|
||||
case "dns":
|
||||
return 300 // 5 分钟
|
||||
case "tcp", "ping":
|
||||
return 120 // 2 分钟
|
||||
default:
|
||||
return 60 // HTTP 1 分钟
|
||||
}
|
||||
}
|
||||
|
||||
// MinProbeFrequency 各协议最小拨测间隔(秒),防止频率过高压垮平台 // Logan.Li
|
||||
func MinProbeFrequency(taskType string) int {
|
||||
switch strings.ToLower(taskType) {
|
||||
case "ssl":
|
||||
return 600 // 最少 10 分钟
|
||||
case "dns":
|
||||
return 60
|
||||
default:
|
||||
return 30
|
||||
}
|
||||
}
|
||||
|
||||
// NormalizeProbeFrequency 规范化拨测频率 // Logan.Li
|
||||
func NormalizeProbeFrequency(taskType string, freq int) int {
|
||||
if freq <= 0 {
|
||||
return DefaultProbeFrequency(taskType)
|
||||
}
|
||||
min := MinProbeFrequency(taskType)
|
||||
if freq < min {
|
||||
return min
|
||||
}
|
||||
return freq
|
||||
}
|
||||
@@ -67,15 +67,22 @@ func (w *Worker) runOnce() {
|
||||
var tasks []model.SiteTask
|
||||
w.db.Where("status = ?", model.SiteTaskStatusRunning).Find(&tasks)
|
||||
now := time.Now()
|
||||
sem := make(chan struct{}, 8) // 最多 8 路并发拨测,避免串行阻塞 // Logan.Li
|
||||
var wg sync.WaitGroup
|
||||
for _, task := range tasks {
|
||||
if task.Frequency <= 0 {
|
||||
task.Frequency = 60
|
||||
}
|
||||
task.Frequency = NormalizeProbeFrequency(string(task.TaskType), task.Frequency)
|
||||
if task.LastCheckAt != nil && now.Sub(*task.LastCheckAt) < time.Duration(task.Frequency)*time.Second {
|
||||
continue
|
||||
}
|
||||
w.probeTask(task)
|
||||
wg.Add(1)
|
||||
go func(t model.SiteTask) {
|
||||
defer wg.Done()
|
||||
sem <- struct{}{}
|
||||
defer func() { <-sem }()
|
||||
w.probeTask(t)
|
||||
}(task)
|
||||
}
|
||||
wg.Wait()
|
||||
}
|
||||
|
||||
func (w *Worker) probeTask(task model.SiteTask) {
|
||||
@@ -110,9 +117,11 @@ func (w *Worker) probeTask(task model.SiteTask) {
|
||||
avg = (task.AvgResponse + outcome.ResponseTime) / 2
|
||||
}
|
||||
w.db.Model(&model.SiteTask{}).Where("id = ?", task.ID).Updates(map[string]interface{}{
|
||||
"task_type": task.TaskType,
|
||||
"last_result": lastResult,
|
||||
"task_type": task.TaskType,
|
||||
"last_result": lastResult,
|
||||
"last_check_at": now,
|
||||
"avg_response": avg,
|
||||
"avg_response": avg,
|
||||
})
|
||||
// 拨测恢复后即时关闭探测类告警,与统计栏 down_count 同步 // Logan.Li
|
||||
ResolveRecoveredProbeAlerts(w.db, task.ID, lastResult)
|
||||
}
|
||||
Reference in new issue
Block a user