6 Commits

Author SHA1 Message Date
cd5bdb5938 fix: 修复内存使用率图标不显示问题
- ri-memory-card-line 不是有效的 Remix Icon
- 替换为 ri-database-2-line 图标
2026-04-24 10:42:29 +08:00
69ade8dcbb feat: 进程列表显示开关(默认不显示) 2026-04-24 00:20:20 +08:00
7926a5b51f feat: 实时监控显示CPU占用最高的进程列表 2026-04-23 23:58:38 +08:00
26e0ed26e1 fix: renderEmailRules函数语法错误修复 2026-04-23 23:40:55 +08:00
edbaa9a257 feat: 邮件通知规则多种触发机制 2026-04-23 23:33:35 +08:00
b2a0b66492 feat: 邮件通知规则添加静默时间区间 2026-04-23 23:26:36 +08:00
2 changed files with 357 additions and 10 deletions

367
app.py
View File

@@ -799,6 +799,58 @@ def api_system_stats():
return jsonify({'error': str(e), 'available': False})
@app.route('/api/system/processes')
def api_system_processes():
"""获取CPU占用最高的进程列表"""
if not HAS_PSUTIL:
return jsonify({'error': 'psutil未安装', 'available': False})
try:
limit = int(request.args.get('limit', 10))
limit = max(1, min(50, limit)) # 限制1-50
processes = []
for proc in psutil.process_iter(['pid', 'name', 'memory_percent', 'status', 'create_time', 'exe', 'cmdline']):
try:
pinfo = proc.info
# 获取实时CPU占用需要单独调用
cpu_percent = proc.cpu_percent(interval=0.1)
# 格式化命令行
cmdline = pinfo.get('cmdline', [])
cmdline_str = ' '.join(cmdline) if cmdline else pinfo['name']
if len(cmdline_str) > 60:
cmdline_str = cmdline_str[:60] + '...'
# 启动时间
create_time = datetime.fromtimestamp(pinfo['create_time']).strftime('%m-%d %H:%M')
processes.append({
'pid': pinfo['pid'],
'name': pinfo['name'],
'cpu': cpu_percent,
'memory': pinfo['memory_percent'] or 0,
'status': pinfo['status'],
'create_time': create_time,
'exe': pinfo.get('exe', '') or '',
'cmdline': cmdline_str
})
except (psutil.NoSuchProcess, psutil.AccessDenied):
continue
# 按CPU占用排序取前N个
processes.sort(key=lambda x: x['cpu'], reverse=True)
top_processes = processes[:limit]
return jsonify({
'available': True,
'processes': top_processes,
'count': len(top_processes)
})
except Exception as e:
return jsonify({'error': str(e), 'available': False})
def guess_cron_name(command):
"""从命令推断任务名称"""
keywords = {
@@ -1103,7 +1155,7 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>项目服务管理面板 v3.0</title>
<title>项目服务管理面板 v3.3.1</title>
<link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'><text y='.9em' font-size='90'>📊</text></svg>">
<script src="https://cdn.tailwindcss.com"></script>
<link href="https://cdn.jsdelivr.net/npm/remixicon@3.5.0/fonts/remixicon.css" rel="stylesheet">
@@ -1394,7 +1446,7 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
</div>
<div class="threshold-item">
<div class="threshold-label">
<i class="ri-memory-card-line threshold-icon text-green-400"></i>
<i class="ri-database-2-line threshold-icon text-green-400"></i>
<span class="text-gray-300 text-sm">内存使用率</span>
</div>
<div class="flex items-center gap-2">
@@ -1464,6 +1516,32 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
</select>
<span id="realtimeIndicator" class="text-xs text-green-400 ml-1 hidden">●</span>
</div>
<div class="flex items-center gap-2 ml-4">
<input type="checkbox" id="showProcessListCheck" class="w-4 h-4 cursor-pointer" onchange="toggleProcessList()">
<label for="showProcessListCheck" class="text-gray-300 text-xs cursor-pointer">显示进程列表</label>
</div>
</div>
<!-- 进程列表(实时监控时显示) -->
<div id="processListSection" class="hidden mt-6">
<div class="flex items-center justify-between mb-3">
<h3 class="font-bold text-gray-200 flex items-center gap-2">
<i class="ri-bar-chart-horizontal text-purple-400"></i> CPU占用最高的进程
</h3>
<div class="flex items-center gap-2">
<span class="text-gray-400 text-xs">显示数量:</span>
<select id="processLimitSelect" class="bg-gray-700 text-gray-200 px-2 py-1 rounded text-xs" onchange="loadTopProcesses()">
<option value="5">5</option>
<option value="10" selected>10</option>
<option value="15">15</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
</div>
</div>
<div id="processList" class="space-y-2">
<div class="text-gray-500 text-center py-4"><i class="ri-loader-4-line animate-spin"></i> 加载中...</div>
</div>
</div>
</div>
@@ -1738,6 +1816,25 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
</div>
</div>
<div class="mb-3">
<label class="block text-gray-400 text-sm mb-1">触发机制 *</label>
<select id="emailRuleTriggerType" class="w-full bg-gray-700 text-gray-200 px-3 py-2 rounded-lg" onchange="updateTriggerParams()">
<option value="single">一次性触发 - 超过阈值立即通知</option>
<option value="continuous">连续触发 - 连续超过阈值N次</option>
<option value="duration">持续时间触发 - 累计超过阈值N秒</option>
<option value="average">平均值触发 - 最近N次平均值超过阈值</option>
</select>
</div>
<div class="mb-3" id="triggerParamsDiv" style="display:none;">
<label class="block text-gray-400 text-sm mb-1" id="triggerParamsLabel">触发参数</label>
<div class="flex items-center gap-2">
<input type="number" id="emailRuleTriggerParam" min="1" max="100" value="3" class="w-20 bg-gray-700 text-gray-200 px-3 py-2 rounded-lg">
<span class="text-gray-400" id="triggerParamUnit">次</span>
</div>
<p class="text-gray-500 text-xs mt-1" id="triggerParamHint">连续超过阈值多少次才触发</p>
</div>
<div class="mb-3">
<label class="block text-gray-400 text-sm mb-1">收件邮箱 *</label>
<input type="email" id="emailRuleAddress" required class="w-full bg-gray-700 text-gray-200 px-3 py-2 rounded-lg" placeholder="alert@example.com">
@@ -1751,6 +1848,18 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
</div>
</div>
<div class="mb-3">
<label class="block text-gray-400 text-sm mb-1">静默时间区间</label>
<p class="text-gray-500 text-xs mb-2">在此时间段内不发送邮件通知(如夜间休息时段)</p>
<div class="flex items-center gap-2">
<input type="time" id="emailRuleSilentStart" class="bg-gray-700 text-gray-200 px-3 py-2 rounded-lg" value="23:00">
<span class="text-gray-400">至</span>
<input type="time" id="emailRuleSilentEnd" class="bg-gray-700 text-gray-200 px-3 py-2 rounded-lg" value="08:00">
<input type="checkbox" id="emailRuleSilentEnabled" class="w-4 h-4 cursor-pointer ml-2">
<label for="emailRuleSilentEnabled" class="text-gray-300 text-xs cursor-pointer">启用静默</label>
</div>
</div>
<div class="mb-3 flex items-center gap-2">
<input type="checkbox" id="emailRuleEnabled" checked class="w-4 h-4 cursor-pointer">
<label for="emailRuleEnabled" class="text-gray-300 text-sm cursor-pointer">启用此规则</label>
@@ -1803,8 +1912,10 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
clearInterval(realtimeTimer);
realtimeTimer = null;
document.getElementById('realtimeCheck').checked = false;
document.getElementById('showProcessListCheck').checked = false;
document.getElementById('realtimeToggle').classList.remove('active');
document.getElementById('realtimeIndicator').classList.add('hidden');
document.getElementById('processListSection').classList.add('hidden');
}
if (tab === 'cron') {
@@ -2028,11 +2139,63 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
// 检查阈值
checkThresholds(data);
// 如果实时监控和进程列表都开启,加载进程列表
if (document.getElementById('realtimeCheck').checked && document.getElementById('showProcessListCheck').checked) {
loadTopProcesses();
}
} catch (e) {
console.error('系统资源加载失败:', e);
}
}
// 加载CPU占用最高的进程
async function loadTopProcesses() {
try {
const limit = document.getElementById('processLimitSelect').value;
const res = await fetch(`/api/system/processes?limit=${limit}`);
const data = await res.json();
if (!data.available) {
document.getElementById('processList').innerHTML = '<div class="text-red-400 text-center py-4">无法获取进程信息</div>';
return;
}
const list = document.getElementById('processList');
if (data.processes.length === 0) {
list.innerHTML = '<div class="text-gray-500 text-center py-4">暂无进程数据</div>';
return;
}
list.innerHTML = data.processes.map(proc => `
<div class="card rounded-lg p-3 hover:border-gray-500 transition-colors">
<div class="flex items-center justify-between">
<div class="flex items-center gap-3 min-w-0">
<span class="text-purple-400 font-mono text-sm">${proc.pid}</span>
<div class="min-w-0 flex-1">
<div class="text-gray-200 truncate">${proc.name}</div>
<div class="text-gray-500 text-xs truncate">${proc.cmdline || proc.exe}</div>
</div>
</div>
<div class="flex items-center gap-4 text-xs shrink-0">
<div class="text-right">
<span class="text-blue-400 font-bold">${proc.cpu.toFixed(1)}%</span>
<span class="text-gray-500 ml-1">CPU</span>
</div>
<div class="text-right">
<span class="text-green-400 font-bold">${proc.memory.toFixed(1)}%</span>
<span class="text-gray-500 ml-1">内存</span>
</div>
<div class="text-gray-400">${proc.create_time}</div>
</div>
</div>
</div>
`).join('');
} catch (e) {
console.error('进程列表加载失败:', e);
}
}
function toggleRealtime() {
const checked = document.getElementById('realtimeCheck').checked;
const toggle = document.getElementById('realtimeToggle');
@@ -2045,9 +2208,15 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
loadSystemStats();
// 启动定时器
realtimeTimer = setInterval(loadSystemStats, realtimeInterval * 1000);
// 如果进程列表开关也开启,则显示并加载
if (document.getElementById('showProcessListCheck').checked) {
document.getElementById('processListSection').classList.remove('hidden');
loadTopProcesses();
}
} else {
toggle.classList.remove('active');
indicator.classList.add('hidden');
document.getElementById('processListSection').classList.add('hidden');
// 停止定时器
if (realtimeTimer) {
clearInterval(realtimeTimer);
@@ -2055,6 +2224,19 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
}
}
}
function toggleProcessList() {
const checked = document.getElementById('showProcessListCheck').checked;
const realtimeChecked = document.getElementById('realtimeCheck').checked;
const processSection = document.getElementById('processListSection');
if (checked && realtimeChecked) {
processSection.classList.remove('hidden');
loadTopProcesses();
} else {
processSection.classList.add('hidden');
}
}
// IP 保存
function saveExternalIp() {
@@ -2396,20 +2578,32 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
const resourceNames = { 'cpu': 'CPU', 'memory': '内存', 'disk': '磁盘' };
list.innerHTML = rules.map(rule => `
list.innerHTML = rules.map(rule => {
const silentInfo = rule.silentEnabled ? `静默:${rule.silentStart}-${rule.silentEnd}` : '';
const triggerType = rule.triggerType || 'single';
const triggerParam = rule.triggerParam || 3;
let triggerDisplay = '一次性';
if (triggerType === 'continuous') triggerDisplay = `连续${triggerParam}次`;
else if (triggerType === 'duration') triggerDisplay = `持续${triggerParam}秒`;
else if (triggerType === 'average') triggerDisplay = `平均${triggerParam}次`;
return `
<div class="flex items-center justify-between bg-gray-700/50 px-3 py-2 rounded-lg">
<div class="flex items-center gap-3">
<div class="flex items-center gap-3 flex-wrap">
<span class="px-2 py-0.5 rounded text-xs ${rule.enabled ? 'bg-green-500/20 text-green-400' : 'bg-gray-500/20 text-gray-400'}">${rule.enabled ? '启用' : '禁用'}</span>
<span class="text-gray-200">${rule.name}</span>
<span class="text-gray-400 text-xs">${resourceNames[rule.resource]} ≥ ${rule.threshold}%</span>
<span class="text-blue-400/70 text-xs"><i class="ri-flashlight-line"></i> ${triggerDisplay}</span>
<span class="text-gray-400 text-xs">→ ${rule.email}</span>
${silentInfo ? `<span class="text-yellow-400/70 text-xs"><i class="ri-moon-line"></i> ${silentInfo}</span>` : ''}
</div>
<div class="flex items-center gap-1">
<button onclick="editEmailRule('${rule.id}')" class="text-blue-400 hover:text-blue-300 px-1" title="编辑"><i class="ri-edit-line"></i></button>
<button onclick="deleteEmailRule('${rule.id}')" class="text-red-400 hover:text-red-300 px-1" title="删除"><i class="ri-delete-bin-line"></i></button>
</div>
</div>
`).join('');
`;
}).join('');
}
function showAddEmailRuleModal() {
@@ -2418,8 +2612,14 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
document.getElementById('emailRuleName').value = '';
document.getElementById('emailRuleResource').value = 'cpu';
document.getElementById('emailRuleThreshold').value = 80;
document.getElementById('emailRuleTriggerType').value = 'single';
document.getElementById('emailRuleTriggerParam').value = 3;
document.getElementById('triggerParamsDiv').style.display = 'none';
document.getElementById('emailRuleAddress').value = '';
document.getElementById('emailRuleInterval').value = 300;
document.getElementById('emailRuleSilentStart').value = '23:00';
document.getElementById('emailRuleSilentEnd').value = '08:00';
document.getElementById('emailRuleSilentEnabled').checked = false;
document.getElementById('emailRuleEnabled').checked = true;
document.getElementById('emailRuleModal').classList.remove('hidden');
}
@@ -2428,6 +2628,46 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
document.getElementById('emailRuleModal').classList.add('hidden');
}
function updateTriggerParams() {
const triggerType = document.getElementById('emailRuleTriggerType').value;
const paramsDiv = document.getElementById('triggerParamsDiv');
const labelEl = document.getElementById('triggerParamsLabel');
const unitEl = document.getElementById('triggerParamUnit');
const hintEl = document.getElementById('triggerParamHint');
const paramInput = document.getElementById('emailRuleTriggerParam');
// 根据触发类型设置不同的参数
switch (triggerType) {
case 'single':
paramsDiv.style.display = 'none';
break;
case 'continuous':
paramsDiv.style.display = 'flex';
labelEl.textContent = '连续次数';
unitEl.textContent = '';
hintEl.textContent = '连续超过阈值多少次才触发';
paramInput.max = 100;
paramInput.value = 3;
break;
case 'duration':
paramsDiv.style.display = 'flex';
labelEl.textContent = '持续时间';
unitEl.textContent = '';
hintEl.textContent = '累计超过阈值多少秒才触发';
paramInput.max = 3600;
paramInput.value = 60;
break;
case 'average':
paramsDiv.style.display = 'flex';
labelEl.textContent = '采样次数';
unitEl.textContent = '';
hintEl.textContent = '最近N次采样的平均值超过阈值才触发';
paramInput.max = 100;
paramInput.value = 5;
break;
}
}
function editEmailRule(ruleId) {
const rules = getEmailRules();
const rule = rules.find(r => r.id === ruleId);
@@ -2438,8 +2678,14 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
document.getElementById('emailRuleName').value = rule.name;
document.getElementById('emailRuleResource').value = rule.resource;
document.getElementById('emailRuleThreshold').value = rule.threshold;
document.getElementById('emailRuleTriggerType').value = rule.triggerType || 'single';
document.getElementById('emailRuleTriggerParam').value = rule.triggerParam || 3;
updateTriggerParams();
document.getElementById('emailRuleAddress').value = rule.email;
document.getElementById('emailRuleInterval').value = rule.interval;
document.getElementById('emailRuleSilentStart').value = rule.silentStart || '23:00';
document.getElementById('emailRuleSilentEnd').value = rule.silentEnd || '08:00';
document.getElementById('emailRuleSilentEnabled').checked = rule.silentEnabled || false;
document.getElementById('emailRuleEnabled').checked = rule.enabled;
document.getElementById('emailRuleModal').classList.remove('hidden');
}
@@ -2451,8 +2697,13 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
const name = document.getElementById('emailRuleName').value.trim();
const resource = document.getElementById('emailRuleResource').value;
const threshold = parseInt(document.getElementById('emailRuleThreshold').value);
const triggerType = document.getElementById('emailRuleTriggerType').value;
const triggerParam = parseInt(document.getElementById('emailRuleTriggerParam').value) || 3;
const email = document.getElementById('emailRuleAddress').value.trim();
const interval = parseInt(document.getElementById('emailRuleInterval').value) || 300;
const silentStart = document.getElementById('emailRuleSilentStart').value;
const silentEnd = document.getElementById('emailRuleSilentEnd').value;
const silentEnabled = document.getElementById('emailRuleSilentEnabled').checked;
const enabled = document.getElementById('emailRuleEnabled').checked;
if (!name || !email) {
@@ -2466,14 +2717,17 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
// 编辑
const idx = rules.findIndex(r => r.id === ruleId);
if (idx >= 0) {
rules[idx] = { ...rules[idx], name, resource, threshold, email, interval, enabled };
rules[idx] = { ...rules[idx], name, resource, threshold, triggerType, triggerParam, email, interval, silentStart, silentEnd, silentEnabled, enabled };
}
} else {
// 新增
rules.push({
id: 'rule_' + Date.now(),
name, resource, threshold, email, interval, enabled,
lastSent: 0
name, resource, threshold, triggerType, triggerParam, email, interval, silentStart, silentEnd, silentEnabled, enabled,
lastSent: 0,
exceedCount: 0, // 连续超过次数
exceedDuration: 0, // 累计超过时间
recentValues: [] // 最近采样值
});
}
@@ -2493,14 +2747,107 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
async function checkEmailRules(data) {
const rules = getEmailRules().filter(r => r.enabled);
const now = Date.now();
const nowTime = new Date();
const currentHour = nowTime.getHours();
const currentMin = nowTime.getMinutes();
const currentTimeStr = `${currentHour.toString().padStart(2, '0')}:${currentMin.toString().padStart(2, '0')}`;
for (const rule of rules) {
// 检查间隔
if (now - rule.lastSent < rule.interval * 1000) continue;
// 检查阈值
// 检查静默时间
if (rule.silentEnabled && rule.silentStart && rule.silentEnd) {
const start = rule.silentStart;
const end = rule.silentEnd;
// 处理跨越午夜的情况如23:00到08:00
let inSilentPeriod = false;
if (start > end) {
// 跨越午夜如23:00-08:00则currentTime >= start 或 currentTime < end 都在静默区间
inSilentPeriod = (currentTimeStr >= start || currentTimeStr < end);
} else {
// 同一天内如01:00-06:00
inSilentPeriod = (currentTimeStr >= start && currentTimeStr < end);
}
if (inSilentPeriod) {
console.log(`规则 ${rule.name} 当前在静默时间段 ${start}-${end},跳过发送`);
continue;
}
}
// 检查阈值和触发机制
const value = data[rule.resource]?.percent;
if (value === undefined || value < rule.threshold) continue;
if (value === undefined) continue;
// 初始化触发相关数据
if (!rule.exceedCount) rule.exceedCount = 0;
if (!rule.exceedDuration) rule.exceedDuration = 0;
if (!rule.recentValues) rule.recentValues = [];
if (!rule.triggerType) rule.triggerType = 'single';
if (!rule.triggerParam) rule.triggerParam = 3;
const triggerType = rule.triggerType;
const triggerParam = rule.triggerParam;
const isExceedThreshold = value >= rule.threshold;
let shouldTrigger = false;
// 根据触发类型判断
switch (triggerType) {
case 'single':
// 一次性触发:超过阈值立即触发
if (isExceedThreshold) shouldTrigger = true;
break;
case 'continuous':
// 连续触发连续超过阈值N次
if (isExceedThreshold) {
rule.exceedCount++;
if (rule.exceedCount >= triggerParam) {
shouldTrigger = true;
rule.exceedCount = 0; // 触发后重置计数
}
} else {
rule.exceedCount = 0; // 未超过阈值时重置计数
}
break;
case 'duration':
// 持续时间触发累计超过阈值N秒
if (isExceedThreshold) {
// 增加累计时间假设实时监控间隔为2秒
const intervalSeconds = realtimeInterval || 2;
rule.exceedDuration += intervalSeconds;
if (rule.exceedDuration >= triggerParam) {
shouldTrigger = true;
rule.exceedDuration = 0; // 触发后重置
}
} else {
rule.exceedDuration = 0; // 未超过阈值时重置累计时间
}
break;
case 'average':
// 平均值触发最近N次平均值超过阈值
rule.recentValues.push(value);
if (rule.recentValues.length > triggerParam) {
rule.recentValues.shift(); // 保持最近N个值
}
if (rule.recentValues.length >= triggerParam) {
const avg = rule.recentValues.reduce((a, b) => a + b, 0) / rule.recentValues.length;
if (avg >= rule.threshold) {
shouldTrigger = true;
}
}
break;
}
// 保存更新的规则数据
saveEmailRules(getEmailRules().map(r => r.id === rule.id ? rule : r));
if (!shouldTrigger) continue;
// 发送邮件
try {

Binary file not shown.