diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_ckafka.js b/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_ckafka.js index 792f0c2..77efbb9 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_ckafka.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_ckafka.js @@ -14,7 +14,7 @@ layui.define(['commonDetail','common'], function (exports) { commonDetail.bindTips(); //基本信息指标 - var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIA1CFDB4B,KPI2DC9105C,KPI39C76443,KPIECA37CB0,KPI1782D6AF,KPI352DE256"; + var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI97AF9A47,KPI2DC9105C,KPI39C76443,KPIECA37CB0,KPI1782D6AF,KPI352DE256"; //关键信息指标 var keyKpi = "KPI86DF5046,KPID2DBDD50,KPIBAA7E176,KPI19832098,KPI91C252FE,KPI8546BDCF"; @@ -28,6 +28,24 @@ layui.define(['commonDetail','common'], function (exports) { commonDetail.renderText("tencent_cloud_plat_res_ckafka_baseinfo",resId,baseKpi); //关键信息 commonDetail.renderText("tencent_cloud_plat_res_ckafka_keyinfo",resId,keyKpi); + //生产流量 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_proflow_linechart",resId,"KPI7054BC34","生产流量","instance_pro_flow"); + //消费流量 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_conflow_linechart",resId,"KPI82861CEA","消费流量","instance_con_flow"); + //生产条数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_procount_linechart",resId,"KPI17105DEB","生产条数","instance_pro_count"); + //消费条数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_concount_linechart",resId,"KPI82C17DBD","消费条数","instance_con_count"); + //已占用磁盘容量 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_msgheap_linechart",resId,"KPI34D78BC0","已占用磁盘容量","instance_msg_heap"); + //落盘消息条数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_msgcount_linechart",resId,"KPI5687314E","落盘消息条数","instance_msg_count"); + //生产峰值带宽 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_maxproflow_linechart",resId,"KPI9680D964","生产峰值带宽","instance_max_pro_flow"); + //消费峰值带宽 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_maxconflow_linechart",resId,"KPI7A1D5F3E","消费峰值带宽","instance_max_con_flow"); + //磁盘使用率 + commonDetail.renderLineCharat("tencent_cloud_plat_res_ckafka_diskusage_linechart",resId,"KPI2C8A6D17","磁盘使用率","instance_disk_usage"); //活动告警 commonDetail.renderActiveAlarms("tencent_cloud_plat_res_ckafka_active_alarm",resId); } diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_redis.js b/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_redis.js index bba2298..9350131 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_redis.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_redis.js @@ -14,13 +14,13 @@ layui.define(['commonDetail','common'], function (exports) { commonDetail.bindTips(); //基本信息指标 - var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIA1CFDB4B,KPI2DC9105C,KPI39C76443,KPIE13DD9A3"; + var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI97AF9A47,KPI2DC9105C,KPI39C76443"; //关键信息指标 var keyKpi = "KPI86DF5046,KPIFDF953D6,KPI4D0D4345,KP152C7778F,KPI7054BC34,KPI31CB8D97,KPI592C5FCA"; //实例信息指标 var instanceKpi = "KP11782D6AF,KPI352DE256,KPI39C76443,KPI7BB10A71,KPI1AEA4DE2,KPIECA37CB0,KPID9507511,KPIE035F0E7,KPIADAC3034,KPIC29F4C6B,KPIE349B543"; //性能信息指标 - var performanceKpi = "KPI4576847F,KPIB429CC99,KPI06DE7A71,KPI2C626FF6,KPIFC03301B"; + var performanceKpi = "KPI4576847F,KPIB429CC99,KPI06DE7A71,KPI2C626FF6,KPI9021D939"; reload(); @@ -41,9 +41,9 @@ layui.define(['commonDetail','common'], function (exports) { //内存使用率趋势图 commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_mem_linechart",resId,"KPI31CB8D97","内存使用率","mem"); //入流量趋势图 - commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_indata_linechart",resId,"KPI4576847F","入流量","flow"); + commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_indata_linechart",resId,"KPI4576847F","入流量","in_flow"); //出流量趋势图 - commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_outdata_linechart",resId,"KPIB429CC99","出流量","flow"); + commonDetail.renderLineCharat("tencent_cloud_plat_res_redis_outdata_linechart",resId,"KPIB429CC99","出流量","out_flow"); //活动告警 commonDetail.renderActiveAlarms("tencent_cloud_plat_res_redis_active_alarm",resId); } diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_tdsqlmysql.js b/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_tdsqlmysql.js index 7fe470a..45d61ca 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_tdsqlmysql.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_res_tdsqlmysql.js @@ -14,7 +14,7 @@ layui.define(['commonDetail','common'], function (exports) { commonDetail.bindTips(); //基本信息指标 - var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIA1CFDB4B,KPIECA37CB0,KPI917712A8,KPIEB82A68C"; + var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI97AF9A47,KPIECA37CB0,KPI917712A8,KPIEB82A68C"; //关键信息指标 var keyKpi = "KPI86DF5046,KPID1029770,KPI1584BE1C,KPICB805B91"; //网络信息指标 @@ -42,6 +42,30 @@ layui.define(['commonDetail','common'], function (exports) { commonDetail.renderText("tencent_cloud_plat_res_tdsqlmysql_dbinfo",resId,dbKpi); //DCN信息 commonDetail.renderText("tencent_cloud_plat_res_tdsqlmysql_dcninfo",resId,dcnKpi); + //客户端总连接数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_ClientConnTotal_linechart",resId,"KPIC29F4C6B","客户端总连接数","ClientConnTotal"); + //当前打开连接数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_ThreadsConnected_linechart",resId,"KPI01BF252B","当前打开连接数","ThreadsConnected"); + //汇总活跃线程数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_ActiveThreadCount_linechart",resId,"KPI8639CBAC","汇总活跃线程数","ActiveThreadCount"); + //最大DB连接使用率 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_ConnUsageRate_linechart",resId,"KPI70233F69","最大DB连接使用率","ConnUsageRate"); + //SQL总数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_SQLTotal_linechart",resId,"KPI402F24E8","SQL总数","SQLTotal"); + //SQL错误数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_ErrorSQLTotal_linechart",resId,"KPID74AF81B","SQL错误数","ErrorSQLTotal"); + //SQL成功数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_SuccessSQLTotal_linechart",resId,"KPI1920354A","SQL成功数","SuccessSQLTotal"); + //主从切换数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_MasterSwitchedTotal_linechart",resId,"KPIED3B1BD1","主从切换数","MasterSwitchedTotal"); + //耗时小于5ms请求数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_TimeRange0_linechart",resId,"KPI83D31951","耗时小于5ms请求数","TimeRange0"); + //耗时大于30ms请求数 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_TimeRange3_linechart",resId,"KPID1286BCB","耗时大于30ms请求数","TimeRange3"); + //最大主节点CPU利用率 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_CpuUsageRate_linechart",resId,"KPI6A52D0F7","最大主节点CPU利用率","CpuUsageRate"); + //最大主节点IO利用率 + commonDetail.renderLineCharat("tencent_cloud_plat_res_tdsqlmysql_IOUsageRate_linechart",resId,"KPI34BF4434","最大主节点IO利用率","IOUsageRate"); //分片信息 commonDetail.renderTable("tencent_cloud_plat_res_tdsqlmysql_shard",false,resId,shardKpi,"分片信息","shard-"); //活动告警 diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_virtualhost.js b/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_virtualhost.js index ce1b8e7..5bc5f1b 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_virtualhost.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/tencent_cloud_plat_virtualhost.js @@ -42,16 +42,18 @@ layui.define(['commonDetail','common'], function (exports) { commonDetail.renderText("tencent_cloud_plat_virtualhost_netresinfo",resId,netresKpi); //计算资源信息 commonDetail.renderText("tencent_cloud_plat_virtualhost_comresinfo",resId,comresKpi); - //存储资源信息 - commonDetail.renderText("tencent_cloud_plat_virtualhost_storesinfo",resId,storesKpi); + //存储资源信息 (因为暂未采集到,屏蔽) + // commonDetail.renderText("tencent_cloud_plat_virtualhost_storesinfo",resId,storesKpi); //cpu使用率趋势图 commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_cpu_linechart",resId,"KPI7054BC34","CPU使用率","cpu"); //内存使用率趋势图 commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_mem_linechart",resId,"KPI31CB8D97","内存使用率","mem"); - //硬盘读流量 - commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_readflow_linechart",resId,"KPICF4940F7","硬盘读流量","disk_read_traffic"); - //硬盘写流量 - commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_writeflow_linechart",resId,"KPI6C16A077","硬盘写流量","disk_write_traffic"); + //内存使用量趋势图 + commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_memused_linechart",resId,"KPI592C5FCA","内存使用量","mem_used"); + //内网出带宽 + commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_outtraffic_linechart",resId,"KPI73562B2B","内网出带宽","outtraffic"); + //内网入带宽 + commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_intraffic_linechart",resId,"KPI0EDB5CF2","内网入带宽","intraffic"); //数据磁盘信息 commonDetail.renderTable("tencent_cloud_plat_virtualhost_dataDisk",false,resId,dataDiskKpi,"数据磁盘信息","dataDisk-"); //系统盘信息 diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_res_ckafka.html b/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_res_ckafka.html index d5e4f65..1418bc8 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_res_ckafka.html +++ b/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_res_ckafka.html @@ -20,6 +20,48 @@ </div> <div class="lay-row"> <div class="lay-row-item"> + <h5 class="lay-row-title">生产流量</h5> + <div id="tencent_cloud_plat_res_ckafka_proflow_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">消费流量</h5> + <div id="tencent_cloud_plat_res_ckafka_conflow_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">生产条数</h5> + <div id="tencent_cloud_plat_res_ckafka_procount_linechart" class="detail_line_chart"></div> + </div> + </div> + <div class="lay-row"> + <div class="lay-row-item"> + <h5 class="lay-row-title">消费条数</h5> + <div id="tencent_cloud_plat_res_ckafka_concount_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">已占用磁盘容量</h5> + <div id="tencent_cloud_plat_res_ckafka_msgheap_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">落盘消息条数</h5> + <div id="tencent_cloud_plat_res_ckafka_msgcount_linechart" class="detail_line_chart"></div> + </div> + </div> + <div class="lay-row"> + <div class="lay-row-item"> + <h5 class="lay-row-title">生产峰值带宽</h5> + <div id="tencent_cloud_plat_res_ckafka_maxproflow_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">消费峰值带宽</h5> + <div id="tencent_cloud_plat_res_ckafka_maxconflow_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">磁盘使用率</h5> + <div id="tencent_cloud_plat_res_ckafka_diskusage_linechart" class="detail_line_chart"></div> + </div> + </div> + <div class="lay-row"> + <div class="lay-row-item"> <h5 class="lay-row-title">实时告警动态</h5> <div id="tencent_cloud_plat_res_ckafka_active_alarm"></div> </div> diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_res_tdsqlmysql.html b/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_res_tdsqlmysql.html index cd68247..71840ab 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_res_tdsqlmysql.html +++ b/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_res_tdsqlmysql.html @@ -34,6 +34,60 @@ </div> <div class="lay-row"> <div class="lay-row-item"> + <h5 class="lay-row-title">客户端总连接数</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_ClientConnTotal_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">当前打开连接数</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_ThreadsConnected_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">汇总活跃线程数</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_ActiveThreadCount_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">最大DB连接使用率</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_ConnUsageRate_linechart" class="detail_line_chart"></div> + </div> + </div> + <div class="lay-row"> + <div class="lay-row-item"> + <h5 class="lay-row-title">SQL总数</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_SQLTotal_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">SQL错误数</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_ErrorSQLTotal_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">SQL成功数</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_SuccessSQLTotal_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">主从切换数</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_MasterSwitchedTotal_linechart" class="detail_line_chart"></div> + </div> + </div> + <div class="lay-row"> + <div class="lay-row-item"> + <h5 class="lay-row-title">耗时小于5ms请求数</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_TimeRange0_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">耗时大于30ms请求数</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_TimeRange3_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">最大主节点CPU利用率</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_CpuUsageRate_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">最大主节点IO利用率</h5> + <div id="tencent_cloud_plat_res_tdsqlmysql_IOUsageRate_linechart" class="detail_line_chart"></div> + </div> + </div> + <div class="lay-row"> + <div class="lay-row-item"> <h5 class="lay-row-title">分片信息<span id="tencent_cloud_plat_res_tdsqlmysql_shardDownload" class="layui-table-link" style="margin-left: 10px;">下载</span><span id="tencent_cloud_plat_res_tdsqlmysql_shardMore" class="layui-table-link">更多</span></h5> <div id="tencent_cloud_plat_res_tdsqlmysql_shard"></div> </div> diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_virtualhost.html b/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_virtualhost.html index f713d06..b50b247 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_virtualhost.html +++ b/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/tencent_cloud_plat_virtualhost.html @@ -27,27 +27,31 @@ <h5 class="lay-row-title">计算资源信息</h5> <ul class="info-table" id="tencent_cloud_plat_virtualhost_comresinfo"></ul> </div> - <div class="lay-row-item"> - <h5 class="lay-row-title">存储资源信息</h5> - <ul class="info-table" id="tencent_cloud_plat_virtualhost_storesinfo"></ul> - </div> - </div> - <div class="lay-row"> +<!-- <div class="lay-row-item">--> +<!-- <h5 class="lay-row-title">存储资源信息</h5>--> +<!-- <ul class="info-table" id="tencent_cloud_plat_virtualhost_storesinfo"></ul>--> +<!-- </div>--> <div class="lay-row-item"> <h5 class="lay-row-title">CPU使用率</h5> <div id="tencent_cloud_plat_virtualhost_cpu_linechart" class="detail_line_chart"></div> </div> + </div> + <div class="lay-row"> <div class="lay-row-item"> <h5 class="lay-row-title">内存使用率</h5> <div id="tencent_cloud_plat_virtualhost_mem_linechart" class="detail_line_chart"></div> </div> <div class="lay-row-item"> - <h5 class="lay-row-title">硬盘读流量</h5> - <div id="tencent_cloud_plat_virtualhost_readflow_linechart" class="detail_line_chart"></div> + <h5 class="lay-row-title">内存使用量</h5> + <div id="tencent_cloud_plat_virtualhost_memused_linechart" class="detail_line_chart"></div> + </div> + <div class="lay-row-item"> + <h5 class="lay-row-title">内网出带宽</h5> + <div id="tencent_cloud_plat_virtualhost_outtraffic_linechart" class="detail_line_chart"></div> </div> <div class="lay-row-item"> - <h5 class="lay-row-title">硬盘写流量</h5> - <div id="tencent_cloud_plat_virtualhost_writeflow_linechart" class="detail_line_chart"></div> + <h5 class="lay-row-title">内网入带宽</h5> + <div id="tencent_cloud_plat_virtualhost_intraffic_linechart" class="detail_line_chart"></div> </div> </div> <div class="lay-row">