Index: /branches/amp_3_7/extensions/monitoring/webui/monitoring.service.js =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/monitoring.service.js (revision 2462) +++ /branches/amp_3_7/extensions/monitoring/webui/monitoring.service.js (working copy) @@ -125,3 +125,4 @@ } } ]); + Index: /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb.controller.js =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb.controller.js (revision 0) +++ /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb.controller.js (working copy) @@ -0,0 +1,216 @@ +angular.module('cm.resource') + .controller('monitorLLBController', [ + '$scope', + '$rootScope', + '$state', + '$stateParams', + '$location', + '$uibModal', + '$filter', + 'monitoringService', + 'monitorResourceService', + 'dashboardService', + 'localStorageService', + 'roleMgmtService', + function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $filter, monitoringService, monitorResourceService, dashboardService, localStorageService, roleMgmtService) { + $rootScope.title = 'LLB Statistics'; + $scope.role_info = localStorageService.getWebStorage('role_info'); + var serviceViewModel = this; + + $scope.currentPageIndex = 1; + $scope.pageSize = 15; + $scope.onPageChange = function (newPage) { + $scope.currentPageIndex = newPage; + }; + + $scope.multiSelectData = [ + {id: 1, label: $filter('T')("Sessions Number")}, + {id: 2, label: $filter('T')("Certificate Status")}, + ]; + + var columnVisible = localStorageService.getWebStorage("TABLE_CUSTOM_COLUMN_VISIBLE"); + if (!columnVisible) { + columnVisible = {}; + } + if (columnVisible.llbMonitor) { + $scope.multiSelectModel = columnVisible.llbMonitor; + } else { + $scope.multiSelectModel = [{id: 1}]; + } + $scope.multiSelectSettings = { + showCheckAll: false, + showUncheckAll: false + }; + + $scope.multiSelectTransition = { + 'buttonDefaultText': $filter('T')('Displayed Items'), + 'dynamicButtonTextSuffix': $filter('T')('Displayed') + }; + + $scope.multiSelectEvents = { + onItemSelect: function (item) { + columnVisible.llbMonitor = $scope.multiSelectModel + localStorageService.setWebStorage("TABLE_CUSTOM_COLUMN_VISIBLE", columnVisible); + setValue(item, true); + }, + onItemDeselect: function (item) { + columnVisible.llbMonitor = $scope.multiSelectModel + localStorageService.setWebStorage("TABLE_CUSTOM_COLUMN_VISIBLE", columnVisible); + setValue(item, false); + }, + onInitDone: function () { + $.each($scope.multiSelectModel, function (index, item) { + setValue(item, true); + }); + } + }; + + function setValue(item, isSelected) { + if (item == undefined || item == "") { + return; + } + if (isSelected) { + serviceViewModel.gridColSpan += 1; + } else { + serviceViewModel.gridColSpan -= 1; + } + switch (item.id) { + case 1: + $scope.session_selected = isSelected; + break; + case 2: + $scope.cert_selected = isSelected; + break; + default: + console.log('not support ,selected'); + } + } + + serviceViewModel.gridColSpan = 7; + + let get_vpn_ssl_cert = function () { + let roleId = $scope.role_info.role_id; + if (roleId === null) { + roleId = '0'; + } + serviceViewModel.vpn_ssl_cert_map = undefined; + let vpn_ssl_cert_map = {}; + monitorResourceService.get_vpn_ssl_cert(roleId).then(function (res) { + if (res && res.status === 200) { + if (res.data.state) { + _.each(res.data.data, function (cert) { + vpn_ssl_cert_map[cert.device_name + '-' + cert.service_name] = cert + }) + serviceViewModel.vpn_ssl_cert_map = vpn_ssl_cert_map + } else { + $rootScope.TipService.setMessage(res.data.data); + } + } else { + $rootScope.TipService.setMessage($filter("T")("Internal server error")); + } + }) + }; + get_vpn_ssl_cert(); + + serviceViewModel.cert_status = function (service) { + if (!serviceViewModel.vpn_ssl_cert_map) { + return 'Loading' + } + var cert = serviceViewModel.vpn_ssl_cert_map[service.device.name + '-' + service.name] + if (cert) { + return cert.cert_status + } + return '' + }; + + serviceViewModel.exp_time = function (service) { + if (!serviceViewModel.vpn_ssl_cert_map) { + return '' + } + var cert = serviceViewModel.vpn_ssl_cert_map[service.device.name + '-' + service.name] + if (cert) { + return cert.exp_time + } + return '' + }; + + serviceViewModel.concurrentConnections = 0; + serviceViewModel.totalHits = 0; + + serviceViewModel.refresh = function () { + serviceViewModel.loading = true; + let agentHost = ''; + let isDeviceAdmin = $scope.role_info.role_id !== null && $scope.role_info.role_id !== '0'; + let llbList = []; + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (resp) { + let deviceMap = {} + resp.data[1]['result'].forEach(function (deviceGroup) { + let agentHost = ''; + _.each(deviceGroup['device_list'], function (host) { + deviceMap[host.ip] = host; + if (agentHost === '') { + agentHost = agentHost + '/' + host.ip; + } else { + agentHost = agentHost + '|' + host.ip; + } + }) + }); + if (agentHost !== '') agentHost += '/'; + let payload = {} + if (isDeviceAdmin) { + payload['query'] = { + "agent_host": agentHost + } + } + if ((isDeviceAdmin && agentHost !== '') || !isDeviceAdmin) { + dashboardService.getLLBStatistics(payload).then(function (res) { + serviceViewModel.loading = false; + if (res && res.status === 200) { + if (res.data.results.length > 0) { + _.each(res.data.results[0].series, function (series) { + let device_ip = series.tags.agent_host; + if (deviceMap[device_ip]) { + _.each(series.values, function (data) { + let thresholdValue = parseInt(data[2]); + thresholdValue = formatBytes(thresholdValue * 1024); // Threshold value in kbps + llbList.push({ + "deviceIp": series.tags.agent_host, + "linkName": series.tags.linkName, + "linkGateway": data[1], + "linkStatus": series.tags.linkStatus, + "linkThresh": thresholdValue, + "linkUsage": data[3], + "linkBandwidIn": data[4], + "linkBandwidOut": data[5], + "linkConn": data[6], + "linkHits": data[7], + }) + serviceViewModel.concurrentConnections += data[6]; + serviceViewModel.totalHits += data[7]; + }) + } + }) + } + serviceViewModel.llbList = llbList; + } + }); + } else { + serviceViewModel.loading = false; + } + }) + } + + function formatBytes(bytes, decimals = 2) { + if (!+bytes) return '0 bps' + const k = 1024; + const dm = decimals < 0 ? 0 : decimals + const sizes = ['bps', 'Kbps', 'Mbps', 'Gbps', 'Tbps'] + const i = Math.floor(Math.log(bytes) / Math.log(k)) + return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}` + } + + serviceViewModel.refresh(); + } + ]) + + Index: /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb.html (revision 0) +++ /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb.html (working copy) @@ -0,0 +1,134 @@ +
+
+
+
+
+
+
+ +
+
+
+
+
{{'Concurrent Connections'|T}}
+
{{monitorLLB.concurrentConnections}}
+
+
+
+
+
+
+ +
+
+
+
+
{{'Total Hits'|T}}
+
{{monitorLLB.totalHits}}
+
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No.{{ 'Name' | T }}{{ 'Gateway IP' | T }}{{ 'Device IP' | T }}{{ 'Status' | T }}{{ 'Bandwidth Usage' | T }}{{ 'Connections & Hits' | T }}
+ + + + + + + +
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ item.linkName }}{{ item.linkGateway }}{{ item.deviceIp }}{{ item.linkStatus }}Threshold: {{item.linkThresh}}
Usage: + {{ item.linkUsage }} %		Connections: {{ item.linkConn }}
Hits: + {{ item.linkHits }}
{{ 'You + do not have any LLB information.' | T }} +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ + + Index: /branches/amp_3_7/extensions/monitoring/webui/resource/resource.html =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/resource/resource.html (revision 2462) +++ /branches/amp_3_7/extensions/monitoring/webui/resource/resource.html (working copy) @@ -10,6 +10,9 @@
  • {{ 'SSLVPN Services' | T }}
    • +
  • + {{ 'Link Statistics' | T }} +
    • @@ -17,4 +20,6 @@
    +
    + Index: /branches/amp_3_7/extensions/monitoring/webui/resource/resource.module.js =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/resource/resource.module.js (revision 2462) +++ /branches/amp_3_7/extensions/monitoring/webui/resource/resource.module.js (working copy) @@ -146,6 +146,22 @@ label: '{{current_service_name}}' } }); + + $stateProvider + .state('index.monitoring.resource.llb', { + url: '^/monitoring/resource/llb', + views: { + 'llb@index.monitoring.resource': { + templateUrl: 'app/modules/extensions/monitoring/resource/llb/llb.html', + controller: 'monitorLLBController', + controllerAs: 'monitorLLB' + } + }, + ncyBreadcrumb: { + label: '{{ "LLB Statistics" | T }}' + } + }) }]); -angular.module("cmApp").requires.push('cm.resource'); \ No newline at end of file +angular.module("cmApp").requires.push('cm.resource'); + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/dashboard.service.js =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/dashboard.service.js (revision 2462) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/dashboard.service.js (working copy) @@ -10,7 +10,9 @@ getAllVirtualService: getAllVirtualService, getAllVirtualSite: getAllVirtualSite, checkLicenseExpire: checkLicenseExpire, - composer_query: composer_query + composer_query: composer_query, + getLLBStatistics: getLLBStatistics, + getLLBMonitoringStatistics: getLLBMonitoringStatistics, }; function get_composer_data(url, data) { return apiService.post2(url, data); @@ -40,5 +42,14 @@ function composer_query(payload) { return apiService.post2('/composer_query', JSON.stringify(payload), { headers: { 'Content-Type': 'application/json' } }); } + + function getLLBStatistics(payload) { + return apiService.post2('/llb/stats', JSON.stringify(payload), { headers: { 'Content-Type': 'application/json' } }); + } + + function getLLBMonitoringStatistics(payload) { + return apiService.post2('/llb/monitoring_data', JSON.stringify(payload), { headers: { 'Content-Type': 'application/json' } }); + } } ]); + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.controller.js =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.controller.js (revision 2462) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.controller.js (working copy) @@ -100,6 +100,10 @@ { "name": "sslvpn_service", "verbose_name": "SSLVPN Service" + }, + { + "name": "llb", + "verbose_name": "LLB Insights" } ] @@ -118,6 +122,8 @@ getRealMonitoringData() } else if (overviewModel.tab === "sslvpn_service") { getSSLVPNMonitoringData() + } else if (overviewModel.tab === "llb") { + getLLBMonitoringData() } } } @@ -247,6 +253,50 @@ }); } + overviewModel.llbLists = { + hitsList: [], + connectionsList: [], + LLBThroughputList: [] + } + + let getLLBMonitoringData = function () { + overviewModel.llbLoading = true; + let payload = {} + if($scope.isDeviceAdmin) { + payload['query'] = { + "agent_host": overviewModel.agentHost + } + } + dashboardService.getLLBMonitoringStatistics(payload).then(function (res) { + overviewModel.llbLoading = false; + if (res && res.status === 200) { + var hitsList = [] + if (res.data.results[0].series) { + _.each(res.data.results[0].series[0].values, function (value) { + hitsList.push({ + 'hits': value[1], + 'name': value[2], + 'device_ip': value[3], + }) + }) + } + overviewModel.llbLists.hitsList = hitsList; + + var connectionsList = [] + if (res.data.results[1].series) { + _.each(res.data.results[1].series[0].values, function (value) { + connectionsList.push({ + 'connections': value[1], + 'name': value[2], + 'device_ip': value[3], + }) + }) + } + overviewModel.llbLists.connectionsList = connectionsList + } + }); + } + overviewModel.rsLists = { rsCntOfReqList: [], rsConnPerSecList: [], @@ -857,3 +907,4 @@ }; }]) + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.html (revision 2462) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.html (working copy) @@ -456,51 +456,65 @@ - - - - +
    @@ -584,4 +598,5 @@ line-height: 60px; font-size: 26px; } - \ No newline at end of file + +