monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit b0fe846f7314efab6e2c8267a9c9c2acd6d311ed 2 parents 19b24bf5 32d35318

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-lushangqing
Inline Side-by-side
Showing 3 changed files with 14 additions and 5 deletions
... ... @@ -44,6 +44,9 @@ layui.define(['commonDetail','common'], function (exports) {
commonDetail.renderLineCharat("database_redis_peak_linechart", resId, "KPIFEEE2B96", "内存消耗峰值", "mem");
//峰值内存使用率
commonDetail.renderLineCharat("database_redis_per_peak_linechart", resId, "KPI3A4D2CAE", "峰值内存使用率", "mem");
//端口存活侦测（二维表格）
var portDetTableKpiId='KPI39C76443,KPIC6A062EC,KPI5212EE93,KPIDCBEA93D';
commonDetail.renderTable('database_redis_port_detection_id',false,resId,portDetTableKpiId,'端口存活侦测','port');
//活动告警
commonDetail.renderActiveAlarms("database_redis_active_alarm",resId);
... ...
... ... @@ -161,28 +161,28 @@
<div class="ip-legend">
<div class="ip-info-good"
style="color: #000;line-height:22px;font-size: 16px;text-align: center;">
0
x
</div>
<span>ping成功已监控</span>
<div class="ip-info-good"
style="color:#FFFFFF;line-height:22px;font-size: 16px;text-align: center;">
0
x
</div>
<span>ping成功未监控</span>
<div class="ip-info-ping-down"
style="color:#000;line-height:22px;font-size: 16px;text-align: center;">
0
x
</div>
<span>ping失败未监控</span>
<div class="ip-info-ping-down"
style="color:#47ce20;line-height:22px;font-size: 16px;text-align: center;">
0
x
</div>
<span>ping失败已监控</span>
<div class="ip-info-unavailable"
style="color: #000;line-height:22px;font-size: 16px;text-align: center;">0
style="color: #000;line-height:22px;font-size: 16px;text-align: center;">x
</div>
<span>网络地址/广播地址</span>
... ...
... ... @@ -48,6 +48,12 @@
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">端口存活侦测<span id="database_redis_port_detection_idDownload" class="layui-table-link" style="margin-left: 10px;">下载</span><span id="database_redis_port_detection_idMore" class="layui-table-link">更多</span></h5>
<div id="database_redis_port_detection_id"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">实时告警动态</h5>
<div id="database_redis_active_alarm"></div>
</div>
... ...