perf: 修复 Agent 校验 CPU 热点并实现指标分层聚合与频率下发
CPU 根因:每个 Agent 请求都做一次 bcrypt 校验(实测 72ms), 30 台主机 18 req/s × 72ms ≈ 1.35 核,实测容器 CPU 135%。 - agentauth: 校验结果按 Token 哈希缓存(TTL 5min,轮换即失效), last_used_at 写入按 60s 节流。实测 CPU 135% → 1.6%,请求延迟 103ms → 1.6ms - metricagg: 新增后台逐级降采样聚合 raw→1m/5m→1h→6h/1d,取代前端手动触发 - metrics_aggregate: 补 uniq_metric_agg 唯一索引(原 idx_agg 非唯一导致 upsert 插重复行) - agent 合并配置接口 GET /agent/config:一次返回任务+探针+端口策略+频率, 配置轮询 5s→30s;服务端可下发 report_interval,Agent 热更新 ticker 无需重装 - retention: agent_reports 保留期 7d→1d(趋势由聚合表承担) - redis: 增加 maxmemory 512mb + volatile-lru - fix(upgrade): 升级脚本改为 fail-fast,修复下载失败仍报 UPGRADE_OK 的静默谎报 // Logan.Li
This commit is contained in:
1 parent
93abf81e40
commit
59320aa410
23 files changed
+902
-29
No files matched your search
@@ -0,0 +1,12 @@
|
||||
-- 指标聚合表唯一约束:GORM 的 ON CONFLICT upsert 需要唯一索引才能真正生效,
|
||||
-- 否则每次聚合都会插入重复行(原 idx_agg 为非唯一索引)。 // Logan.Li
|
||||
-- 先按 (hostname, metric, interval, bucket_time) 去重,仅保留最大 id。 // Logan.Li
|
||||
DELETE a FROM monitor_metric_aggregates a
|
||||
JOIN monitor_metric_aggregates b
|
||||
ON a.hostname = b.hostname
|
||||
AND a.metric = b.metric
|
||||
AND a.`interval` = b.`interval`
|
||||
AND a.bucket_time = b.bucket_time
|
||||
AND a.id < b.id;
|
||||
|
||||
CREATE UNIQUE INDEX uniq_metric_agg ON monitor_metric_aggregates (hostname, metric, `interval`, bucket_time);
|
||||
@@ -0,0 +1,10 @@
|
||||
-- 指标聚合表唯一约束:GORM 的 ON CONFLICT upsert 需要唯一索引才能真正生效。 // Logan.Li
|
||||
DELETE FROM monitor_metric_aggregates a
|
||||
USING monitor_metric_aggregates b
|
||||
WHERE a.hostname = b.hostname
|
||||
AND a.metric = b.metric
|
||||
AND a.interval = b.interval
|
||||
AND a.bucket_time = b.bucket_time
|
||||
AND a.id < b.id;
|
||||
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS uniq_metric_agg ON monitor_metric_aggregates (hostname, metric, interval, bucket_time);
|
||||
@@ -0,0 +1,8 @@
|
||||
-- 指标聚合表唯一约束:GORM 的 ON CONFLICT upsert 需要唯一索引才能真正生效。 // Logan.Li
|
||||
DELETE FROM monitor_metric_aggregates
|
||||
WHERE id NOT IN (
|
||||
SELECT MAX(id) FROM monitor_metric_aggregates
|
||||
GROUP BY hostname, metric, "interval", bucket_time
|
||||
);
|
||||
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS uniq_metric_agg ON monitor_metric_aggregates (hostname, metric, "interval", bucket_time);
|
||||
@@ -0,0 +1,12 @@
|
||||
-- Agent 采集策略:hostname 为空串代表全局默认,非空为按主机覆盖。
|
||||
-- 平台可通过此表下发 report_interval / config_poll_interval,Agent 热更新无需重装。 // Logan.Li
|
||||
CREATE TABLE IF NOT EXISTS monitor_agent_settings (
|
||||
id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
hostname VARCHAR(255) NOT NULL DEFAULT '',
|
||||
report_interval INT NOT NULL DEFAULT 10,
|
||||
config_poll_interval INT NOT NULL DEFAULT 30,
|
||||
updated_by VARCHAR(128) NOT NULL DEFAULT '',
|
||||
created_at DATETIME NOT NULL,
|
||||
updated_at DATETIME NOT NULL,
|
||||
UNIQUE KEY uniq_agent_settings_hostname (hostname)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
@@ -0,0 +1,11 @@
|
||||
-- Agent 采集策略:hostname 为空串代表全局默认,非空为按主机覆盖。 // Logan.Li
|
||||
CREATE TABLE IF NOT EXISTS monitor_agent_settings (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
hostname VARCHAR(255) NOT NULL DEFAULT '',
|
||||
report_interval INT NOT NULL DEFAULT 10,
|
||||
config_poll_interval INT NOT NULL DEFAULT 30,
|
||||
updated_by VARCHAR(128) NOT NULL DEFAULT '',
|
||||
created_at TIMESTAMP NOT NULL,
|
||||
updated_at TIMESTAMP NOT NULL,
|
||||
CONSTRAINT uniq_agent_settings_hostname UNIQUE (hostname)
|
||||
);
|
||||
@@ -0,0 +1,12 @@
|
||||
-- Agent 采集策略:hostname 为空串代表全局默认,非空为按主机覆盖。 // Logan.Li
|
||||
CREATE TABLE IF NOT EXISTS monitor_agent_settings (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
hostname VARCHAR(255) NOT NULL DEFAULT '',
|
||||
report_interval INTEGER NOT NULL DEFAULT 10,
|
||||
config_poll_interval INTEGER NOT NULL DEFAULT 30,
|
||||
updated_by VARCHAR(128) NOT NULL DEFAULT '',
|
||||
created_at DATETIME NOT NULL,
|
||||
updated_at DATETIME NOT NULL
|
||||
);
|
||||
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS uniq_agent_settings_hostname ON monitor_agent_settings (hostname);
|
||||
@@ -66,6 +66,20 @@ func All() []Migration {
|
||||
return executeDialectSQL(db, "0003_billing_settings")
|
||||
},
|
||||
},
|
||||
{
|
||||
Version: "0004_metric_aggregate_unique",
|
||||
Description: "指标聚合表唯一约束(upsert 生效)",
|
||||
Apply: func(db *gorm.DB) error {
|
||||
return executeDialectSQL(db, "0004_metric_aggregate_unique")
|
||||
},
|
||||
},
|
||||
{
|
||||
Version: "0005_agent_settings",
|
||||
Description: "Agent 采集策略(可下发频率)",
|
||||
Apply: func(db *gorm.DB) error {
|
||||
return executeDialectSQL(db, "0005_agent_settings")
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user