monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit cdd8ca6f1803df5ac6bfcbcbff76ab22c9b14705 2 parents c37bf317 86040b97

Merge branch 'master-V32-XuHaoJie' into 'master' 

通用-资源视图-添加华为云和阿里云配置列  通用-资源视图-pc服务器下探问题



See merge request !6
Inline Side-by-side
Showing 2 changed files with 53 additions and 1 deletions
@@ -671,7 +671,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -671,7 +671,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
671 resType = 'X86SERVER_BMC'; 671 resType = 'X86SERVER_BMC';
672 } 672 }
673 //如果是HOST_X86SERVER服务器并且协议为snmp，或共享存储则根据厂商和型号判断类型 673 //如果是HOST_X86SERVER服务器并且协议为snmp，或共享存储则根据厂商和型号判断类型
674 - if (resType.indexOf("HOST_X86SERVER") !== -1 || resType.indexOf("STORAGE_SHARE") != -1) { 674 + if ((resType.indexOf("HOST_X86SERVER") !== -1 && protocol =='SNMP') || resType.indexOf("STORAGE_SHARE") != -1) {
675 resType = this.detailPathByProviderAndModel(resType,resId); 675 resType = this.detailPathByProviderAndModel(resType,resId);
676 } 676 }
677 //如果是虚拟化相关资源类型，则根据采集协议判断去那个页面 677 //如果是虚拟化相关资源类型，则根据采集协议判断去那个页面
@@ -2517,6 +2517,58 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -2517,6 +2517,58 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
2517 {field: 'lastColTime', title: '最近采集时间', minWidth: x_170, align: 'center', sort: true}, 2517 {field: 'lastColTime', title: '最近采集时间', minWidth: x_170, align: 'center', sort: true},
2518 {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_120, templet: '#linkStateTpl', sort: true} 2518 {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_120, templet: '#linkStateTpl', sort: true}
2519 ], 2519 ],
  2520 + "HUAWEI_CLOUD_PLAT":[
  2521 + {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
  2522 + {
  2523 + field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
  2524 + templet: '#resindex_resName'
  2525 + },
  2526 + {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'},
  2527 + // {field: 'diskSize', title: '磁盘总大小', minWidth: 120, align: 'center'},
  2528 + {field: 'fileSysUseRate', title: '文件系统使用率(最大)', align: 'center', minWidth: x_185, templet: '#fileUseRateTpl', sort: true},
  2529 + {field: 'diskBusyRate', title: '磁盘繁忙率(最大)', minWidth: x_160, align: 'center', sort: true, templet: '<div>{{d.diskBusyRate}}%</div>'},
  2530 + {field: 'cpuCores', title: '单个CPU核数', align: 'center', minWidth: x_140, sort: true, templet: '#cpuCoresTpl'},
  2531 + {field: 'cpuNum', title: '主机CPU总核数', align: 'center', minWidth: x_150, sort: true, templet: '#cpuNumTpl'},
  2532 + {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_120, templet: '#cpuRateTpl', sort: true},
  2533 + {field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
  2534 + {field: 'cacheUsed', title: '缓存总大小', align: 'center', minWidth: x_120, sort: true, templet: '<div>{{d.cacheUsed}} GB</div>'},
  2535 + {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_120, templet: '#memoryRateTpl', sort: true},
  2536 + {field: 'vmmemoryUseRate', title: '虚拟内存使用率', align: 'center', minWidth: x_165, templet: '#vmmemoryRateTpl', sort: true},
  2537 + {field: 'maxNetCardUpRate', title: '上行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardUpRate}} kb/s</div>'},
  2538 + {field: 'maxNetCardDownRate', title: '下行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardDownRate}} kb/s</div>'},
  2539 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
  2540 + {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true},
  2541 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  2542 + {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
  2543 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  2544 + {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
  2545 + ],
  2546 + "ALI_CLOUD_PLAT":[
  2547 + {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
  2548 + {
  2549 + field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
  2550 + templet: '#resindex_resName'
  2551 + },
  2552 + {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'},
  2553 + // {field: 'diskSize', title: '磁盘总大小', minWidth: 120, align: 'center'},
  2554 + {field: 'fileSysUseRate', title: '文件系统使用率(最大)', align: 'center', minWidth: x_185, templet: '#fileUseRateTpl', sort: true},
  2555 + {field: 'diskBusyRate', title: '磁盘繁忙率(最大)', minWidth: x_160, align: 'center', sort: true, templet: '<div>{{d.diskBusyRate}}%</div>'},
  2556 + {field: 'cpuCores', title: '单个CPU核数', align: 'center', minWidth: x_140, sort: true, templet: '#cpuCoresTpl'},
  2557 + {field: 'cpuNum', title: '主机CPU总核数', align: 'center', minWidth: x_150, sort: true, templet: '#cpuNumTpl'},
  2558 + {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_120, templet: '#cpuRateTpl', sort: true},
  2559 + {field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
  2560 + {field: 'cacheUsed', title: '缓存总大小', align: 'center', minWidth: x_120, sort: true, templet: '<div>{{d.cacheUsed}} GB</div>'},
  2561 + {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_120, templet: '#memoryRateTpl', sort: true},
  2562 + {field: 'vmmemoryUseRate', title: '虚拟内存使用率', align: 'center', minWidth: x_165, templet: '#vmmemoryRateTpl', sort: true},
  2563 + {field: 'maxNetCardUpRate', title: '上行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardUpRate}} kb/s</div>'},
  2564 + {field: 'maxNetCardDownRate', title: '下行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardDownRate}} kb/s</div>'},
  2565 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
  2566 + {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true},
  2567 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  2568 + {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
  2569 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  2570 + {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
  2571 + ],
2520 }, 2572 },
2521 //列点击事件 2573 //列点击事件
2522 colsClickEvent: function (editFlag) { 2574 colsClickEvent: function (editFlag) {