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) { @@ -44,6 +44,9 @@ layui.define(['commonDetail','common'], function (exports) {
44 commonDetail.renderLineCharat("database_redis_peak_linechart", resId, "KPIFEEE2B96", "内存消耗峰值", "mem"); 44 commonDetail.renderLineCharat("database_redis_peak_linechart", resId, "KPIFEEE2B96", "内存消耗峰值", "mem");
45 //峰值内存使用率 45 //峰值内存使用率
46 commonDetail.renderLineCharat("database_redis_per_peak_linechart", resId, "KPI3A4D2CAE", "峰值内存使用率", "mem"); 46 commonDetail.renderLineCharat("database_redis_per_peak_linechart", resId, "KPI3A4D2CAE", "峰值内存使用率", "mem");
  47 + //端口存活侦测（二维表格）
  48 + var portDetTableKpiId='KPI39C76443,KPIC6A062EC,KPI5212EE93,KPIDCBEA93D';
  49 + commonDetail.renderTable('database_redis_port_detection_id',false,resId,portDetTableKpiId,'端口存活侦测','port');
47 50
48 //活动告警 51 //活动告警
49 commonDetail.renderActiveAlarms("database_redis_active_alarm",resId); 52 commonDetail.renderActiveAlarms("database_redis_active_alarm",resId);
@@ -161,28 +161,28 @@ @@ -161,28 +161,28 @@
161 <div class="ip-legend"> 161 <div class="ip-legend">
162 <div class="ip-info-good" 162 <div class="ip-info-good"
163 style="color: #000;line-height:22px;font-size: 16px;text-align: center;"> 163 style="color: #000;line-height:22px;font-size: 16px;text-align: center;">
164 - 0 164 + x
165 </div> 165 </div>
166 <span>ping成功已监控</span> 166 <span>ping成功已监控</span>
167 <div class="ip-info-good" 167 <div class="ip-info-good"
168 style="color:#FFFFFF;line-height:22px;font-size: 16px;text-align: center;"> 168 style="color:#FFFFFF;line-height:22px;font-size: 16px;text-align: center;">
169 - 0 169 + x
170 </div> 170 </div>
171 <span>ping成功未监控</span> 171 <span>ping成功未监控</span>
172 <div class="ip-info-ping-down" 172 <div class="ip-info-ping-down"
173 style="color:#000;line-height:22px;font-size: 16px;text-align: center;"> 173 style="color:#000;line-height:22px;font-size: 16px;text-align: center;">
174 - 0 174 + x
175 </div> 175 </div>
176 <span>ping失败未监控</span> 176 <span>ping失败未监控</span>
177 177
178 <div class="ip-info-ping-down" 178 <div class="ip-info-ping-down"
179 style="color:#47ce20;line-height:22px;font-size: 16px;text-align: center;"> 179 style="color:#47ce20;line-height:22px;font-size: 16px;text-align: center;">
180 - 0 180 + x
181 </div> 181 </div>
182 <span>ping失败已监控</span> 182 <span>ping失败已监控</span>
183 183
184 <div class="ip-info-unavailable" 184 <div class="ip-info-unavailable"
185 - style="color: #000;line-height:22px;font-size: 16px;text-align: center;">0 185 + style="color: #000;line-height:22px;font-size: 16px;text-align: center;">x
186 </div> 186 </div>
187 <span>网络地址/广播地址</span> 187 <span>网络地址/广播地址</span>
188 188
@@ -48,6 +48,12 @@ @@ -48,6 +48,12 @@
48 </div> 48 </div>
49 <div class="lay-row"> 49 <div class="lay-row">
50 <div class="lay-row-item"> 50 <div class="lay-row-item">
  51 + <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>
  52 + <div id="database_redis_port_detection_id"></div>
  53 + </div>
  54 + </div>
  55 + <div class="lay-row">
  56 + <div class="lay-row-item">
51 <h5 class="lay-row-title">实时告警动态</h5> 57 <h5 class="lay-row-title">实时告警动态</h5>
52 <div id="database_redis_active_alarm"></div> 58 <div id="database_redis_active_alarm"></div>
53 </div> 59 </div>