monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 张凯
Commit c1eda010e4009737cf7f4d9fe162d2c7aff05c00 1 parent 437e1502

chore:腾讯云详情页优化

Inline Side-by-side
Showing 6 changed files with 93 additions and 22 deletions
@@ -14,7 +14,7 @@ layui.define(['commonDetail','common'], function (exports) { @@ -14,7 +14,7 @@ layui.define(['commonDetail','common'], function (exports) {
14 commonDetail.bindTips(); 14 commonDetail.bindTips();
15 15
16 //基本信息指标 16 //基本信息指标
17 - var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIA1CFDB4B,KPI2DC9105C,KPI39C76443,KPIECA37CB0,KPI1782D6AF,KPI352DE256"; 17 + var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI97AF9A47,KPI2DC9105C,KPI39C76443,KPIECA37CB0,KPI1782D6AF,KPI352DE256";
18 //关键信息指标 18 //关键信息指标
19 var keyKpi = "KPI86DF5046,KPID2DBDD50,KPIBAA7E176,KPI19832098,KPI91C252FE,KPI8546BDCF"; 19 var keyKpi = "KPI86DF5046,KPID2DBDD50,KPIBAA7E176,KPI19832098,KPI91C252FE,KPI8546BDCF";
20 20
@@ -28,6 +28,29 @@ layui.define(['commonDetail','common'], function (exports) { @@ -28,6 +28,29 @@ layui.define(['commonDetail','common'], function (exports) {
28 commonDetail.renderText("tencent_cloud_plat_res_ckafka_baseinfo",resId,baseKpi); 28 commonDetail.renderText("tencent_cloud_plat_res_ckafka_baseinfo",resId,baseKpi);
29 //关键信息 29 //关键信息
30 commonDetail.renderText("tencent_cloud_plat_res_ckafka_keyinfo",resId,keyKpi); 30 commonDetail.renderText("tencent_cloud_plat_res_ckafka_keyinfo",resId,keyKpi);
  31 +
  32 + //生产流量
  33 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_proflow_linechart",resId,"KPI7054BC34","生产流量","instance_pro_flow");
  34 + //消费流量
  35 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_conflow_linechart",resId,"KPI82861CEA","消费流量","instance_con_flow");
  36 + //生产条数
  37 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_procount_linechart",resId,"KPI17105DEB","生产条数","instance_pro_count");
  38 + //消费条数
  39 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_concount_linechart",resId,"KPI82C17DBD","消费条数","instance_con_count");
  40 + //已占用磁盘容量
  41 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_msgheap_linechart",resId,"KPI34D78BC0","已占用磁盘容量","instance_msg_heap");
  42 + //落盘消息条数
  43 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_msgcount_linechart",resId,"KPI5687314E","落盘消息条数","instance_msg_count");
  44 + //生产峰值带宽
  45 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_maxproflow_linechart",resId,"KPI9680D964","生产峰值带宽","instance_max_pro_flow");
  46 + //消费峰值带宽
  47 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_maxconflow_linechart",resId,"KPI7A1D5F3E","消费峰值带宽","instance_max_con_flow");
  48 + //磁盘使用率
  49 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_diskusage_linechart",resId,"KPI2C8A6D17","磁盘使用率","instance_disk_usage");
  50 +
  51 +
  52 +
  53 +
31 //活动告警 54 //活动告警
32 commonDetail.renderActiveAlarms("tencent_cloud_plat_res_ckafka_active_alarm",resId); 55 commonDetail.renderActiveAlarms("tencent_cloud_plat_res_ckafka_active_alarm",resId);
33 } 56 }
@@ -14,13 +14,13 @@ layui.define(['commonDetail','common'], function (exports) { @@ -14,13 +14,13 @@ layui.define(['commonDetail','common'], function (exports) {
14 commonDetail.bindTips(); 14 commonDetail.bindTips();
15 15
16 //基本信息指标 16 //基本信息指标
17 - var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIA1CFDB4B,KPI2DC9105C,KPI39C76443,KPIE13DD9A3"; 17 + var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI97AF9A47,KPI2DC9105C,KPI39C76443";
18 //关键信息指标 18 //关键信息指标
19 var keyKpi = "KPI86DF5046,KPIFDF953D6,KPI4D0D4345,KP152C7778F,KPI7054BC34,KPI31CB8D97,KPI592C5FCA"; 19 var keyKpi = "KPI86DF5046,KPIFDF953D6,KPI4D0D4345,KP152C7778F,KPI7054BC34,KPI31CB8D97,KPI592C5FCA";
20 //实例信息指标 20 //实例信息指标
21 var instanceKpi = "KP11782D6AF,KPI352DE256,KPI39C76443,KPI7BB10A71,KPI1AEA4DE2,KPIECA37CB0,KPID9507511,KPIE035F0E7,KPIADAC3034,KPIC29F4C6B,KPIE349B543"; 21 var instanceKpi = "KP11782D6AF,KPI352DE256,KPI39C76443,KPI7BB10A71,KPI1AEA4DE2,KPIECA37CB0,KPID9507511,KPIE035F0E7,KPIADAC3034,KPIC29F4C6B,KPIE349B543";
22 //性能信息指标 22 //性能信息指标
23 - var performanceKpi = "KPI4576847F,KPIB429CC99,KPI06DE7A71,KPI2C626FF6,KPIFC03301B"; 23 + var performanceKpi = "KPI4576847F,KPIB429CC99,KPI06DE7A71,KPI2C626FF6,KPI9021D939";
24 24
25 reload(); 25 reload();
26 26
@@ -41,9 +41,9 @@ layui.define(['commonDetail','common'], function (exports) { @@ -41,9 +41,9 @@ layui.define(['commonDetail','common'], function (exports) {
41 //内存使用率趋势图 41 //内存使用率趋势图
42 commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_mem_linechart",resId,"KPI31CB8D97","内存使用率","mem"); 42 commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_mem_linechart",resId,"KPI31CB8D97","内存使用率","mem");
43 //入流量趋势图 43 //入流量趋势图
44 - commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_indata_linechart",resId,"KPI4576847F","入流量","flow"); 44 + commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_indata_linechart",resId,"KPI4576847F","入流量","in_flow");
45 //出流量趋势图 45 //出流量趋势图
46 - commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_outdata_linechart",resId,"KPIB429CC99","出流量","flow"); 46 + commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_outdata_linechart",resId,"KPIB429CC99","出流量","out_flow");
47 //活动告警 47 //活动告警
48 commonDetail.renderActiveAlarms("tencent_cloud_plat_res_redis_active_alarm",resId); 48 commonDetail.renderActiveAlarms("tencent_cloud_plat_res_redis_active_alarm",resId);
49 } 49 }
@@ -14,7 +14,7 @@ layui.define(['commonDetail','common'], function (exports) { @@ -14,7 +14,7 @@ layui.define(['commonDetail','common'], function (exports) {
14 commonDetail.bindTips(); 14 commonDetail.bindTips();
15 15
16 //基本信息指标 16 //基本信息指标
17 - var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIA1CFDB4B,KPIECA37CB0,KPI917712A8,KPIEB82A68C"; 17 + var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI97AF9A47,KPIECA37CB0,KPI917712A8,KPIEB82A68C";
18 //关键信息指标 18 //关键信息指标
19 var keyKpi = "KPI86DF5046,KPID1029770,KPI1584BE1C,KPICB805B91"; 19 var keyKpi = "KPI86DF5046,KPID1029770,KPI1584BE1C,KPICB805B91";
20 //网络信息指标 20 //网络信息指标
@@ -42,16 +42,18 @@ layui.define(['commonDetail','common'], function (exports) { @@ -42,16 +42,18 @@ layui.define(['commonDetail','common'], function (exports) {
42 commonDetail.renderText("tencent_cloud_plat_virtualhost_netresinfo",resId,netresKpi); 42 commonDetail.renderText("tencent_cloud_plat_virtualhost_netresinfo",resId,netresKpi);
43 //计算资源信息 43 //计算资源信息
44 commonDetail.renderText("tencent_cloud_plat_virtualhost_comresinfo",resId,comresKpi); 44 commonDetail.renderText("tencent_cloud_plat_virtualhost_comresinfo",resId,comresKpi);
45 - //存储资源信息  
46 - commonDetail.renderText("tencent_cloud_plat_virtualhost_storesinfo",resId,storesKpi); 45 + //存储资源信息 (因为暂未采集到，屏蔽)
  46 + // commonDetail.renderText("tencent_cloud_plat_virtualhost_storesinfo",resId,storesKpi);
47 //cpu使用率趋势图 47 //cpu使用率趋势图
48 commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_cpu_linechart",resId,"KPI7054BC34","CPU使用率","cpu"); 48 commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_cpu_linechart",resId,"KPI7054BC34","CPU使用率","cpu");
49 //内存使用率趋势图 49 //内存使用率趋势图
50 commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_mem_linechart",resId,"KPI31CB8D97","内存使用率","mem"); 50 commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_mem_linechart",resId,"KPI31CB8D97","内存使用率","mem");
51 - //硬盘读流量  
52 - commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_readflow_linechart",resId,"KPICF4940F7","硬盘读流量","disk_read_traffic");  
53 - //硬盘写流量  
54 - commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_writeflow_linechart",resId,"KPI6C16A077","硬盘写流量","disk_write_traffic"); 51 + //内存使用量趋势图
  52 + commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_memused_linechart",resId,"KPI592C5FCA","内存使用量","mem_used");
  53 + //内网出带宽
  54 + commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_outtraffic_linechart",resId,"KPI73562B2B","内网出带宽","outtraffic");
  55 + //内网入带宽
  56 + commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_intraffic_linechart",resId,"KPI0EDB5CF2","内网入带宽","intraffic");
55 //数据磁盘信息 57 //数据磁盘信息
56 commonDetail.renderTable("tencent_cloud_plat_virtualhost_dataDisk",false,resId,dataDiskKpi,"数据磁盘信息","dataDisk-"); 58 commonDetail.renderTable("tencent_cloud_plat_virtualhost_dataDisk",false,resId,dataDiskKpi,"数据磁盘信息","dataDisk-");
57 //系统盘信息 59 //系统盘信息
@@ -20,6 +20,48 @@ @@ -20,6 +20,48 @@
20 </div> 20 </div>
21 <div class="lay-row"> 21 <div class="lay-row">
22 <div class="lay-row-item"> 22 <div class="lay-row-item">
  23 + <h5 class="lay-row-title">生产流量</h5>
  24 + <div id="tencent_cloud_plat_res_ckafka_proflow_linechart" class="detail_line_chart"></div>
  25 + </div>
  26 + <div class="lay-row-item">
  27 + <h5 class="lay-row-title">消费流量</h5>
  28 + <div id="tencent_cloud_plat_res_ckafka_conflow_linechart" class="detail_line_chart"></div>
  29 + </div>
  30 + <div class="lay-row-item">
  31 + <h5 class="lay-row-title">生产条数</h5>
  32 + <div id="tencent_cloud_plat_res_ckafka_procount_linechart" class="detail_line_chart"></div>
  33 + </div>
  34 + </div>
  35 + <div class="lay-row">
  36 + <div class="lay-row-item">
  37 + <h5 class="lay-row-title">消费条数</h5>
  38 + <div id="tencent_cloud_plat_res_ckafka_concount_linechart" class="detail_line_chart"></div>
  39 + </div>
  40 + <div class="lay-row-item">
  41 + <h5 class="lay-row-title">已占用磁盘容量</h5>
  42 + <div id="tencent_cloud_plat_res_ckafka_msgheap_linechart" class="detail_line_chart"></div>
  43 + </div>
  44 + <div class="lay-row-item">
  45 + <h5 class="lay-row-title">落盘消息条数</h5>
  46 + <div id="tencent_cloud_plat_res_ckafka_msgcount_linechart" class="detail_line_chart"></div>
  47 + </div>
  48 + </div>
  49 + <div class="lay-row">
  50 + <div class="lay-row-item">
  51 + <h5 class="lay-row-title">生产峰值带宽</h5>
  52 + <div id="tencent_cloud_plat_res_ckafka_maxproflow_linechart" class="detail_line_chart"></div>
  53 + </div>
  54 + <div class="lay-row-item">
  55 + <h5 class="lay-row-title">消费峰值带宽</h5>
  56 + <div id="tencent_cloud_plat_res_ckafka_maxconflow_linechart" class="detail_line_chart"></div>
  57 + </div>
  58 + <div class="lay-row-item">
  59 + <h5 class="lay-row-title">磁盘使用率</h5>
  60 + <div id="tencent_cloud_plat_res_ckafka_diskusage_linechart" class="detail_line_chart"></div>
  61 + </div>
  62 + </div>
  63 + <div class="lay-row">
  64 + <div class="lay-row-item">
23 <h5 class="lay-row-title">实时告警动态</h5> 65 <h5 class="lay-row-title">实时告警动态</h5>
24 <div id="tencent_cloud_plat_res_ckafka_active_alarm"></div> 66 <div id="tencent_cloud_plat_res_ckafka_active_alarm"></div>
25 </div> 67 </div>
@@ -27,27 +27,31 @@ @@ -27,27 +27,31 @@
27 <h5 class="lay-row-title">计算资源信息</h5> 27 <h5 class="lay-row-title">计算资源信息</h5>
28 <ul class="info-table" id="tencent_cloud_plat_virtualhost_comresinfo"></ul> 28 <ul class="info-table" id="tencent_cloud_plat_virtualhost_comresinfo"></ul>
29 </div> 29 </div>
30 - <div class="lay-row-item">  
31 - <h5 class="lay-row-title">存储资源信息</h5>  
32 - <ul class="info-table" id="tencent_cloud_plat_virtualhost_storesinfo"></ul>  
33 - </div>  
34 - </div>  
35 - <div class="lay-row"> 30 +<!-- <div class="lay-row-item">-->
  31 +<!-- <h5 class="lay-row-title">存储资源信息</h5>-->
  32 +<!-- <ul class="info-table" id="tencent_cloud_plat_virtualhost_storesinfo"></ul>-->
  33 +<!-- </div>-->
36 <div class="lay-row-item"> 34 <div class="lay-row-item">
37 <h5 class="lay-row-title">CPU使用率</h5> 35 <h5 class="lay-row-title">CPU使用率</h5>
38 <div id="tencent_cloud_plat_virtualhost_cpu_linechart" class="detail_line_chart"></div> 36 <div id="tencent_cloud_plat_virtualhost_cpu_linechart" class="detail_line_chart"></div>
39 </div> 37 </div>
  38 + </div>
  39 + <div class="lay-row">
40 <div class="lay-row-item"> 40 <div class="lay-row-item">
41 <h5 class="lay-row-title">内存使用率</h5> 41 <h5 class="lay-row-title">内存使用率</h5>
42 <div id="tencent_cloud_plat_virtualhost_mem_linechart" class="detail_line_chart"></div> 42 <div id="tencent_cloud_plat_virtualhost_mem_linechart" class="detail_line_chart"></div>
43 </div> 43 </div>
44 <div class="lay-row-item"> 44 <div class="lay-row-item">
45 - <h5 class="lay-row-title">硬盘读流量</h5>  
46 - <div id="tencent_cloud_plat_virtualhost_readflow_linechart" class="detail_line_chart"></div> 45 + <h5 class="lay-row-title">内存使用量</h5>
  46 + <div id="tencent_cloud_plat_virtualhost_memused_linechart" class="detail_line_chart"></div>
  47 + </div>
  48 + <div class="lay-row-item">
  49 + <h5 class="lay-row-title">内网出带宽</h5>
  50 + <div id="tencent_cloud_plat_virtualhost_outtraffic_linechart" class="detail_line_chart"></div>
47 </div> 51 </div>
48 <div class="lay-row-item"> 52 <div class="lay-row-item">
49 - <h5 class="lay-row-title">硬盘写流量</h5>  
50 - <div id="tencent_cloud_plat_virtualhost_writeflow_linechart" class="detail_line_chart"></div> 53 + <h5 class="lay-row-title">内网入带宽</h5>
  54 + <div id="tencent_cloud_plat_virtualhost_intraffic_linechart" class="detail_line_chart"></div>
51 </div> 55 </div>
52 </div> 56 </div>
53 <div class="lay-row"> 57 <div class="lay-row">