Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 78a4a3f1aa | |||
| 27a84de317 |
2
app.py
2
app.py
@@ -13,6 +13,7 @@ from routes_system import register_system_routes
|
||||
from routes_config import register_config_routes
|
||||
from routes_email import register_email_routes
|
||||
from routes_project import register_project_routes
|
||||
from routes_docker import register_docker_routes
|
||||
from templates import get_html_template
|
||||
|
||||
|
||||
@@ -31,6 +32,7 @@ def init_app():
|
||||
register_config_routes(app)
|
||||
register_email_routes(app)
|
||||
register_project_routes(app)
|
||||
register_docker_routes(app)
|
||||
|
||||
# 主页路由
|
||||
@app.route('/')
|
||||
|
||||
243
routes_docker.py
Normal file
243
routes_docker.py
Normal file
@@ -0,0 +1,243 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Docker 监控 API 路由
|
||||
"""
|
||||
|
||||
import subprocess
|
||||
import json
|
||||
from flask import jsonify, request
|
||||
from utils import log_message
|
||||
|
||||
|
||||
def _run_docker(cmd, timeout=10):
|
||||
"""执行 docker 命令并返回解析结果"""
|
||||
try:
|
||||
result = subprocess.run(cmd, capture_output=True, text=True, timeout=timeout)
|
||||
if result.returncode != 0:
|
||||
return None, result.stderr.strip()
|
||||
return result.stdout.strip(), None
|
||||
except subprocess.TimeoutExpired:
|
||||
return None, '命令超时'
|
||||
except FileNotFoundError:
|
||||
return None, 'Docker 未安装'
|
||||
except Exception as e:
|
||||
return None, str(e)
|
||||
|
||||
|
||||
def register_docker_routes(app):
|
||||
"""注册 Docker 监控相关路由"""
|
||||
|
||||
@app.route('/api/docker/containers')
|
||||
def api_docker_containers():
|
||||
"""获取所有容器列表(含资源使用)"""
|
||||
# 获取容器列表
|
||||
fmt = '{{.ID}}|{{.Names}}|{{.Image}}|{{.State}}|{{.Status}}|{{.Ports}}|{{.CreatedAt}}|{{.RunningFor}}'
|
||||
out, err = _run_docker(['docker', 'ps', '-a', '--format', fmt, '--no-trunc'])
|
||||
if out is None:
|
||||
return jsonify({'error': err, 'containers': []})
|
||||
|
||||
containers = []
|
||||
for line in out.split('\n'):
|
||||
if not line.strip():
|
||||
continue
|
||||
parts = line.split('|')
|
||||
if len(parts) < 8:
|
||||
continue
|
||||
cid = parts[0][:12] # 缩短ID
|
||||
containers.append({
|
||||
'id': cid,
|
||||
'name': parts[1],
|
||||
'image': parts[2],
|
||||
'state': parts[3],
|
||||
'status': parts[4],
|
||||
'ports': parts[5],
|
||||
'created': parts[6],
|
||||
'runningFor': parts[7]
|
||||
})
|
||||
|
||||
# 批量获取运行中容器的stats
|
||||
running = [c for c in containers if c['state'] == 'running']
|
||||
if running:
|
||||
try:
|
||||
stats_out, _ = _run_docker([
|
||||
'docker', 'stats', '--no-stream', '--no-trunc',
|
||||
'--format', '{{.Name}}|{{.CPUPerc}}|{{.MemPerc}}|{{.MemUsage}}|{{.NetIO}}|{{.BlockIO}}|{{.PIDs}}'
|
||||
], timeout=15)
|
||||
if stats_out:
|
||||
stats_map = {}
|
||||
for line in stats_out.split('\n'):
|
||||
if not line.strip():
|
||||
continue
|
||||
sp = line.split('|')
|
||||
if len(sp) >= 7:
|
||||
stats_map[sp[0]] = {
|
||||
'cpuPercent': sp[1],
|
||||
'memPercent': sp[2],
|
||||
'memUsage': sp[3],
|
||||
'netIO': sp[4],
|
||||
'blockIO': sp[5],
|
||||
'pids': sp[6]
|
||||
}
|
||||
for c in containers:
|
||||
if c['name'] in stats_map:
|
||||
c['stats'] = stats_map[c['name']]
|
||||
except:
|
||||
pass
|
||||
|
||||
return jsonify({'containers': containers})
|
||||
|
||||
@app.route('/api/docker/container/<container_id>/stats')
|
||||
def api_docker_container_stats(container_id):
|
||||
"""获取单个容器实时资源统计"""
|
||||
out, err = _run_docker([
|
||||
'docker', 'stats', '--no-stream', '--no-trunc',
|
||||
'--format', '{{.CPUPerc}}|{{.MemPerc}}|{{.MemUsage}}|{{.NetIO}}|{{.BlockIO}}|{{.PIDs}}',
|
||||
container_id
|
||||
], timeout=10)
|
||||
if out is None:
|
||||
return jsonify({'error': err}), 500
|
||||
if not out:
|
||||
return jsonify({'error': '容器不存在或未运行'}), 404
|
||||
|
||||
parts = out.split('|')
|
||||
return jsonify({
|
||||
'cpuPercent': parts[0] if len(parts) > 0 else '0%',
|
||||
'memPercent': parts[1] if len(parts) > 1 else '0%',
|
||||
'memUsage': parts[2] if len(parts) > 2 else '',
|
||||
'netIO': parts[3] if len(parts) > 3 else '',
|
||||
'blockIO': parts[4] if len(parts) > 4 else '',
|
||||
'pids': parts[5] if len(parts) > 5 else '0'
|
||||
})
|
||||
|
||||
@app.route('/api/docker/images')
|
||||
def api_docker_images():
|
||||
"""获取所有镜像列表"""
|
||||
fmt = '{{.Repository}}|{{.Tag}}|{{.ID}}|{{.Size}}|{{.CreatedAt}}|{{.Containers}}'
|
||||
out, err = _run_docker(['docker', 'images', '--format', fmt, '--no-trunc'])
|
||||
if out is None:
|
||||
return jsonify({'error': err, 'images': []})
|
||||
|
||||
images = []
|
||||
for line in out.split('\n'):
|
||||
if not line.strip():
|
||||
continue
|
||||
parts = line.split('|')
|
||||
if len(parts) < 6:
|
||||
continue
|
||||
repo = parts[0] if parts[0] != '<none>' else ''
|
||||
tag = parts[1] if parts[1] != '<none>' else ''
|
||||
images.append({
|
||||
'repository': repo,
|
||||
'tag': tag,
|
||||
'id': parts[2][:12],
|
||||
'size': parts[3],
|
||||
'created': parts[4],
|
||||
'containers': parts[5],
|
||||
'dangling': not repo and not tag
|
||||
})
|
||||
|
||||
return jsonify({'images': images})
|
||||
|
||||
@app.route('/api/docker/system')
|
||||
def api_docker_system():
|
||||
"""获取 Docker 系统信息"""
|
||||
# 版本信息
|
||||
ver_out, _ = _run_docker(['docker', 'version', '--format', '{{.Server.Version}}|{{.Server.Os}}|{{.Server.Arch}}'], timeout=5)
|
||||
|
||||
# 磁盘使用
|
||||
df_out, _ = _run_docker(['docker', 'system', 'df', '--format', '{{.Type}}|{{.TotalCount}}|{{.Active}}|{{.Size}}|{{.Reclaimable}}'], timeout=10)
|
||||
|
||||
system_info = {
|
||||
'version': '',
|
||||
'os': '',
|
||||
'arch': '',
|
||||
'diskUsage': []
|
||||
}
|
||||
|
||||
if ver_out:
|
||||
ver_parts = ver_out.split('|')
|
||||
if len(ver_parts) >= 3:
|
||||
system_info.update({
|
||||
'version': ver_parts[0],
|
||||
'os': ver_parts[1],
|
||||
'arch': ver_parts[2]
|
||||
})
|
||||
|
||||
if df_out:
|
||||
for line in df_out.split('\n'):
|
||||
if not line.strip():
|
||||
continue
|
||||
parts = line.split('|')
|
||||
if len(parts) >= 5:
|
||||
system_info['diskUsage'].append({
|
||||
'type': parts[0],
|
||||
'total': parts[1],
|
||||
'active': parts[2],
|
||||
'size': parts[3],
|
||||
'reclaimable': parts[4]
|
||||
})
|
||||
|
||||
return jsonify(system_info)
|
||||
|
||||
@app.route('/api/docker/container/<container_id>/logs')
|
||||
def api_docker_container_logs(container_id):
|
||||
"""获取容器日志(最近200行)"""
|
||||
lines = int(request.args.get('lines', 200))
|
||||
lines = max(10, min(1000, lines))
|
||||
|
||||
out, err = _run_docker(['docker', 'logs', '--tail', str(lines), container_id], timeout=10)
|
||||
if out is None:
|
||||
return jsonify({'error': err}), 500
|
||||
|
||||
return jsonify({'logs': out, 'lines': lines})
|
||||
|
||||
@app.route('/api/docker/container/<container_id>/start', methods=['POST'])
|
||||
def api_docker_container_start(container_id):
|
||||
"""启动容器"""
|
||||
out, err = _run_docker(['docker', 'start', container_id])
|
||||
if out is None and err:
|
||||
return jsonify({'error': err}), 500
|
||||
log_message(f"Docker 容器启动: {container_id}")
|
||||
return jsonify({'message': f'容器 {container_id} 已启动'})
|
||||
|
||||
@app.route('/api/docker/container/<container_id>/stop', methods=['POST'])
|
||||
def api_docker_container_stop(container_id):
|
||||
"""停止容器"""
|
||||
out, err = _run_docker(['docker', 'stop', container_id])
|
||||
if out is None and err:
|
||||
return jsonify({'error': err}), 500
|
||||
log_message(f"Docker 容器停止: {container_id}")
|
||||
return jsonify({'message': f'容器 {container_id} 已停止'})
|
||||
|
||||
@app.route('/api/docker/container/<container_id>/restart', methods=['POST'])
|
||||
def api_docker_container_restart(container_id):
|
||||
"""重启容器"""
|
||||
out, err = _run_docker(['docker', 'restart', container_id])
|
||||
if out is None and err:
|
||||
return jsonify({'error': err}), 500
|
||||
log_message(f"Docker 容器重启: {container_id}")
|
||||
return jsonify({'message': f'容器 {container_id} 已重启'})
|
||||
|
||||
@app.route('/api/docker/prune', methods=['POST'])
|
||||
def api_docker_prune():
|
||||
"""清理Docker资源"""
|
||||
target = request.json.get('target', 'all') if request.json else 'all'
|
||||
results = {}
|
||||
|
||||
# 清理停止的容器
|
||||
if target in ('all', 'containers'):
|
||||
out, _ = _run_docker(['docker', 'container', 'prune', '-f'], timeout=30)
|
||||
results['containers'] = out or '已清理'
|
||||
|
||||
# 清理悬空镜像
|
||||
if target in ('all', 'images'):
|
||||
out, _ = _run_docker(['docker', 'image', 'prune', '-f'], timeout=60)
|
||||
results['images'] = out or '已清理'
|
||||
|
||||
# 清理构建缓存
|
||||
if target in ('all', 'build'):
|
||||
out, _ = _run_docker(['docker', 'builder', 'prune', '-f'], timeout=60)
|
||||
results['build'] = out or '已清理'
|
||||
|
||||
log_message(f"Docker 资源清理完成: {target}")
|
||||
return jsonify({'message': '清理完成', 'results': results})
|
||||
@@ -119,6 +119,9 @@
|
||||
<button onclick="switchTab('cron')" class="tab-btn px-4 py-2 text-gray-300 hover:text-white" data-tab="cron">
|
||||
<i class="ri-timer-line"></i> Cron 管理
|
||||
</button>
|
||||
<button onclick="switchTab('docker')" class="tab-btn px-4 py-2 text-gray-300 hover:text-white" data-tab="docker">
|
||||
<i class="ri-ship-line"></i> Docker 监控
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- 项目服务 Tab -->
|
||||
@@ -485,6 +488,72 @@
|
||||
<div class="text-center py-12 text-gray-400"><i class="ri-loader-4-line text-4xl animate-spin"></i><p class="mt-2">加载中...</p></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Docker 监控 Tab -->
|
||||
<div id="dockerTab" class="hidden">
|
||||
<!-- Docker 统计卡片 -->
|
||||
<div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-6 gap-3 mb-6">
|
||||
<div class="card rounded-xl p-3">
|
||||
<p class="text-gray-400 text-xs">总容器数</p>
|
||||
<p id="dockerContainersTotal" class="text-xl font-bold text-blue-400">-</p>
|
||||
</div>
|
||||
<div class="card rounded-xl p-3">
|
||||
<p class="text-gray-400 text-xs">运行中</p>
|
||||
<p id="dockerContainersRunning" class="text-xl font-bold text-green-400">-</p>
|
||||
</div>
|
||||
<div class="card rounded-xl p-3">
|
||||
<p class="text-gray-400 text-xs">已停止</p>
|
||||
<p id="dockerContainersStopped" class="text-xl font-bold text-red-400">-</p>
|
||||
</div>
|
||||
<div class="card rounded-xl p-3">
|
||||
<p class="text-gray-400 text-xs">总镜像数</p>
|
||||
<p id="dockerImagesTotal" class="text-xl font-bold text-purple-400">-</p>
|
||||
</div>
|
||||
<div class="card rounded-xl p-3">
|
||||
<p class="text-gray-400 text-xs">磁盘占用</p>
|
||||
<p id="dockerDiskSize" class="text-xl font-bold text-yellow-400">-</p>
|
||||
</div>
|
||||
<div class="card rounded-xl p-3">
|
||||
<p class="text-gray-400 text-xs">可回收</p>
|
||||
<p id="dockerReclaimable" class="text-xl font-bold text-orange-400">-</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 操作按钮 -->
|
||||
<div class="flex gap-2 mb-4 flex-wrap">
|
||||
<button onclick="loadDockerData()" class="btn bg-blue-600 hover:bg-blue-700 px-3 py-2 rounded-lg text-sm flex items-center gap-1">
|
||||
<i class="ri-refresh-line"></i> 刷新
|
||||
</button>
|
||||
<button onclick="dockerPrune('containers')" class="btn bg-yellow-600 hover:bg-yellow-700 px-3 py-2 rounded-lg text-sm flex items-center gap-1">
|
||||
<i class="ri-delete-bin-line"></i> 清理容器
|
||||
</button>
|
||||
<button onclick="dockerPrune('images')" class="btn bg-orange-600 hover:bg-orange-700 px-3 py-2 rounded-lg text-sm flex items-center gap-1">
|
||||
<i class="ri-image-line"></i> 清理镜像
|
||||
</button>
|
||||
<button onclick="dockerPrune('all')" class="btn bg-red-600 hover:bg-red-700 px-3 py-2 rounded-lg text-sm flex items-center gap-1">
|
||||
<i class="ri-broom-line"></i> 全部清理
|
||||
</button>
|
||||
<span class="text-gray-500 text-xs flex items-center ml-2">版本: <span id="dockerVersion" class="text-gray-300 ml-1">-</span></span>
|
||||
</div>
|
||||
|
||||
<!-- 容器列表 -->
|
||||
<h3 class="text-sm font-semibold text-gray-300 mb-2 flex items-center gap-2">
|
||||
<i class="ri-computer-line text-blue-400"></i> 容器列表
|
||||
<span id="dockerContainerCount" class="text-xs text-gray-500"></span>
|
||||
</h3>
|
||||
<div id="dockerContainersList" class="space-y-2 mb-6">
|
||||
<div class="text-gray-500 text-sm py-4 text-center">加载中...</div>
|
||||
</div>
|
||||
|
||||
<!-- 镜像列表 -->
|
||||
<h3 class="text-sm font-semibold text-gray-300 mb-2 flex items-center gap-2">
|
||||
<i class="ri-stack-line text-purple-400"></i> 镜像列表
|
||||
<span id="dockerImageCount" class="text-xs text-gray-500"></span>
|
||||
</h3>
|
||||
<div id="dockerImagesList" class="space-y-1">
|
||||
<div class="text-gray-500 text-sm py-4 text-center">加载中...</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 日志模态框 -->
|
||||
@@ -698,17 +767,32 @@
|
||||
<i class="ri-hard-drive-2-line text-orange-400"></i>
|
||||
<span class="text-gray-200 text-sm">磁盘使用率</span>
|
||||
</label>
|
||||
<label class="flex items-center gap-2 bg-gray-700/50 px-3 py-2 rounded-lg cursor-pointer hover:bg-gray-700 col-span-2">
|
||||
<input type="checkbox" value="service_down" class="email-rule-resource w-4 h-4" onchange="onResourceChange()">
|
||||
<i class="ri-shut-down-line text-yellow-400"></i>
|
||||
<span class="text-gray-200 text-sm">服务下线监控</span>
|
||||
<span class="text-gray-500 text-xs">检测指定服务长期不在线</span>
|
||||
</label>
|
||||
</div>
|
||||
<p class="text-gray-500 text-xs mt-1">勾选多项可随机组合监控,任一资源超标即触发通知</p>
|
||||
</div>
|
||||
|
||||
<!-- 服务选择器(仅当勾选「服务下线监控」时显示) -->
|
||||
<div class="mb-3" id="serviceDownSelector" style="display:none;">
|
||||
<label class="block text-gray-400 text-sm mb-1">监控服务 *</label>
|
||||
<select id="emailRuleServiceId" class="w-full bg-gray-700 text-gray-200 px-3 py-2 rounded-lg" onchange="onServiceDownChange()">
|
||||
<option value="">-- 请选择要监控的服务 --</option>
|
||||
</select>
|
||||
<p class="text-gray-500 text-xs mt-1">选择需要监控下线状态的服务</p>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label class="block text-gray-400 text-sm mb-1">触发阈值 *</label>
|
||||
<div class="flex items-center gap-2">
|
||||
<input type="number" id="emailRuleThreshold" required min="1" class="w-20 bg-gray-700 text-gray-200 px-3 py-2 rounded-lg" value="80">
|
||||
<span class="text-gray-400" id="emailRuleThresholdUnit">% / °C</span>
|
||||
</div>
|
||||
<p class="text-gray-500 text-xs mt-1">对不同资源类型使用统一阈值(如CPU用%则填百分比,温度用°C则填温度值)</p>
|
||||
<p class="text-gray-500 text-xs mt-1" id="emailRuleThresholdHint">对不同资源类型使用统一阈值(如CPU用%则填百分比,温度用°C则填温度值)</p>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
@@ -840,6 +924,9 @@
|
||||
document.getElementById('projectsTab').classList.toggle('hidden', tab !== 'projects');
|
||||
document.getElementById('systemTab').classList.toggle('hidden', tab !== 'system');
|
||||
document.getElementById('cronTab').classList.toggle('hidden', tab !== 'cron');
|
||||
document.getElementById('dockerTab').classList.toggle('hidden', tab !== 'docker');
|
||||
|
||||
if (tab === 'docker') loadDockerData();
|
||||
|
||||
// 切换Tab时关闭实时监控
|
||||
if (tab !== 'system' && realtimeTimer) {
|
||||
@@ -1245,6 +1332,8 @@
|
||||
fetch('/api/system/stats').then(r => r.json()).then(sysData => {
|
||||
if (sysData.available) checkThresholds(sysData);
|
||||
}).catch(() => {});
|
||||
// 同时检查服务下线邮件规则
|
||||
checkEmailRules(null);
|
||||
|
||||
} catch (e) {
|
||||
console.error('加载失败:', e);
|
||||
@@ -1561,7 +1650,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
const resourceNames = { 'cpu': 'CPU', 'cpu_temp': 'CPU温度', 'memory': '内存', 'disk': '磁盘' };
|
||||
const resourceNames = { 'cpu': 'CPU', 'cpu_temp': 'CPU温度', 'memory': '内存', 'disk': '磁盘', 'service_down': '服务下线' };
|
||||
const resourceUnits = { 'cpu': '%', 'cpu_temp': '°C', 'memory': '%', 'disk': '%' };
|
||||
|
||||
list.innerHTML = rules.map(rule => {
|
||||
@@ -1575,14 +1664,19 @@
|
||||
|
||||
// 显示资源列表(支持多资源和旧版单资源兼容)
|
||||
const resources = rule.resources || (rule.resource ? [rule.resource] : []);
|
||||
const resourceDisplay = resources.map(r => resourceNames[r] || r).join('+');
|
||||
let resourceDisplay;
|
||||
if (resources.includes('service_down') && rule.serviceName) {
|
||||
resourceDisplay = `🔴 ${rule.serviceName} 下线 ≥ ${rule.threshold}分钟`;
|
||||
} else {
|
||||
resourceDisplay = resources.map(r => resourceNames[r] || r).join('+') + ' ≥ ' + rule.threshold;
|
||||
}
|
||||
|
||||
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 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">${resourceDisplay} ≥ ${rule.threshold}</span>
|
||||
<span class="text-gray-400 text-xs">${resourceDisplay}</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>` : ''}
|
||||
@@ -1602,9 +1696,13 @@
|
||||
document.getElementById('emailRuleName').value = '';
|
||||
// 重置资源复选框
|
||||
document.querySelectorAll('.email-rule-resource').forEach(cb => cb.checked = false);
|
||||
document.getElementById('serviceDownSelector').style.display = 'none';
|
||||
document.getElementById('emailRuleServiceId').value = '';
|
||||
document.getElementById('emailRuleThreshold').value = 80;
|
||||
document.getElementById('emailRuleThresholdUnit').textContent = '% / °C';
|
||||
document.getElementById('emailRuleThresholdHint').textContent = '对不同资源类型使用统一阈值';
|
||||
document.getElementById('emailRuleTriggerType').value = 'single';
|
||||
document.getElementById('emailRuleTriggerType').disabled = false;
|
||||
document.getElementById('emailRuleTriggerParam').value = 3;
|
||||
document.getElementById('triggerParamsDiv').style.display = 'none';
|
||||
document.getElementById('emailRuleAddress').value = '';
|
||||
@@ -1629,24 +1727,73 @@
|
||||
const selected = getSelectedResources();
|
||||
const unitEl = document.getElementById('emailRuleThresholdUnit');
|
||||
const thresholdEl = document.getElementById('emailRuleThreshold');
|
||||
const hintEl = document.getElementById('emailRuleThresholdHint');
|
||||
const serviceSelector = document.getElementById('serviceDownSelector');
|
||||
const triggerTypeEl = document.getElementById('emailRuleTriggerType');
|
||||
const triggerParamsDiv = document.getElementById('triggerParamsDiv');
|
||||
|
||||
if (selected.length === 0) {
|
||||
unitEl.textContent = '% / °C';
|
||||
} else if (selected.length === 1 && selected[0] === 'cpu_temp') {
|
||||
unitEl.textContent = '°C';
|
||||
if (parseInt(thresholdEl.value) > 120) thresholdEl.value = 80;
|
||||
thresholdEl.max = 120;
|
||||
thresholdEl.min = 30;
|
||||
} else {
|
||||
unitEl.textContent = '%';
|
||||
thresholdEl.max = 100;
|
||||
const hasServiceDown = selected.includes('service_down');
|
||||
|
||||
// 显示/隐藏服务选择器
|
||||
if (hasServiceDown) {
|
||||
serviceSelector.style.display = 'block';
|
||||
populateServiceSelector();
|
||||
// 服务下线使用分钟作为阈值单位
|
||||
unitEl.textContent = '分钟';
|
||||
thresholdEl.value = 5;
|
||||
thresholdEl.max = 1440;
|
||||
thresholdEl.min = 1;
|
||||
if (selected.includes('cpu_temp')) {
|
||||
hintEl.textContent = '服务连续离线超过此分钟数即触发通知';
|
||||
// 服务下线固定为duration类型
|
||||
if (triggerTypeEl) {
|
||||
triggerTypeEl.value = 'duration';
|
||||
triggerTypeEl.disabled = true;
|
||||
}
|
||||
if (triggerParamsDiv) triggerParamsDiv.style.display = 'none';
|
||||
} else {
|
||||
serviceSelector.style.display = 'none';
|
||||
if (triggerTypeEl) triggerTypeEl.disabled = false;
|
||||
updateTriggerParams();
|
||||
|
||||
if (selected.length === 0) {
|
||||
unitEl.textContent = '% / °C';
|
||||
hintEl.textContent = '对不同资源类型使用统一阈值';
|
||||
} else if (selected.length === 1 && selected[0] === 'cpu_temp') {
|
||||
unitEl.textContent = '°C';
|
||||
if (parseInt(thresholdEl.value) > 120) thresholdEl.value = 80;
|
||||
thresholdEl.max = 120;
|
||||
thresholdEl.min = 30;
|
||||
hintEl.textContent = 'CPU温度超过此值即触发通知';
|
||||
} else {
|
||||
unitEl.textContent = '%';
|
||||
thresholdEl.max = 100;
|
||||
thresholdEl.min = 1;
|
||||
hintEl.textContent = '对不同资源类型使用统一阈值';
|
||||
if (selected.includes('cpu_temp')) {
|
||||
unitEl.textContent = '% / °C';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function populateServiceSelector() {
|
||||
const sel = document.getElementById('emailRuleServiceId');
|
||||
const currentVal = sel.value;
|
||||
// 收集所有web类型服务
|
||||
const webServices = projects.filter(p => p.type === 'web');
|
||||
let options = '<option value="">-- 请选择要监控的服务 --</option>';
|
||||
webServices.forEach(p => {
|
||||
const portsStr = p.ports ? p.ports.join(',') : '';
|
||||
const selected = p.id === currentVal ? ' selected' : '';
|
||||
options += `<option value="${p.id}"${selected}>${p.name} (端口: ${portsStr})</option>`;
|
||||
});
|
||||
sel.innerHTML = options;
|
||||
}
|
||||
|
||||
function onServiceDownChange() {
|
||||
// 将来可以在这里做联动
|
||||
}
|
||||
|
||||
function updateTriggerParams() {
|
||||
const triggerType = document.getElementById('emailRuleTriggerType').value;
|
||||
const paramsDiv = document.getElementById('triggerParamsDiv');
|
||||
@@ -1704,6 +1851,10 @@
|
||||
if (cb) cb.checked = true;
|
||||
});
|
||||
onResourceChange();
|
||||
// 服务下线相关
|
||||
if (rule.serviceId) {
|
||||
document.getElementById('emailRuleServiceId').value = rule.serviceId;
|
||||
}
|
||||
document.getElementById('emailRuleThreshold').value = rule.threshold;
|
||||
document.getElementById('emailRuleTriggerType').value = rule.triggerType || 'single';
|
||||
document.getElementById('emailRuleTriggerParam').value = rule.triggerParam || 3;
|
||||
@@ -1732,6 +1883,7 @@
|
||||
const silentEnd = document.getElementById('emailRuleSilentEnd').value;
|
||||
const silentEnabled = document.getElementById('emailRuleSilentEnabled').checked;
|
||||
const enabled = document.getElementById('emailRuleEnabled').checked;
|
||||
const serviceId = document.getElementById('emailRuleServiceId').value;
|
||||
|
||||
if (!name || !email) {
|
||||
alert('请填写完整信息');
|
||||
@@ -1743,23 +1895,32 @@
|
||||
return;
|
||||
}
|
||||
|
||||
// 服务下线必须选择具体服务
|
||||
if (resources.includes('service_down') && !serviceId) {
|
||||
alert('请选择要监控的服务');
|
||||
return;
|
||||
}
|
||||
|
||||
const rules = getEmailRules();
|
||||
|
||||
if (ruleId) {
|
||||
// 编辑
|
||||
const idx = rules.findIndex(r => r.id === ruleId);
|
||||
if (idx >= 0) {
|
||||
rules[idx] = { ...rules[idx], name, resources, threshold, triggerType, triggerParam, email, interval, silentStart, silentEnd, silentEnabled, enabled };
|
||||
rules[idx] = { ...rules[idx], name, resources, threshold, triggerType, triggerParam, email, interval, silentStart, silentEnd, silentEnabled, enabled, serviceId };
|
||||
}
|
||||
} else {
|
||||
// 新增
|
||||
const svc = projects.find(p => p.id === serviceId);
|
||||
rules.push({
|
||||
id: 'rule_' + Date.now(),
|
||||
name, resources, threshold, triggerType, triggerParam, email, interval, silentStart, silentEnd, silentEnabled, enabled,
|
||||
serviceId, serviceName: svc ? svc.name : '',
|
||||
offlineSince: null, // 服务下线开始时间
|
||||
lastSent: 0,
|
||||
exceedCount: 0, // 连续超过次数
|
||||
exceedDuration: 0, // 累计超过时间
|
||||
recentValues: [] // 最近采样值
|
||||
exceedCount: 0,
|
||||
exceedDuration: 0,
|
||||
recentValues: []
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1818,6 +1979,33 @@
|
||||
|
||||
for (const resource of resources) {
|
||||
let value;
|
||||
|
||||
// 服务下线监控 - 特殊处理(不需要data参数)
|
||||
if (resource === 'service_down') {
|
||||
const svcId = rule.serviceId;
|
||||
if (!svcId) continue;
|
||||
const svc = projects.find(p => p.id === svcId);
|
||||
if (!svc) continue;
|
||||
const isOnline = svc.status?.status === 'running';
|
||||
|
||||
if (isOnline) {
|
||||
rule.offlineSince = null;
|
||||
} else {
|
||||
if (!rule.offlineSince) {
|
||||
rule.offlineSince = now;
|
||||
}
|
||||
const offlineMinutes = (now - rule.offlineSince) / 60000;
|
||||
if (offlineMinutes >= rule.threshold) {
|
||||
const svcName = svc.name || rule.serviceName || svcId;
|
||||
exceededResources.push(`🔴 ${svcName} 已离线 ${Math.round(offlineMinutes)} 分钟 (阈值: ${rule.threshold} 分钟)`);
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
// 系统资源监控需要 data 参数
|
||||
if (!data) continue;
|
||||
|
||||
if (resource === 'cpu_temp') {
|
||||
// CPU温度取两个Package中较高的那个
|
||||
const t0 = data.cpu?.temp_package_0;
|
||||
@@ -2549,6 +2737,130 @@
|
||||
setInterval(() => {
|
||||
fetch('/api/projects').then(() => updateConnectionStatus(true)).catch(() => updateConnectionStatus(false));
|
||||
}, 10000);
|
||||
|
||||
// ==================== Docker 监控 ====================
|
||||
|
||||
async function loadDockerData() {
|
||||
try {
|
||||
const [containersRes, imagesRes, systemRes] = await Promise.all([
|
||||
fetch('/api/docker/containers'),
|
||||
fetch('/api/docker/images'),
|
||||
fetch('/api/docker/system')
|
||||
]);
|
||||
const containers = (await containersRes.json()).containers || [];
|
||||
const images = (await imagesRes.json()).images || [];
|
||||
const system = await systemRes.json();
|
||||
renderDockerStats(containers, images, system);
|
||||
renderDockerContainers(containers);
|
||||
renderDockerImages(images);
|
||||
document.getElementById('dockerVersion').textContent = system.version || '-';
|
||||
} catch (e) {
|
||||
console.error('Docker数据加载失败:', e);
|
||||
}
|
||||
}
|
||||
|
||||
function renderDockerStats(containers, images, system) {
|
||||
const total = containers.length;
|
||||
const running = containers.filter(c => c.state === 'running').length;
|
||||
const stopped = total - running;
|
||||
const imgTotal = images.length;
|
||||
document.getElementById('dockerContainersTotal').textContent = total;
|
||||
document.getElementById('dockerContainersRunning').textContent = running;
|
||||
document.getElementById('dockerContainersStopped').textContent = stopped;
|
||||
document.getElementById('dockerImagesTotal').textContent = imgTotal;
|
||||
document.getElementById('dockerContainerCount').textContent = `(${running}运行 / ${total}总计)`;
|
||||
document.getElementById('dockerImageCount').textContent = `(${imgTotal}个)`;
|
||||
const imagesDisk = system.diskUsage?.find(d => d.type === 'Images');
|
||||
if (imagesDisk) {
|
||||
document.getElementById('dockerDiskSize').textContent = imagesDisk.size;
|
||||
document.getElementById('dockerReclaimable').textContent = imagesDisk.reclaimable;
|
||||
}
|
||||
}
|
||||
|
||||
function renderDockerContainers(containers) {
|
||||
const list = document.getElementById('dockerContainersList');
|
||||
if (containers.length === 0) {
|
||||
list.innerHTML = '<div class="text-gray-500 text-sm py-4 text-center">暂无容器</div>';
|
||||
return;
|
||||
}
|
||||
list.innerHTML = containers.map(c => {
|
||||
const isRunning = c.state === 'running';
|
||||
const s = c.stats || {};
|
||||
const portsDisplay = c.ports ? c.ports.split(',').slice(0, 3).join(', ') : '';
|
||||
return `<div class="card rounded-lg p-3 ${isRunning ? 'border-green-500/30' : 'border-red-500/30'}">
|
||||
<div class="flex items-center justify-between mb-2">
|
||||
<div class="flex items-center gap-2">
|
||||
<div class="w-2 h-2 rounded-full ${isRunning ? 'bg-green-400' : 'bg-red-400'}" style="${isRunning ? 'box-shadow: 0 0 8px #4ade80;' : ''}"></div>
|
||||
<span class="font-semibold text-sm text-gray-200">${c.name}</span>
|
||||
<span class="text-xs ${isRunning ? 'text-green-400' : 'text-red-400'}">${isRunning ? '运行中' : '已停止'}</span>
|
||||
</div>
|
||||
<div class="flex items-center gap-1">
|
||||
${isRunning ? `<button onclick="dockerControl('${c.id}','stop')" class="btn bg-red-600/50 hover:bg-red-600 px-2 py-0.5 rounded text-xs">停止</button><button onclick="dockerControl('${c.id}','restart')" class="btn bg-yellow-600/50 hover:bg-yellow-600 px-2 py-0.5 rounded text-xs">重启</button>` : `<button onclick="dockerControl('${c.id}','start')" class="btn bg-green-600/50 hover:bg-green-600 px-2 py-0.5 rounded text-xs">启动</button>`}
|
||||
<button onclick="showDockerLogs('${c.id}','${c.name}')" class="btn bg-gray-600/50 hover:bg-gray-600 px-2 py-0.5 rounded text-xs">日志</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid grid-cols-2 md:grid-cols-4 gap-2 text-xs">
|
||||
<div><span class="text-gray-500">镜像:</span> <span class="text-gray-300">${c.image}</span></div>
|
||||
${isRunning ? `<div><span class="text-gray-500">CPU:</span> <span class="text-blue-400">${s.cpuPercent || '-'}</span></div><div><span class="text-gray-500">内存:</span> <span class="text-green-400">${s.memUsage || '-'} (${s.memPercent || '-'})</span></div><div><span class="text-gray-500">进程:</span> <span class="text-gray-300">${s.pids || '-'}</span></div><div><span class="text-gray-500">网络I/O:</span> <span class="text-cyan-400">${s.netIO || '-'}</span></div><div><span class="text-gray-500">磁盘I/O:</span> <span class="text-purple-400">${s.blockIO || '-'}</span></div>` : ''}
|
||||
${portsDisplay ? `<div class="col-span-2"><span class="text-gray-500">端口:</span> <span class="text-yellow-400">${portsDisplay}</span></div>` : ''}
|
||||
<div class="col-span-2"><span class="text-gray-500">运行时间:</span> <span class="text-gray-400">${c.runningFor || '-'}</span></div>
|
||||
</div>
|
||||
</div>`;
|
||||
}).join('');
|
||||
}
|
||||
|
||||
function renderDockerImages(images) {
|
||||
const list = document.getElementById('dockerImagesList');
|
||||
if (images.length === 0) {
|
||||
list.innerHTML = '<div class="text-gray-500 text-sm py-4 text-center">暂无镜像</div>';
|
||||
return;
|
||||
}
|
||||
const valid = images.filter(i => !i.dangling);
|
||||
const dangling = images.filter(i => i.dangling);
|
||||
let html = '';
|
||||
if (valid.length > 0) {
|
||||
html += valid.map(i => `<div class="flex items-center justify-between bg-gray-700/30 px-3 py-1.5 rounded text-xs"><div class="flex items-center gap-2 flex-1 min-w-0"><span class="text-gray-200 truncate">${i.repository}:${i.tag || 'latest'}</span><span class="text-gray-500">${i.size}</span></div><span class="text-gray-500 ml-2 shrink-0">${(i.created || '').substring(0, 19)}</span></div>`).join('');
|
||||
}
|
||||
if (dangling.length > 0) {
|
||||
html += `<div class="text-yellow-400/70 text-xs mt-2 mb-1"><i class="ri-error-warning-line"></i> 悬空镜像 (${dangling.length}个)</div>`;
|
||||
html += dangling.map(i => `<div class="flex items-center justify-between bg-yellow-500/10 px-3 py-1.5 rounded text-xs opacity-70"><div class="flex items-center gap-2 flex-1 min-w-0"><span class="text-gray-400 truncate"><none>:<none></span><span class="text-gray-500">${i.size}</span><span class="text-gray-500">${i.id}</span></div><span class="text-gray-500 ml-2 shrink-0">${(i.created || '').substring(0, 19)}</span></div>`).join('');
|
||||
}
|
||||
list.innerHTML = html;
|
||||
}
|
||||
|
||||
async function dockerControl(containerId, action) {
|
||||
const names = { start: '启动', stop: '停止', restart: '重启' };
|
||||
if (!confirm(`确定要${names[action]}容器吗?`)) return;
|
||||
try {
|
||||
const res = await fetch(`/api/docker/container/${containerId}/${action}`, { method: 'POST' });
|
||||
const data = await res.json();
|
||||
if (data.error) { alert(`操作失败: ${data.error}`); return; }
|
||||
setTimeout(loadDockerData, 1000);
|
||||
} catch (e) { alert('操作失败: ' + e.message); }
|
||||
}
|
||||
|
||||
async function showDockerLogs(containerId, name) {
|
||||
const m = document.getElementById('logModal');
|
||||
document.getElementById('logTitle').textContent = `${name} - 日志`;
|
||||
document.getElementById('logContent').textContent = '加载中...';
|
||||
m.classList.add('flex'); m.classList.remove('hidden');
|
||||
try {
|
||||
const res = await fetch(`/api/docker/container/${containerId}/logs?lines=200`);
|
||||
const data = await res.json();
|
||||
document.getElementById('logContent').textContent = data.logs || data.error || '无日志';
|
||||
} catch (e) { document.getElementById('logContent').textContent = '加载失败: ' + e.message; }
|
||||
}
|
||||
|
||||
async function dockerPrune(target) {
|
||||
const names = { all: '所有资源(停止的容器+悬空镜像+构建缓存)', containers: '停止的容器', images: '悬空镜像', build: '构建缓存' };
|
||||
if (!confirm(`确定清理${names[target]}?不可撤销。`)) return;
|
||||
try {
|
||||
const res = await fetch('/api/docker/prune', { method: 'POST', headers: {'Content-Type':'application/json'}, body: JSON.stringify({target}) });
|
||||
alert((await res.json()).message || '完成');
|
||||
setTimeout(loadDockerData, 1000);
|
||||
} catch (e) { alert('失败: ' + e.message); }
|
||||
}
|
||||
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user