Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| edbaa9a257 | |||
| b2a0b66492 |
215
app.py
215
app.py
@@ -1103,7 +1103,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.2</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">
|
||||
@@ -1738,6 +1738,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 +1770,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>
|
||||
@@ -2395,21 +2426,34 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
|
||||
}
|
||||
|
||||
const resourceNames = { 'cpu': 'CPU', 'memory': '内存', 'disk': '磁盘' };
|
||||
const triggerNames = {
|
||||
'single': '一次性',
|
||||
'continuous': `连续${rule.triggerParam}次`,
|
||||
'duration': `持续${rule.triggerParam}秒`,
|
||||
'average': `平均${rule.triggerParam}次`
|
||||
};
|
||||
|
||||
list.innerHTML = rules.map(rule => `
|
||||
list.innerHTML = rules.map(rule => {
|
||||
const silentInfo = rule.silentEnabled ? `静默:${rule.silentStart}-${rule.silentEnd}` : '';
|
||||
const triggerType = rule.triggerType || 'single';
|
||||
const triggerDisplay = triggerNames[triggerType] || triggerNames['single'];
|
||||
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 +2462,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 +2478,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 +2528,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 +2547,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 +2567,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 +2597,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 {
|
||||
|
||||
BIN
logs/app.log
BIN
logs/app.log
Binary file not shown.
Reference in New Issue
Block a user