Index: /branches/amp_3_6_0_role/amp.spec =================================================================== --- /branches/amp_3_6_0_role/amp.spec (revision 2350) +++ /branches/amp_3_6_0_role/amp.spec (working copy) @@ -1,5 +1,5 @@ Name: amp -Version: 3.4.1.0 +Version: 3.6.0.1 Release: 1%{?dist} Summary: Array Management Platform Group: Development/Tools Index: /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/slb_service/slb/slb.controller.js =================================================================== --- /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/slb_service/slb/slb.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/slb_service/slb/slb.controller.js (working copy) @@ -10,10 +10,11 @@ 'deviceService', 'dashboardService', 'localStorageService', - function ($scope, $rootScope, $state, $stateParams, $location, $uibModal,$filter, deviceService, dashboardService, localStorageService) { + 'roleMgmtService', + function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $filter, deviceService, dashboardService, localStorageService, roleMgmtService) { $rootScope.title = 'SLB Service'; var serviceViewModel = this; - + $scope.role_info = localStorageService.getWebStorage('role_info'); $scope.currentPageIndex = 1; $scope.pageSize = 20; $scope.onPageChange = function (newPage) { @@ -26,7 +27,7 @@ if (serviceViewModel.serviceList === undefined) { return true; } - for(var i in serviceViewModel.all_loadings){ + for (var i in serviceViewModel.all_loadings) { if (!serviceViewModel.all_loadings[i]) { return false; } @@ -38,7 +39,7 @@ serviceViewModel.host_list = undefined; serviceViewModel.all_loadings = {}; serviceViewModel.serviceList = []; - getServiceList (); + getServiceList(); } } serviceViewModel.setDetail = function (device) { @@ -51,52 +52,67 @@ } var device_type_info = localStorageService.getWebStorage("device_type_info"); - function getServiceList () { - deviceService - .getDeviceList() - .then(function(res){ - if (res&&res.status === 200) { - serviceViewModel.host_list = res.data; - serviceViewModel.serviceList = []; - _.each(serviceViewModel.host_list, function(host) { - serviceViewModel.all_loadings[host.name] = false; - if (host.connection && device_type_info.ADC_TYPE_LIST.indexOf(host.type.toLowerCase()) != -1) { - dashboardService - .getAllVirtualService(host.id) - .then(function(res) { - serviceViewModel.all_loadings[host.name] = true; - if (res && res.status === 200 && res.data.VirtualService) { - _.each(res.data.VirtualService, function(data) { - // if (data.protocol == 'vlink') { - // return; - // } - var tmp = { - "name":data.service_name, - "type":data.protocol, - "device":host, - "ip":data.vip + + function getServiceList() { + serviceViewModel.serviceList = []; + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { + var device_type_info = localStorageService.getWebStorage("device_type_info"); + if (res && res.status === 200 && res.data instanceof Array) { + let data = res.data; + if (data.length > 1) { + try { + let deviceMap = data[1]['result']; + let device_list = []; + deviceMap.forEach(function (deviceGroup) { + deviceGroup['device_list'].forEach(function (device) { + device_list.push(device); + }) + }) + serviceViewModel.host_list = device_list; + _.each(serviceViewModel.host_list, function (host) { + serviceViewModel.all_loadings[host.name] = false; + if (host.connection && device_type_info.ADC_TYPE_LIST.indexOf(host.type.toLowerCase()) !== -1) { + dashboardService + .getAllVirtualService(host.id) + .then(function (res) { + serviceViewModel.all_loadings[host.name] = true; + if (res && res.status === 200 && res.data.VirtualService) { + _.each(res.data.VirtualService, function (data) { + // if (data.protocol == 'vlink') { + // return; + // } + var tmp = { + "name": data.service_name, + "type": data.protocol, + "device": host, + "ip": data.vip + } + serviceViewModel.serviceList.push(tmp); + }); + } else { + //error } - serviceViewModel.serviceList.push(tmp); }); - } else { - //error - } - }); - } else { - serviceViewModel.all_loadings[host.name] = true; - } - }); + } else { + serviceViewModel.all_loadings[host.name] = true; + } + }); + } catch (e) { + console.error('Error getRoleDeviceGroupMapping returned error.' + e); + serviceViewModel.serviceList = []; + } } - }); + } + }); } getServiceList(); serviceViewModel.detail = function (item) { var device_list = { - device_list : item.device, + device_list: item.device, vs: item.name, - vs_ip:item.ip + vs_ip: item.ip }; window.localStorage.__slbInfoDeviceList__ = JSON.stringify(device_list); }; Index: /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/audit.service.js =================================================================== --- /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/audit.service.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/audit.service.js (working copy) @@ -25,18 +25,14 @@ clearLog: clearLog }; - function getUserList(startstamp, endstamp) { + function getUserList(startstamp, endstamp, remoteIPs=[]) { var deferred = $q.defer(); var post_data = { "size": 0, "query": { "bool": { + "must": [{"terms": {"tag.remote_ip": remoteIPs}}], "filter": [ - // { - // "match_phrase": { - // "tag.logid": { "query": "200050021" } - // } - // }, { "range": { "@timestamp": { @@ -69,34 +65,13 @@ } } } - // "aggs": { - // "host_list": { - // "terms": { "field": "tag.remote_ip","size":0, }, - // "aggs": { - // "vsite_list": { - // "terms": { "field": "vpn.site" }, - // "aggs": { - // "user_list": { - // "terms": { - // "field": "vpn.user" - // }, - // "aggs": { - // "login_time": { - // "max": { "field": "@timestamp" } - // } - // } - // } - // } - // } - // } - // } - // } }; var post_data_login = { "size": 0, "query": { "bool": { + "must": [{"terms": {"tag.remote_ip": remoteIPs}}], "filter": [ { "match_phrase": { @@ -148,7 +123,6 @@ _.each(result["data"]["aggregations"]["host_list"]["buckets"], function (host_data) { _.each(host_data["vsite_list"]["buckets"], function (vs_data) { _.each(vs_data["user_list"]["buckets"], function (user_data) { - // var last_login_time = new Date(user_data["login_time"]["value"]).format('yyyy-mm-dd HH:MM:ss'); user_dict[host_data["key"] + '-' + vs_data["key"] + '-' + user_data["key"]] = { "host_name": host_data["key"], "vsite_name": vs_data["key"], @@ -156,13 +130,6 @@ "last_login_time": 'N/A', "last_login_timestamp": 0 } - // res["data"].push({ - // "host_name": host_data["key"], - // "vsite_name": vs_data["key"], - // "user_name": user_data["key"], - // "last_login_time": last_login_time, - // "last_login_timestamp": user_data["login_time"]["value"] - // }) }); }); }); @@ -674,13 +641,14 @@ function sort_by_times(a, b) { return b.times - a.times; } - function getUserTopRanking(data) { + function getUserTopRanking(data, remoteIPs=[]) { var post_data_l3 = { "size": 0, "query": { "bool": { "must": [ { "term": { "tag.logid": "200055002" } }, + {"terms": {"tag.remote_ip": remoteIPs}}, { "range": { "@timestamp": { @@ -729,6 +697,7 @@ "bool": { "must": [ { "term": { "tag.logid": "200055002" } }, + {"terms": {"tag.remote_ip": remoteIPs}}, { "range": { "@timestamp": { @@ -771,6 +740,7 @@ "bool": { "must": [ { "term": { "tag.logid": "200050021" } }, + {"terms": {"tag.remote_ip": remoteIPs}}, { "range": { "@timestamp": { @@ -810,6 +780,7 @@ "filter": { "bool": { "must": [ + {"terms": {"tag.remote_ip": remoteIPs}}, { "range": { "@timestamp": { @@ -859,6 +830,7 @@ "bool": { "must": [ { "term": { "tag.logid": "200055002" } }, + {"terms": {"tag.remote_ip": remoteIPs}}, { "range": { "@timestamp": { @@ -905,6 +877,7 @@ "filter": { "bool": { "must": [ + {"terms": {"tag.remote_ip": remoteIPs}}, { "range": { "@timestamp": { @@ -945,6 +918,7 @@ "bool": { "must": [ { "term": { "tag.logid": "200002221" } }, + {"terms": {"tag.remote_ip": remoteIPs}}, { "range": { "@timestamp": { @@ -1223,12 +1197,13 @@ return deferred.promise; } - function getDeviceList(startstamp, endstamp) { + function getDeviceList(startstamp, endstamp, remoteIPs=[]) { var deferred = $q.defer(); var post_data = { "size": 0, "query": { "bool": { + "must": [{"terms": {"tag.remote_ip": remoteIPs}}], "filter": [ { "match_phrase": { Index: /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/device/deviceList.controller.js =================================================================== --- /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/device/deviceList.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/device/deviceList.controller.js (working copy) @@ -7,7 +7,8 @@ '$filter', 'timeService', 'localStorageService', - function (userService, deviceService, $scope, $filter, timeService, localStorageService) { + 'roleMgmtService', + function (userService, deviceService, $scope, $filter, timeService, localStorageService, roleMgmtService) { $('#start').datetimepicker({ autoclose: true, @@ -19,7 +20,8 @@ }); var deviceListViewModel = this; deviceListViewModel.showHelpContent = false; - + $scope.role_info = localStorageService.getWebStorage('role_info'); + $scope.isDevicesLoaded = false; $scope.currentPageIndex = 1; $scope.pageSize = 15; $scope.onPageChange = function (newPage) { @@ -69,7 +71,9 @@ deviceListViewModel.startTime = start.format('yyyy-mm-dd HH:MM:ss'); deviceListViewModel.endTime = now.format('yyyy-mm-dd HH:MM:ss'); - deviceListViewModel.reload(); + if ($scope.isDevicesLoaded) { + deviceListViewModel.reload(); + } } deviceListViewModel.applyTimeRange = function () { @@ -87,43 +91,63 @@ } deviceListViewModel.refresh = function () { - if (deviceListViewModel.currentRange != 'custom') { + if (deviceListViewModel.currentRange !== 'custom') { deviceListViewModel.changeTimeGap(deviceListViewModel.currentRange) } else { - deviceListViewModel.reload() + deviceListViewModel.reload(); } } var device_load = false; var log_load = false; - deviceService.getDeviceList().then(function (res) { + deviceListViewModel.remoteIPs = []; + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { + deviceListViewModel.remoteIPs = []; if (res && res.status === 200) { - deviceListViewModel.deviceList = {}; - _.each(res.data, function (data) { - deviceListViewModel.deviceList[data["ip"]] = data; - }) - device_load = true; - if (log_load) { - _.each(deviceListViewModel.deviceInfoList_tmp, function (data) { - if (deviceListViewModel.deviceList[data["host_name"]]) { - data["device"] = { - "name": deviceListViewModel.deviceList[data["host_name"]].name, - "type": deviceListViewModel.deviceList[data["host_name"]].type, - "id": deviceListViewModel.deviceList[data["host_name"]].id, - "ip": deviceListViewModel.deviceList[data["host_name"]].ip, - "device_group": deviceListViewModel.deviceList[data["host_name"]].device_group, - }; - } else { - data["device"] = { - "name": '-', - "type": '-', - "id": '-', - "ip": '-', - "device_group": '-', - }; + try { + let data = res.data; + if (data.length > 1) { + let deviceGMap = data[1]['result']; + let device_list = []; + deviceGMap.forEach(function (deviceGroup) { + deviceGroup['device_list'].forEach(function (device) { + device_list.push(device); + deviceListViewModel.remoteIPs.push(device.ip); + }) + }) + deviceListViewModel.deviceList = {}; + _.each(device_list, function (data) { + deviceListViewModel.deviceList[data["ip"]] = data; + }) + device_load = true; + if (log_load) { + _.each(deviceListViewModel.deviceInfoList_tmp, function (data) { + if (deviceListViewModel.deviceList[data["host_name"]]) { + data["device"] = { + "name": deviceListViewModel.deviceList[data["host_name"]].name, + "type": deviceListViewModel.deviceList[data["host_name"]].type, + "id": deviceListViewModel.deviceList[data["host_name"]].id, + "ip": deviceListViewModel.deviceList[data["host_name"]].ip, + "device_group": deviceListViewModel.deviceList[data["host_name"]].device_group, + }; + } else { + data["device"] = { + "name": '-', + "type": '-', + "id": '-', + "ip": '-', + "device_group": '-', + }; + } + }) + deviceListViewModel.deviceInfoList = deviceListViewModel.deviceInfoList_tmp; } - }) - deviceListViewModel.deviceInfoList = deviceListViewModel.deviceInfoList_tmp; + $scope.isDevicesLoaded = true; + deviceListViewModel.reload(); + } + } catch (error) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); } } }); @@ -140,7 +164,7 @@ var startstamp = new Date(deviceListViewModel.startTime.replace(/-/g, "/")).getTime(); var endstamp = new Date(deviceListViewModel.endTime.replace(/-/g, "/")).getTime(); - userService.getDeviceList(startstamp, endstamp).then(function (res) { + userService.getDeviceList(startstamp, endstamp, deviceListViewModel.remoteIPs).then(function (res) { deviceListViewModel.loading = false; if (res && res.status === 200) { log_load = true; @@ -175,12 +199,14 @@ if (localStorageService.getWebStorage('timeRange')) { var timeRange = localStorageService.getWebStorage('timeRange'); deviceListViewModel.currentRange = timeRange.currentRange; - if (timeRange.currentRange != 'custom') { + if (timeRange.currentRange !== 'custom') { deviceListViewModel.changeTimeGap(timeRange.currentRange); } else { deviceListViewModel.startTime = timeRange.startTime; deviceListViewModel.endTime = timeRange.endTime; - deviceListViewModel.reload() + if ($scope.isDevicesLoaded) { + deviceListViewModel.reload(); + } } } else { deviceListViewModel.changeTimeGap('1d'); Index: /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/server.controller.js =================================================================== --- /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/server.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/server.controller.js (working copy) @@ -10,9 +10,10 @@ 'timeService', 'localStorageService', 'userService', - function ($scope, $rootScope, $state, $stateParams, $uibModal, $filter, $location, timeService, localStorageService, userService) { + 'roleMgmtService', + function ($scope, $rootScope, $state, $stateParams, $uibModal, $filter, $location, timeService, localStorageService, userService, roleMgmtService) { var serverStatisticsViewModal = this; - + $scope.role_info = localStorageService.getWebStorage('role_info'); $scope.currentPageIndex = 1; $scope.pageSize = 15; $scope.onPageChange = function (newPage) { @@ -95,6 +96,28 @@ // getSeverUsageStatisticList(pre_month_time, current_time); // } + serverStatisticsViewModal.remoteIPs = []; + + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { + serverStatisticsViewModal.remoteIPs = []; + if (res && res.status === 200) { + try { + let data = res.data; + if (data.length > 1) { + let deviceGMap = data[1]['result']; + deviceGMap.forEach(function (deviceGroup) { + deviceGroup['device_list'].forEach(function (device) { + serverStatisticsViewModal.remoteIPs.push(device.ip); + }) + }) + getSeverUsageStatisticList(serverStatisticsViewModal.startTime, serverStatisticsViewModal.endTime); + } + } catch (err) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); + } + } + }); function getSeverUsageStatisticList(start_time, end_time) { $scope.currentPageIndex = 1; @@ -111,7 +134,7 @@ top_type: serverStatisticsViewModal.type }; - userService.getUserTopRanking(data).then(function (resp) { + userService.getUserTopRanking(data, serverStatisticsViewModal.remoteIPs).then(function (resp) { serverStatisticsViewModal.isSearching = false; serverStatisticsViewModal.isLoading = false; @@ -143,7 +166,7 @@ serverStatisticsViewModal.startTime = start.format('yyyy-mm-dd HH:MM:ss'); serverStatisticsViewModal.endTime = now.format('yyyy-mm-dd HH:MM:ss'); } - getSeverUsageStatisticList(serverStatisticsViewModal.startTime, serverStatisticsViewModal.endTime); + // getSeverUsageStatisticList(serverStatisticsViewModal.startTime, serverStatisticsViewModal.endTime); serverStatisticsViewModal.exportData = function () { var exportStatisticLog = confirm($filter("T")("Are you sure to export Statistics Logs?")); Index: /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/user.controller.js =================================================================== --- /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/user.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/statistics/user.controller.js (working copy) @@ -11,7 +11,8 @@ 'localStorageService', 'userService', 'deviceService', - function ($scope, $rootScope, $state, $stateParams, $uibModal, $filter, $location, timeService, localStorageService, userService, deviceService) { + 'roleMgmtService', + function ($scope, $rootScope, $state, $stateParams, $uibModal, $filter, $location, timeService, localStorageService, userService, deviceService, roleMgmtService) { var userLogsStatisticsModal = this; $scope.currentPageIndex = 1; @@ -26,37 +27,56 @@ getUserTopRankingInfo(userLogsStatisticsModal.startTime, userLogsStatisticsModal.endTime); }); userLogsStatisticsModal.showHelpContent = false; - + $scope.role_info = localStorageService.getWebStorage('role_info'); var device_load = false; var log_load = false; - deviceService.getDeviceList().then(function (res) { + userLogsStatisticsModal.remoteIPs = []; + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { + userLogsStatisticsModal.remoteIPs = []; if (res && res.status === 200) { - userLogsStatisticsModal.deviceList = {}; - _.each(res.data, function (data) { - userLogsStatisticsModal.deviceList[data["ip"]] = data; - }) - device_load = true; - if (log_load) { - _.each(userLogsStatisticsModal.rankingDataList_tmp, function (data) { - if (userLogsStatisticsModal.deviceList[data["host_name"]]) { - data["device"] = { - "name": userLogsStatisticsModal.deviceList[data["host_name"]].name, - "type": userLogsStatisticsModal.deviceList[data["host_name"]].type, - "id": userLogsStatisticsModal.deviceList[data["host_name"]].id, - "ip": userLogsStatisticsModal.deviceList[data["host_name"]].ip, - "device_group": userLogsStatisticsModal.deviceList[data["host_name"]].device_group, - }; - } else { - data["device"] = { - "name": '-', - "type": '-', - "id": '-', - "ip": '-', - "device_group": '-', - }; + try { + let data = res.data; + if (data.length > 1) { + let deviceGMap = data[1]['result']; + let device_list = []; + deviceGMap.forEach(function (deviceGroup) { + deviceGroup['device_list'].forEach(function (device) { + device_list.push(device); + userLogsStatisticsModal.remoteIPs.push(device.ip); + }) + }) + userLogsStatisticsModal.deviceList = {}; + _.each(device_list, function (data) { + userLogsStatisticsModal.deviceList[data["ip"]] = data; + }) + device_load = true; + if (log_load) { + _.each(userLogsStatisticsModal.rankingDataList_tmp, function (data) { + if (userLogsStatisticsModal.deviceList[data["host_name"]]) { + data["device"] = { + "name": userLogsStatisticsModal.deviceList[data["host_name"]].name, + "type": userLogsStatisticsModal.deviceList[data["host_name"]].type, + "id": userLogsStatisticsModal.deviceList[data["host_name"]].id, + "ip": userLogsStatisticsModal.deviceList[data["host_name"]].ip, + "device_group": userLogsStatisticsModal.deviceList[data["host_name"]].device_group, + }; + } else { + data["device"] = { + "name": '-', + "type": '-', + "id": '-', + "ip": '-', + "device_group": '-', + }; + } + }) + userLogsStatisticsModal.rankingDataList = userLogsStatisticsModal.rankingDataList_tmp; } - }) - userLogsStatisticsModal.rankingDataList = userLogsStatisticsModal.rankingDataList_tmp; + getUserTopRankingInfo(userLogsStatisticsModal.startTime, userLogsStatisticsModal.endTime); + } + } catch (err) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); } } }); @@ -147,7 +167,7 @@ }; log_load = false; - userService.getUserTopRanking(data).then(function (res) { + userService.getUserTopRanking(data, userLogsStatisticsModal.remoteIPs).then(function (res) { userLogsStatisticsModal.isSearching = false; userLogsStatisticsModal.isLoading = false; if (res && res.status === 200) { @@ -251,10 +271,10 @@ var now = new Date(); var start = new Date(); start.setTime(now.getTime() - timeService.parseDuration('1d')); - logStatisticsViewModel.startTime = start.format('yyyy-mm-dd HH:MM:ss'); - logStatisticsViewModel.endTime = now.format('yyyy-mm-dd HH:MM:ss'); + userLogsStatisticsModal.startTime = start.format('yyyy-mm-dd HH:MM:ss'); + userLogsStatisticsModal.endTime = now.format('yyyy-mm-dd HH:MM:ss'); } - getUserTopRankingInfo(userLogsStatisticsModal.startTime, userLogsStatisticsModal.endTime); + // getUserTopRankingInfo(userLogsStatisticsModal.startTime, userLogsStatisticsModal.endTime); userLogsStatisticsModal.exportData = function () { var exportStatisticLog = confirm($filter("T")("Are you sure to export Statistics Logs?")); Index: /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/user/userList.controller.js =================================================================== --- /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/user/userList.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/auditing/webui/log_analysis/sslvpn_service/tabs/user/userList.controller.js (working copy) @@ -10,7 +10,8 @@ 'deviceService', 'timeService', 'localStorageService', - function ($scope, $rootScope, $state, $uibModal, $filter, userService, deviceService, timeService, localStorageService) { + 'roleMgmtService', + function ($scope, $rootScope, $state, $uibModal, $filter, userService, deviceService, timeService, localStorageService, roleMgmtService) { $('#start').datetimepicker({ autoclose: true, @@ -21,7 +22,7 @@ endDate: new Date() }); var userListViewModel = this; - + $scope.role_info = localStorageService.getWebStorage('role_info'); userListViewModel.showHelpContent = false; $scope.currentPageIndex = 1; @@ -106,75 +107,60 @@ 'startTime': userListViewModel.startTime, 'endTime': userListViewModel.endTime }); - - // var device_load = false; - // var log_load = false; - - deviceService.getDeviceList().then(function (res) { + let remoteIPs = []; + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { if (res && res.status === 200) { - var deviceMap = {}; - _.each(res.data, function (data) { - deviceMap[data["ip"]] = data; - }) - - var startstamp = new Date(userListViewModel.startTime.replace(/-/g, "/")).getTime(); - var endstamp = new Date(userListViewModel.endTime.replace(/-/g, "/")).getTime(); - - userService.getUserList(startstamp, endstamp).then(function (resp) { - userListViewModel.loading = false; - if (resp && resp.status === 200) { - _.each(resp.data, function (data) { - if (deviceMap[data["host_name"]]) { - data["device"] = { - "name": deviceMap[data["host_name"]].name, - "type": deviceMap[data["host_name"]].type, - "id": deviceMap[data["host_name"]].id, - "ip": deviceMap[data["host_name"]].ip, - "device_group": deviceMap[data["host_name"]].device_group, - }; - } else { - data["device"] = { - "name": '-', - "type": '-', - "id": '-', - "ip": '-', - "device_group": '-', - }; + try { + let data = res.data; + if (data.length > 1) { + let deviceGMap = data[1]['result']; + let device_list = []; + deviceGMap.forEach(function (deviceGroup) { + deviceGroup['device_list'].forEach(function (device) { + device_list.push(device); + remoteIPs.push( device.ip); + }) + }) + var deviceMap = {}; + _.each(device_list, function (data) { + deviceMap[data["ip"]] = data; + }) + + var startstamp = new Date(userListViewModel.startTime.replace(/-/g, "/")).getTime(); + var endstamp = new Date(userListViewModel.endTime.replace(/-/g, "/")).getTime(); + + userService.getUserList(startstamp, endstamp, remoteIPs).then(function (resp) { + userListViewModel.loading = false; + if (resp && resp.status === 200) { + _.each(resp.data, function (data) { + if (deviceMap[data["host_name"]]) { + data["device"] = { + "name": deviceMap[data["host_name"]].name, + "type": deviceMap[data["host_name"]].type, + "id": deviceMap[data["host_name"]].id, + "ip": deviceMap[data["host_name"]].ip, + "device_group": deviceMap[data["host_name"]].device_group, + }; + } else { + data["device"] = { + "name": '-', + "type": '-', + "id": '-', + "ip": '-', + "device_group": '-', + }; + } + }); + userListViewModel.userInfoList = resp.data; } }); - userListViewModel.userInfoList = resp.data; } - }); - - - // device_load = true; - // if (log_load) { - // _.each(userListViewModel.userInfoList_tmp, function (data) { - // data["device"] = deviceMap[data["host_name"]]; - // }) - // userListViewModel.userInfoList = userListViewModel.userInfoList_tmp; - // userListViewModel.loading = false; - // } - } + } catch (error) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); + } + } }); - // function get_userListInfo() { - // userService.getUserList().then(function (res) { - // if (res && res.status === 200) { - // log_load = true; - // if (device_load) { - // _.each(res.data, function (data) { - // data["device"] = deviceMap[data["host_name"]]; - // }); - // userListViewModel.userInfoList = res.data; - // } else { - // userListViewModel.userInfoList_tmp = res.data; - // userListViewModel.loading = false; - // } - // } - // }); - // } - - // get_userListInfo(); } var timeRange = localStorageService.getWebStorage('timeRange'); if (timeRange) { @@ -277,16 +263,6 @@ continue; } } - // if (userListViewModel.last_login_time_before) { - // if (userListViewModel.userInfoList[i].last_login_timestamp < new Date(userListViewModel.last_login_time_before).valueOf()) { - // continue; - // } - // } - // if (userListViewModel.last_login_time_after) { - // if (userListViewModel.userInfoList[i].last_login_timestamp > new Date(userListViewModel.last_login_time_after).valueOf()) { - // continue; - // } - // } str += userListViewModel.userInfoList[i].user_name + '\t,' + userListViewModel.userInfoList[i].device.name + '\t,' + userListViewModel.userInfoList[i].device.device_group + '\t,' + @@ -304,74 +280,8 @@ }; } ]) - // .directive('stDateRange', ['$timeout', function ($timeout) { - // return { - // restrict: 'E', - // require: '^stTable', - // scope: { - // before: '=', - // after: '=' - // }, - // template: '
' + - // '' + - // '−' + - // '' + - // '
', - - // link: function (scope, element, attr, table) { - - // var inputs = element.find('input'); - // var inputBefore = angular.element(inputs[0]); - // var inputAfter = angular.element(inputs[1]); - // var predicateName = attr.predicate; - - // inputBefore.datetimepicker({ - // autoclose: true, - // clearBtn: true, - // endDate: new Date() - // }) - // .on('changeDate', function (ev) { - // var query = {}; - // if (!scope.isBeforeOpen && !scope.isAfterOpen) { - // if (scope.before) { - // query.before = scope.before; - // } - // if (scope.after) { - // query.after = scope.after; - // } - // scope.$apply(function () { - // table.search(query, predicateName); - // }) - // } - // }); - // inputAfter.datetimepicker({ - // pickerPosition: "bottom-left", - // autoclose: true, - // clearBtn: true, - // endDate: new Date() - // }) - // .on('changeDate', function (ev) { - // var query = {}; - // if (!scope.isBeforeOpen && !scope.isAfterOpen) { - // if (scope.before) { - // query.before = scope.before; - // } - // if (scope.after) { - // query.after = scope.after; - // } - // scope.$apply(function () { - // table.search(query, predicateName); - // }) - // } - // }); - // } - // } - // }]) .filter('myFilter', function () { return function (array, expression) { - //console.log(expression); return array.filter(function (val, index) { if (expression.user_name) { if (val.user_name.indexOf(expression.user_name) == -1) { @@ -401,19 +311,6 @@ return false; } } - // if (expression.last_login_time) { - // if (expression.last_login_time.before) { - // if (val.last_login_timestamp < new Date(expression.last_login_time.before).valueOf()) { - // return false; - // } - // } - // if (expression.last_login_time.after) { - // if (val.last_login_timestamp > new Date(expression.last_login_time.after).valueOf()) { - // return false; - // } - // } - - // } return true; }); } Index: /branches/amp_3_6_0_role/extensions/monitoring/webui/event/query_event/query_event.controller.js =================================================================== --- /branches/amp_3_6_0_role/extensions/monitoring/webui/event/query_event/query_event.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/monitoring/webui/event/query_event/query_event.controller.js (working copy) @@ -391,12 +391,14 @@ 'dashboardService', 'monitoringService', 'modalData', - function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, $filter, dashboardService, monitoringService, modalData) { + 'localStorageService', + function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, $filter, dashboardService, monitoringService, modalData, localStorageService) { var queryViewModel = this; queryViewModel.modalClose = function () { $uibModalInstance.dismiss(); }; - + $scope.role_info = localStorageService.getWebStorage('role_info'); + $scope.isDeviceAdmin = $scope.role_info.role_id !== null && $scope.role_info.role_id !== '0'; $scope.currentPageIndex = 1; $scope.pageSize = 10; $scope.onPageChange = function (newPage) { @@ -432,11 +434,22 @@ } monitoringService.getDeviceList().then(function (resp) { - var deviceMap = {} + let deviceMap = {} + let agentHost = ''; _.each(resp, function (host) { deviceMap[host.ip] = host; + if (agentHost === '') { + agentHost = agentHost + '/' + host.ip; + } else { + agentHost = agentHost + '|' + host.ip; + } }) - var query = 'SELECT time, agent_host, server_id, quantity FROM event_detection ' + timeCondition + otherCondition + ' GROUP BY event_name, product order by time desc;' + if (agentHost !== '') agentHost += '/'; + let query = 'SELECT time, agent_host, server_id, quantity FROM event_detection ' + timeCondition + otherCondition + ' GROUP BY event_name, product order by time desc;' + if ($scope.isDeviceAdmin) { + query = 'SELECT time, agent_host, server_id, quantity FROM event_detection ' + timeCondition + otherCondition + ' and agent_host =~ '+ agentHost +' GROUP BY event_name, product order by time desc;' + } + if (($scope.isDeviceAdmin && agentHost !== '') || !$scope.isDeviceAdmin) { dashboardService.influxdb_proxy({ "q": query }).then(function (res) { queryViewModel.loading = false; if (res && res.status == 200) { @@ -480,6 +493,7 @@ queryViewModel.eventList = eventList } }); + } }) } ]) Index: /branches/amp_3_6_0_role/extensions/monitoring/webui/monitoring.service.js =================================================================== --- /branches/amp_3_6_0_role/extensions/monitoring/webui/monitoring.service.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/monitoring/webui/monitoring.service.js (working copy) @@ -8,7 +8,8 @@ 'dashboardService', 'localStorageService', 'deviceService', - function ($rootScope, $q, $filter, $http, api, dashboardService, localStorageService, deviceService) { + 'roleMgmtService', + function ($rootScope, $q, $filter, $http, api, dashboardService, localStorageService, deviceService, roleMgmtService) { return { getDeviceList: getDeviceList, getVirtualService: getVirtualService, @@ -17,31 +18,43 @@ }; function getDeviceList() { - var deferred = $q.defer(); - deviceService.getDeviceList().then(function (res) { - var deviceList = []; - var device_type_info = localStorageService.getWebStorage("device_type_info"); - if (res && res.status === 200 && res.data instanceof Array) { - _.each(res.data, function (host) { - if (device_type_info.ADC_TYPE_LIST.indexOf(host.type.toLowerCase()) != -1) { - host.general_type = "adc" - } else if (device_type_info.VPN_TYPE_LIST.indexOf(host.type.toLowerCase()) != -1) { - host.general_type = "vpn" + let deferred = $q.defer(); + let role_info = localStorageService.getWebStorage('role_info'); + let device_list = []; + let device_type_info = localStorageService.getWebStorage("device_type_info"); + roleMgmtService.getRoleDeviceGroupMapping(role_info).then(function (res) { + if (res && res.status === 200) { + try { + let data = res.data; + if (data.length > 1) { + let deviceMap = data[1]['result']; + deviceMap.forEach(function (deviceGroup) { + deviceGroup['device_list'].forEach(function (device) { + if (device_type_info.ADC_TYPE_LIST.indexOf(device.type.toLowerCase()) !== -1) { + device.general_type = "adc" + } else if (device_type_info.VPN_TYPE_LIST.indexOf(host.type.toLowerCase()) !== -1) { + device.general_type = "vpn" + } + device_list.push(device); + }) + }) } - deviceList.push(host) - }); + deferred.resolve(device_list); + } catch (e) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); + } } - deferred.resolve(deviceList); - }); + }) return deferred.promise; } function getVirtualService(device_ip) { var deferred = $q.defer(); var query = "select count(URLHits) from virtualStats where time > now()-20s and agent_host='" + device_ip + "' group by ServerId;" - dashboardService.influxdb_proxy({ "q": query }).then(function (res) { + dashboardService.influxdb_proxy({"q": query}).then(function (res) { var serverList = [] - if (res && res.status == 200) { + if (res && res.status === 200) { _.each(res.data.results[0].series, function (series) { serverList.push({ "name": series.tags.ServerId, @@ -53,14 +66,14 @@ deferred.resolve(serverList); }); return deferred.promise; - }; + } function getRealService(device_ip) { var deferred = $q.defer(); var query = "select count(rsTotalHits) from realStats where time > now()-20s and agent_host='" + device_ip + "' group by realServerId;" - dashboardService.influxdb_proxy({ "q": query }).then(function (res) { + dashboardService.influxdb_proxy({"q": query}).then(function (res) { var serverList = [] - if (res && res.status == 200) { + if (res && res.status === 200) { _.each(res.data.results[0].series, function (series) { serverList.push({ "name": series.tags.realServerId, @@ -72,14 +85,14 @@ deferred.resolve(serverList); }); return deferred.promise; - }; + } function getVirtualSite(device_ip) { var deferred = $q.defer(); var query = "select count(ActiveSessions) from virtualSiteStats where time > now()-20s and agent_host='" + device_ip + "' group by Id;" - dashboardService.influxdb_proxy({ "q": query }).then(function (res) { + dashboardService.influxdb_proxy({"q": query}).then(function (res) { var serverList = [] - if (res && res.status == 200) { + if (res && res.status === 200) { _.each(res.data.results[0].series, function (series) { serverList.push({ "name": series.tags.Id, @@ -91,6 +104,6 @@ deferred.resolve(serverList); }); return deferred.promise; - }; + } } ]); \ No newline at end of file Index: /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/device/device.controller.js =================================================================== --- /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/device/device.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/device/device.controller.js (working copy) @@ -12,9 +12,10 @@ 'dashboardService', 'storageService', 'localStorageService', - function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $filter, cmService, deviceService, dashboardService, storageService, localStorageService) { + 'roleMgmtService', + function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $filter, cmService, deviceService, dashboardService, storageService, localStorageService, roleMgmtService) { $rootScope.title = 'Devices'; - + $scope.role_info = localStorageService.getWebStorage('role_info'); var modalViewModel = this; $scope.currentPageIndex = 1; @@ -116,13 +117,19 @@ modalViewModel.gridColSpan = 6; modalViewModel.deviceList = []; - var getDeviceMonitoringData = function () { - var post_data = { + let getDeviceMonitoringData = function (isDeviceAdmin, agentHost) { + let select_query = "SELECT last(cpu_usage) as cpu, last(mem_usage) as mem, last(net_mem_usage) as net_mem, last(connections) as connections FROM snmp_system WHERE $timeFilter GROUP BY agent_host; " + + "SELECT non_negative_derivative(first(total_in), 1s)*8 as received, non_negative_derivative(first(total_out), 1s)*8 as sent FROM snmp_system WHERE $timeFilter GROUP BY time($interval), agent_host"; + if(isDeviceAdmin) { + select_query = "SELECT last(cpu_usage) as cpu, last(mem_usage) as mem, last(net_mem_usage) as net_mem, last(connections) as connections FROM snmp_system WHERE agent_host =~ "+ agentHost +" and $timeFilter GROUP BY agent_host; " + + "SELECT non_negative_derivative(first(total_in), 1s)*8 as received, non_negative_derivative(first(total_out), 1s)*8 as sent FROM snmp_system WHERE agent_host =~ "+ agentHost +" and $timeFilter GROUP BY time($interval), agent_host"; + } + let post_data = { "from": "now-30s", "to": "now", "queries": [{ "datasourceId": 1, - "query": "SELECT last(cpu_usage) as cpu, last(mem_usage) as mem, last(net_mem_usage) as net_mem, last(connections) as connections FROM snmp_system WHERE $timeFilter GROUP BY agent_host; SELECT non_negative_derivative(first(total_in), 1s)*8 as received, non_negative_derivative(first(total_out), 1s)*8 as sent FROM snmp_system WHERE $timeFilter GROUP BY time($interval), agent_host", + "query": select_query, "rawQuery": true, "resultFormat": "time_series" }] @@ -130,7 +137,7 @@ dashboardService .get_composer_data('/composer/tsdb/query', JSON.stringify(post_data)) .then(function (res) { - if (res && res.data.code == 0) { + if (res && res.data.code === 0) { var deviceMap = {}; _.each(res.data.data.results['A'].series, function (series) { if (deviceMap[series.tags['agent_host']]) { @@ -181,23 +188,51 @@ modalViewModel.refresh = function () { modalViewModel.loading = true; - deviceService.getDeviceList().then(function (res) { + let agentHost = ''; + let isDeviceAdmin = $scope.role_info.role_id !== null && $scope.role_info.role_id !== '0'; + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { modalViewModel.loading = false; if (res && res.status === 200) { - //get graph data for Network/CPU/Memory/Session Number - var deviceList = []; - _.each(res.data, function (each_data) { - each_data.graph_data = { - 'received': 'N/A', - 'sent': 'N/A', - 'cpu_usage': 'N/A', - 'mem_usage': 'N/A', - 'net_mem_usage': 'N/A', - }; - deviceList.push(each_data); - }); - modalViewModel.deviceList = deviceList; - getDeviceMonitoringData() + try { + let data = res.data; + if (data.length > 1) { + try { + let deviceMap = data[1]['result']; + deviceMap.forEach(function (deviceGroup) { + deviceGroup['name'] = deviceGroup['group_name']; + deviceGroup['device_list'].forEach(function (device) { + device.graph_data = { + 'received': 'N/A', + 'sent': 'N/A', + 'cpu_usage': 'N/A', + 'mem_usage': 'N/A', + 'net_mem_usage': 'N/A', + }; + if (agentHost === '') { + agentHost = agentHost + '/' + device.ip; + } else { + agentHost = agentHost + '|' + device.ip; + } + modalViewModel.deviceList.push(device); + }) + }) + modalViewModel.deviceGroupList = deviceMap; + if (agentHost !== '') agentHost += '/'; + if ((isDeviceAdmin && agentHost !== '') || !isDeviceAdmin) { + getDeviceMonitoringData(isDeviceAdmin, agentHost ); + } + } catch (e) { + console.error('Error getRoleDeviceGroupMapping returned error.' + e); + modalViewModel.deviceList = [] + modalViewModel.deviceGroupList = []; + } + } + if (modalViewModel.deviceGroupList.length > 0) modalViewModel.showDeviceGroup = true; + if (modalViewModel.deviceList.length > 0)modalViewModel.showDevice = true; + } catch (e) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); + } } }); } Index: /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/resource.service.js =================================================================== --- /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/resource.service.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/resource.service.js (working copy) @@ -2117,13 +2117,23 @@ return widgets }; - function get_adc_ssl_cert() { - return apiService.get('/cm/get_adc_ssl_cert'); - }; + function get_adc_ssl_cert(roleId) { + let postData = { + "data": JSON.stringify({ + "role_id": roleId, + }) + }; + return apiService.post('/cm/get_adc_ssl_cert', postData); + } - function get_vpn_ssl_cert() { - return apiService.get('/cm/get_vpn_ssl_cert'); - }; + function get_vpn_ssl_cert(roleId) { + let postData = { + "data": JSON.stringify({ + "role_id": roleId, + }) + }; + return apiService.post('/cm/get_vpn_ssl_cert', postData); + } function getServiceUrlConfig(service_name, device_ip) { var url = '/api/cm/extension_monitor/MonitorADSVSURL/_perform?action=get'; Index: /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/slb/real_service.controller.js =================================================================== --- /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/slb/real_service.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/slb/real_service.controller.js (working copy) @@ -12,9 +12,10 @@ 'monitorResourceService', 'storageService', 'localStorageService', - function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $filter, dashboardService, monitoringService, monitorResourceService, storageService, localStorageService) { + 'roleMgmtService', + function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $filter, dashboardService, monitoringService, monitorResourceService, storageService, localStorageService, roleMgmtService) { var serviceViewModel = this; - + $scope.role_info = localStorageService.getWebStorage('role_info'); $scope.currentPageIndex = 1; $scope.pageSize = 15; $scope.onPageChange = function (newPage) { @@ -22,10 +23,10 @@ }; $scope.multiSelectData = [ - { id: 1, label: $filter('T')("Outstanding Requests") }, - { id: 2, label: $filter('T')("Connections Per Second") }, - { id: 3, label: $filter('T')("Received") }, - { id: 4, label: $filter('T')("Sent") }, + {id: 1, label: $filter('T')("Outstanding Requests")}, + {id: 2, label: $filter('T')("Connections Per Second")}, + {id: 3, label: $filter('T')("Received")}, + {id: 4, label: $filter('T')("Sent")}, ]; var columnVisible = localStorageService.getWebStorage("TABLE_CUSTOM_COLUMN_VISIBLE"); @@ -35,7 +36,7 @@ if (columnVisible.rsMonitor) { $scope.multiSelectModel = columnVisible.rsMonitor; } else { - $scope.multiSelectModel = [{ id: 3 }, { id: 4 }]; + $scope.multiSelectModel = [{id: 3}, {id: 4}]; } $scope.multiSelectSettings = { showCheckAll: false, @@ -94,11 +95,15 @@ serviceViewModel.gridColSpan = 7; serviceViewModel.listType = "SLB_rs"; - var get_adc_ssl_cert = function () { + let get_adc_ssl_cert = function () { serviceViewModel.adc_ssl_cert_map = undefined; - var adc_ssl_cert_map = {}; - monitorResourceService.get_adc_ssl_cert().then(function (res) { - if (res && res.status == 200) { + let adc_ssl_cert_map = {}; + let roleId = $scope.role_info.role_id; + if (roleId === null) { + roleId = '0'; + } + monitorResourceService.get_adc_ssl_cert(roleId).then(function (res) { + if (res && res.status === 200) { if (res.data.state) { _.each(res.data.data, function (cert) { adc_ssl_cert_map[cert.service_name] = cert @@ -162,44 +167,64 @@ } serviceViewModel.refresh = function () { serviceViewModel.loading = true; - monitoringService.getDeviceList().then(function (resp) { + let isDeviceAdmin = $scope.role_info.role_id !== null && $scope.role_info.role_id !== '0'; + let realServiceList = [] + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { + let deviceGMap = res.data[1]['result']; var deviceMap = {} - _.each(resp, function (host) { - deviceMap[host.ip] = host; - }) - - var query = 'select last(rsCntOfReq), last(rsConnPerSec), last(rsInBytePerSec)*8, last(rsOutBytePerSec)*8 from realStats where time > now()-20s group by realServerId, agent_host, Addr, Port, Protocol, Status;' - dashboardService.influxdb_proxy({ "q": query }).then(function (res) { - serviceViewModel.loading = false; - if (res && res.status == 200) { - var realServiceList = [] - _.each(res.data.results[0].series, function (series) { - var device_ip = series.tags.agent_host; - if (deviceMap[device_ip]) { - realServiceList.push({ - "name": series.tags.realServerId, - "origin_type": "SLB_rs", - "type": protocol2type[series.tags.Protocol], - "addr": series.tags.Addr, - "port": series.tags.Port, - "health_status": series.tags.Status, - "device": { - "name": deviceMap[device_ip].name, - "type": deviceMap[device_ip].type, - "id": deviceMap[device_ip].id, - "ip": device_ip, - "device_group": deviceMap[device_ip].device_group, - }, - "graph_data": { - "request": series.values[0][1], - "conn": series.values[0][2], - "received": storageService.ValueFormat1024(series.values[0][3]) + 'bps', - "sent": storageService.ValueFormat1024(series.values[0][4]) + 'bps', - } - }) + let agentHost = ''; + deviceGMap.forEach(function (deviceGroup) { + agentHost = ''; + deviceGroup['device_list'].forEach(function (device) { + deviceMap[device.ip] = device; + if (agentHost === '') { + agentHost = agentHost + '/' + device.ip; + } else { + agentHost = agentHost + '|' + device.ip; + } + }) + if (agentHost !== '') agentHost += '/'; + let query = 'select last(rsCntOfReq), last(rsConnPerSec), last(rsInBytePerSec)*8, last(rsOutBytePerSec)*8 from realStats where time > now()-20s group by realServerId, agent_host, Addr, Port, Protocol, Status;' + if (isDeviceAdmin) { + query = 'select last(rsCntOfReq), last(rsConnPerSec), last(rsInBytePerSec)*8, last(rsOutBytePerSec)*8 from realStats where agent_host =~ ' + agentHost + ' and time > now()-20s group by realServerId, agent_host, Addr, Port, Protocol, Status;' + } + if ((isDeviceAdmin && agentHost !== '') || !isDeviceAdmin) { + dashboardService.influxdb_proxy({"q": query}).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) { + var device_ip = series.tags.agent_host; + if (deviceMap[device_ip]) { + realServiceList.push({ + "name": series.tags.realServerId, + "origin_type": "SLB_rs", + "type": protocol2type[series.tags.Protocol], + "addr": series.tags.Addr, + "port": series.tags.Port, + "health_status": series.tags.Status, + "device": { + "name": deviceMap[device_ip].name, + "type": deviceMap[device_ip].type, + "id": deviceMap[device_ip].id, + "ip": device_ip, + "device_group": deviceMap[device_ip].device_group, + }, + "graph_data": { + "request": series.values[0][1], + "conn": series.values[0][2], + "received": storageService.ValueFormat1024(series.values[0][3]) + 'bps', + "sent": storageService.ValueFormat1024(series.values[0][4]) + 'bps', + } + }) + } + }) + } + serviceViewModel.serviceList = realServiceList; } - }) - serviceViewModel.serviceList = realServiceList; + }); + } else { + serviceViewModel.loading = false; } }); }) @@ -226,7 +251,7 @@ var modalViewModel = this; modalViewModel.tab = "Basic Monitoring"; modalViewModel.tabs = [ - { name: "Basic Monitoring" }, + {name: "Basic Monitoring"}, // { name: "Audit Monitoring" }, // { name: "Alert Rules" } ] @@ -288,7 +313,7 @@ } modalViewModel.setAlert = function (row_widget) { - $state.go('index.monitoring.alerting.rule.threshold.detail', { id: 0, name: "*new" }); + $state.go('index.monitoring.alerting.rule.threshold.detail', {id: 0, name: "*new"}); return var conditionList = []; var alarmConditions = []; @@ -375,7 +400,7 @@ "conditions": [{ "query": { "model": { - "tags": [{ "value": $stateParams.device_ip }, { "value": $scope.current_service_name }] + "tags": [{"value": $stateParams.device_ip}, {"value": $scope.current_service_name}] } } }], Index: /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/slb/virtual_service.controller.js =================================================================== --- /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/slb/virtual_service.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/slb/virtual_service.controller.js (working copy) @@ -12,9 +12,10 @@ 'monitorResourceService', 'storageService', 'localStorageService', - function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $filter, dashboardService, monitoringService, monitorResourceService, storageService, localStorageService) { + 'roleMgmtService', + function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $filter, dashboardService, monitoringService, monitorResourceService, storageService, localStorageService, roleMgmtService) { var serviceViewModel = this; - + $scope.role_info = localStorageService.getWebStorage('role_info'); $scope.currentPageIndex = 1; $scope.pageSize = 15; $scope.onPageChange = function (newPage) { @@ -22,11 +23,11 @@ }; $scope.multiSelectData = [ - { id: 1, label: $filter('T')("Hits Number") }, - { id: 2, label: $filter('T')("Open Connections") }, - { id: 3, label: $filter('T')("Received") }, - { id: 4, label: $filter('T')("Sent") }, - { id: 5, label: $filter('T')("Certificate Status") }, + {id: 1, label: $filter('T')("Hits Number")}, + {id: 2, label: $filter('T')("Open Connections")}, + {id: 3, label: $filter('T')("Received")}, + {id: 4, label: $filter('T')("Sent")}, + {id: 5, label: $filter('T')("Certificate Status")}, ]; var columnVisible = localStorageService.getWebStorage("TABLE_CUSTOM_COLUMN_VISIBLE"); @@ -36,7 +37,7 @@ if (columnVisible.vsMonitor) { $scope.multiSelectModel = columnVisible.vsMonitor; } else { - $scope.multiSelectModel = [{ id: 3 }, { id: 4 }]; + $scope.multiSelectModel = [{id: 3}, {id: 4}]; } $scope.multiSelectSettings = { showCheckAll: false, @@ -98,11 +99,16 @@ serviceViewModel.gridColSpan = 7; serviceViewModel.listType = "SLB_vs"; - var get_adc_ssl_cert = function () { + let get_adc_ssl_cert = function () { serviceViewModel.adc_ssl_cert_map = undefined; - var adc_ssl_cert_map = {}; - monitorResourceService.get_adc_ssl_cert().then(function (res) { - if (res && res.status == 200) { + let roleId = $scope.role_info.role_id; + if (roleId === null) { + roleId = '0'; + } + serviceViewModel.vpn_ssl_cert_map = undefined; + let adc_ssl_cert_map = {}; + monitorResourceService.get_adc_ssl_cert(roleId).then(function (res) { + if (res && res.status === 200) { if (res.data.state) { _.each(res.data.data, function (cert) { adc_ssl_cert_map[cert.device_name + '-' + cert.service_name] = cert @@ -162,45 +168,67 @@ } serviceViewModel.refresh = function () { serviceViewModel.loading = true; - monitoringService.getDeviceList().then(function (resp) { - var deviceMap = {} - _.each(resp, function (host) { - deviceMap[host.ip] = host; - }) - var query = 'select max(totalHits)-min(totalHits), last(ConnCnt), last(InBytePerSec)*8, last(OutBytePerSec)*8 from virtualStats where time > now()-20s group by ServerId, agent_host, Addr, Port, Protocol, HealthStatus;' - dashboardService.influxdb_proxy({ "q": query }).then(function (res) { - serviceViewModel.loading = false; - if (res && res.status == 200) { - var virtualServiceList = [] - _.each(res.data.results[0].series, function (series) { - var device_ip = series.tags.agent_host; - if (deviceMap[device_ip]) { - virtualServiceList.push({ - "name": series.tags.ServerId, - "origin_type": "SLB_vs", - "type": protocol2type[series.tags.Protocol], - "addr": series.tags.Addr, - "port": series.tags.Port, - "health_status": series.tags.HealthStatus, - "device": { - "name": deviceMap[device_ip].name, - "type": deviceMap[device_ip].type, - "id": deviceMap[device_ip].id, - "ip": device_ip, - "device_group": deviceMap[device_ip].device_group, - }, - "graph_data": { - "hits": series.values[0][1], - "conn": series.values[0][2], - "received": storageService.ValueFormat1024(series.values[0][3]) + 'bps', - "sent": storageService.ValueFormat1024(series.values[0][4]) + 'bps', - } - }) + let isDeviceAdmin = $scope.role_info.role_id !== null && $scope.role_info.role_id !== '0'; + let virtualServiceList = [] + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { + let deviceGMap = res.data[1]['result']; + let deviceMap = {} + let agentHost = ''; + deviceGMap.forEach(function (deviceGroup) { + agentHost = ''; + deviceGroup['name'] = deviceGroup['group_name']; + deviceGroup['device_list'].forEach(function (device) { + deviceMap[device.ip] = device; + if (agentHost === '') { + agentHost = agentHost + '/' + device.ip; + } else { + agentHost = agentHost + '|' + device.ip; + } + }); + if (agentHost !== '') agentHost += '/'; + let query = 'select max(totalHits)-min(totalHits), last(ConnCnt), last(InBytePerSec)*8, last(OutBytePerSec)*8 from virtualStats where time > now()-20s group by ServerId, agent_host, Addr, Port, Protocol, HealthStatus;' + if (isDeviceAdmin) { + query = 'select max(totalHits)-min(totalHits), last(ConnCnt), last(InBytePerSec)*8, last(OutBytePerSec)*8 from virtualStats where agent_host =~ ' + agentHost + ' and time > now()-20s group by ServerId, agent_host, Addr, Port, Protocol, HealthStatus;' + } + if ((isDeviceAdmin && agentHost !== '') || !isDeviceAdmin) { + dashboardService.influxdb_proxy({"q": query}).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) { + var device_ip = series.tags.agent_host; + if (deviceMap[device_ip]) { + virtualServiceList.push({ + "name": series.tags.ServerId, + "origin_type": "SLB_vs", + "type": protocol2type[series.tags.Protocol], + "addr": series.tags.Addr, + "port": series.tags.Port, + "health_status": series.tags.HealthStatus, + "device": { + "name": deviceMap[device_ip].name, + "type": deviceMap[device_ip].type, + "id": deviceMap[device_ip].id, + "ip": device_ip, + "device_group": deviceMap[device_ip].device_group, + }, + "graph_data": { + "hits": series.values[0][1], + "conn": series.values[0][2], + "received": storageService.ValueFormat1024(series.values[0][3]) + 'bps', + "sent": storageService.ValueFormat1024(series.values[0][4]) + 'bps', + } + }) + } + }) + } + serviceViewModel.serviceList = virtualServiceList; } - }) - serviceViewModel.serviceList = virtualServiceList; + }); + } else { + serviceViewModel.loading = false; } - }); + }) }) } serviceViewModel.refresh(); @@ -225,14 +253,14 @@ var modalViewModel = this; modalViewModel.tab = "Basic Monitoring"; modalViewModel.tabs = [ - { name: "Basic Monitoring" }, + {name: "Basic Monitoring"}, // { name: "Audit Monitoring" }, // { name: "Alert Rules" } ] var enableAudit = (angular.module("cmApp").requires.indexOf('cm.auditing') != -1) if (enableAudit) { - modalViewModel.tabs.push({ name: "Audit Monitoring" }); + modalViewModel.tabs.push({name: "Audit Monitoring"}); } var lastTab = ""; $scope.changeTab = function (name) { @@ -244,6 +272,7 @@ } modalViewModel.vsInfo = undefined; modalViewModel.display_url_monitor = false; + function url_escape(url) { var chr_list = ['(', ')', '[', ']', ':', '\\', '/'] var rst = ""; @@ -303,26 +332,50 @@ { "id": "2", "type": "filters", - "settings": { "filters": [{ "query": "tag.remote_ip:" + $stateParams.device_ip, "label": "agent_host:" + $stateParams.device_ip }] } + "settings": { + "filters": [{ + "query": "tag.remote_ip:" + $stateParams.device_ip, + "label": "agent_host:" + $stateParams.device_ip + }] + } }, { "id": "3", "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + $scope.current_service_name, "label": "server_id:" + $scope.current_service_name }] } + "settings": { + "filters": [{ + "query": "adc.vs_name:" + $scope.current_service_name, + "label": "server_id:" + $scope.current_service_name + }] + } }, { "id": "4", "type": "filters", - "settings": { "filters": [{ "query": "adc.url:" + url_escape(url), "label": "-" }] } + "settings": { + "filters": [{ + "query": "adc.url:" + url_escape(url), + "label": "-" + }] + } }, { "id": "5", "type": "filters", - "settings": { "filters": [{ "query": "tag.header:APP-HTTP", "label": $filter('T')("Response Time") }] } + "settings": { + "filters": [{ + "query": "tag.header:APP-HTTP", + "label": $filter('T')("Response Time") + }] + } }, - { "type": "date_histogram", "field": "@timestamp", "id": "1" } + {"type": "date_histogram", "field": "@timestamp", "id": "1"} ], - "metrics": [{ "type": "avg", "field": "adc.responsetime", "id": "0" }] + "metrics": [{ + "type": "avg", + "field": "adc.responsetime", + "id": "0" + }] }] } } @@ -417,7 +470,7 @@ } modalViewModel.setAlert = function (row_widget) { - $state.go('index.monitoring.alerting.rule.threshold.detail', { id: 0, name: "*new" }); + $state.go('index.monitoring.alerting.rule.threshold.detail', {id: 0, name: "*new"}); return var conditionList = []; var alarmConditions = []; @@ -504,7 +557,7 @@ "conditions": [{ "query": { "model": { - "tags": [{ "value": $stateParams.device_ip }, { "value": $scope.current_service_name }] + "tags": [{"value": $stateParams.device_ip}, {"value": $scope.current_service_name}] } } }], @@ -532,7 +585,7 @@ // }); } var query = 'select last(ConnCnt) from virtualStats where time > now()-20s and ServerId=\'' + $scope.current_service_name + '\' and agent_host=\'' + $stateParams.device_ip + '\' group by ServerId, agent_host, Addr, Port, Protocol;' - dashboardService.influxdb_proxy({ "q": query }).then(function (res) { + dashboardService.influxdb_proxy({"q": query}).then(function (res) { if (res && res.status == 200) { if (res.data.results[0].series.length == 1) { series = res.data.results[0].series[0]; Index: /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/sslvpn/sslvpn.controller.js =================================================================== --- /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/sslvpn/sslvpn.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/extensions/monitoring/webui/resource/sslvpn/sslvpn.controller.js (working copy) @@ -11,9 +11,10 @@ 'monitorResourceService', 'dashboardService', 'localStorageService', - function ($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 = 'SSLVPN Services'; - + $scope.role_info = localStorageService.getWebStorage('role_info'); var serviceViewModel = this; $scope.currentPageIndex = 1; @@ -23,8 +24,8 @@ }; $scope.multiSelectData = [ - { id: 1, label: $filter('T')("Sessions Number") }, - { id: 2, label: $filter('T')("Certificate Status") }, + {id: 1, label: $filter('T')("Sessions Number")}, + {id: 2, label: $filter('T')("Certificate Status")}, ]; var columnVisible = localStorageService.getWebStorage("TABLE_CUSTOM_COLUMN_VISIBLE"); @@ -34,7 +35,7 @@ if (columnVisible.sslvpnMonitor) { $scope.multiSelectModel = columnVisible.sslvpnMonitor; } else { - $scope.multiSelectModel = [{ id: 1 }]; + $scope.multiSelectModel = [{id: 1}]; } $scope.multiSelectSettings = { showCheckAll: false, @@ -87,11 +88,15 @@ serviceViewModel.gridColSpan = 5; - var get_vpn_ssl_cert = function () { + let get_vpn_ssl_cert = function () { + let roleId = $scope.role_info.role_id; + if (roleId === null) { + roleId = '0'; + } serviceViewModel.vpn_ssl_cert_map = undefined; - var vpn_ssl_cert_map = {}; - monitorResourceService.get_vpn_ssl_cert().then(function (res) { - if (res && res.status == 200) { + 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 @@ -131,41 +136,60 @@ serviceViewModel.refresh = function () { serviceViewModel.loading = true; - monitoringService.getDeviceList().then(function (resp) { - var deviceMap = {} - _.each(resp, function (host) { - deviceMap[host.ip] = host; - }) - - var query = 'select last(ActiveSessions) from virtualSiteStats where time > now()-20s group by Id, agent_host, IP;' - dashboardService.influxdb_proxy({ "q": query }).then(function (res) { - serviceViewModel.loading = false; - if (res && res.status == 200) { - var virtualSiteList = [] - _.each(res.data.results[0].series, function (series) { - var device_ip = series.tags.agent_host; - if (deviceMap[device_ip]) { - virtualSiteList.push({ - "name": series.tags.Id, - "origin_type": "SSLVPN", - "ip": series.tags.IP, - "device": { - "name": deviceMap[device_ip].name, - "type": deviceMap[device_ip].type, - "id": deviceMap[device_ip].id, - "ip": device_ip, - "device_group": deviceMap[device_ip].device_group, - }, - "graph_data": { - "sessions": series.values[0][1], - } - }) + let agentHost = ''; + let isDeviceAdmin = $scope.role_info.role_id !== null && $scope.role_info.role_id !== '0'; + let virtualSiteList = []; + 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 query = 'select last(ActiveSessions) from virtualSiteStats where time > now()-20s group by Id, agent_host, IP;' + if (isDeviceAdmin) { + query = 'select last(ActiveSessions) from virtualSiteStats where agent_host =~ ' + agentHost + ' and time > now()-20s group by Id, agent_host, IP;' + } + if ((isDeviceAdmin && agentHost !== '') || !isDeviceAdmin) { + dashboardService.influxdb_proxy({"q": query}).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]) { + virtualSiteList.push({ + "name": series.tags.Id, + "origin_type": "SSLVPN", + "ip": series.tags.IP, + "device": { + "name": deviceMap[device_ip].name, + "type": deviceMap[device_ip].type, + "id": deviceMap[device_ip].id, + "ip": device_ip, + "device_group": deviceMap[device_ip].device_group, + }, + "graph_data": { + "sessions": series.values[0][1], + } + }) + } + }) + } + serviceViewModel.serviceList = virtualSiteList; } - }) - serviceViewModel.serviceList = virtualSiteList; + }); + } else { + serviceViewModel.loading = false; } - }); - }) + }) + }); } serviceViewModel.refresh(); Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/admin.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/admin.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/admin.controller.js (working copy) @@ -1,21 +1,18 @@ angular.module('cm.admin') - .controller('adminCtrl', [ - '$rootScope', - '$scope', - '$state', - '$stateParams', - '$uibModal', - '$filter', - '$location', - function ($rootScope, $scope, $state, $stateParams, $uibModal, $filter, $location) { + .controller('adminCtrl', [ + '$rootScope', + '$scope', + '$state', + '$stateParams', + '$uibModal', + '$filter', + '$location', + 'localStorageService', + function ($rootScope, $scope, $state, $stateParams, $uibModal, $filter, $location, localStorageService) { + $scope.role_info = localStorageService.getWebStorage('role_info'); $scope.url_contain = function (url) { - if ($location.path().indexOf(url) > -1) { - return true; - } else { - return false; - } + return $location.path().indexOf(url) > -1; } - - $rootScope.title = 'Administrator'; - } - ]); + $rootScope.title = 'Administrator'; + } + ]); Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/admin.module.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/admin.module.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/admin.module.js (working copy) @@ -12,6 +12,9 @@ controller:'adminCtrl', controllerAs:'admin' } + }, + ncyBreadcrumb: { + label: '{{ "System Administrator" | T }}' } }) .state('index.admin.userMgmt', { @@ -27,6 +30,33 @@ label: '{{ "System Administrator" | T }}' } }) + .state('index.admin.roleMgmt', { + url: '^/admin/roleMgmt', + views: { + 'roleMgmt@index.admin': { + templateUrl: 'app/modules/administrator/roleMgmt/roleMgmt.html', + controller: 'roleMgmtCtrl', + controllerAs: 'roleMgmt' + } + }, + ncyBreadcrumb: { + label: '{{ "Role" | T }}' + } + }) + .state('index.admin.roleMgmt.deviceGroupMap', { + url: '^/admin/roleMgmt/detail/{name}', + views: { + 'main@index': { + templateUrl: 'app/modules/administrator/roleMgmt/detail/role-device-group-mapping.html', + controller: 'roleDeviceGroupMapCtrl', + controllerAs: 'roleDeviceGroupMap' + } + }, + ncyBreadcrumb: { + parent: 'index.admin.roleMgmt', + label: '{{current_name}}', + } + }) .state('index.admin.operLog', { url: '^/admin/operLog', views: { Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/index.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/index.html (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/index.html (working copy) @@ -4,6 +4,10 @@
  • {{ 'System Administrator' | T }}
    • +
  • + {{ 'User Role' | T }} +
  • {{ 'Operation Log' | T }}
    • @@ -15,6 +19,7 @@
    +
    Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/detail/role-device-group-mapping.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/detail/role-device-group-mapping.controller.js (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/detail/role-device-group-mapping.controller.js (working copy) @@ -0,0 +1,154 @@ +angular.module('cm.admin') + .controller('roleDeviceGroupMapCtrl', ['$scope', '$rootScope', '$state', '$stateParams', '$location', '$uibModal', '$aside', 'roleMgmtService', '$filter', 'localStorageService', 'FileUploader', '$timeout', 'deviceService', function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $aside, roleMgmtService, $filter, localStorageService, FileUploader, $timeout, deviceService) { + let roleDeviceGroupMapModel = this; + roleDeviceGroupMapModel.deviceGroupList = []; + roleDeviceGroupMapModel.deviceMap = []; + $scope.role_info = localStorageService.getWebStorage('role_info'); + $rootScope.current_name = $stateParams.name; + $rootScope.title = $stateParams.name; + + $scope.current_name = $stateParams.name; + + function getDeviceGroupMapping() { + // fetch all the device groups and its devices + let roleInfo = {role_id: '0'}; + roleDeviceGroupMapModel.deviceGroupsMap = []; + roleMgmtService.getRoleDeviceGroupMapping(roleInfo).then(function (res) { + if (res && res.status === 200) { + try { + let data = res.data; + if (data.length > 1) { + try { + roleDeviceGroupMapModel.deviceGroupsMap = data[1]['result']; + } catch (e) { + console.error('Error getDeviceGroupMapping returned error.' + e); + roleDeviceGroupMapModel.deviceGroupsMap = []; + } + } + } catch (e) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); + } + } + }); + } + + function getRoleDeviceGroupMapping() { + let roleInfo = JSON.parse(window.localStorage.__roleInfo__); + roleDeviceGroupMapModel.deviceMap = []; + roleDeviceGroupMapModel.deviceGroupList = []; + $rootScope.roleInfo = roleInfo; + // fetch the device group information for the specific role. + roleMgmtService.getRoleDeviceGroupMapping(roleInfo).then(function (res) { + if (res && res.status === 200) { + try { + let data = res.data; + if (data.length > 1) { + try { + let deviceMap = data[1]['result']; + roleDeviceGroupMapModel.deviceGroupList = deviceMap; + $scope.group_list = []; + deviceMap.forEach(function (deviceGroup) { + let device_list = ''; + $scope.group_list.push(deviceGroup['group_name']); + deviceGroup['device_list'].forEach(function (device) { + if (device_list !== '') { + device_list += ', ' + } + device_list += device.ip; + }) + roleDeviceGroupMapModel.deviceMap.push({ + group_name: deviceGroup['group_name'], device_list: device_list + }) + }) + } catch (e) { + console.error('Error getRoleDeviceGroupMapping returned error.' + e); + roleDeviceGroupMapModel.deviceMap = []; + } + } + } catch (e) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); + } + } + }); + } + + roleDeviceGroupMapModel.refresh = function () { + getDeviceGroupMapping(); + getRoleDeviceGroupMapping(); + } + + roleDeviceGroupMapModel.manageDeviceGroup = function () { + if (roleDeviceGroupMapModel.deviceMap === undefined) { + roleDeviceGroupMapModel.deviceMap = []; + } + let modalInstance = $uibModal.open({ + templateUrl: 'app/modules/administrator/roleMgmt/modal/role-device-group-manage.html', + controller: 'roleDeviceGroupManageCtrl', + controllerAs: 'roleDeviceGroupManage', + resolve: { + modalData: { + deviceGroup: roleDeviceGroupMapModel.deviceGroupList, + deviceGroupsMap: roleDeviceGroupMapModel.deviceGroupsMap, + selectedGroups: $scope.group_list, + roleInfo: $rootScope.roleInfo + } + } + }); + modalInstance.result.then(function (selectedGroups) { + let payload = { + role_id: $rootScope.roleInfo['role_id'], + groups: selectedGroups, + } + roleMgmtService.updateRoleDeviceGroupMapping(payload).then(function (res) { + if (res && res.status === 200) { + roleDeviceGroupMapModel.refresh(); + } else { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to update the device group mapping info.'); + } + }); + }); + } + + roleDeviceGroupMapModel.removeDeviceGroup = function (deviceGroup) { + let modalInstance = $uibModal.open({ + templateUrl: 'app/modules/administrator/roleMgmt/modal/role-device-group-del.html', + controller: 'roleDeviceGroupDelController', + controllerAs: 'roleDeviceGroupDel', + resolve: { + delInfo: function () { + return deviceGroup.group_name; + } + } + }); + modalInstance.result.then(function (deviceGroupName) { + if (deviceGroupName) { + let newDeviceGroup = $scope.group_list; + newDeviceGroup = newDeviceGroup.filter(item => item !== deviceGroupName); + let payload = { + role_id: $rootScope.roleInfo['role_id'], + groups: newDeviceGroup, + } + roleMgmtService.updateRoleDeviceGroupMapping(payload).then(function (res) { + if (res && res.status === 200) { + roleDeviceGroupMapModel.refresh(); + } else { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to update the device group mapping info.'); + } + }); + } + }); + } + + getDeviceGroupMapping(); + getRoleDeviceGroupMapping(); + + $scope.currentPageIndex = 1; + $scope.pageSize = 15; + $scope.onPageChange = function (newPage) { + $scope.currentPageIndex = newPage; + }; + }]) Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/detail/role-device-group-mapping.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/detail/role-device-group-mapping.html (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/detail/role-device-group-mapping.html (working copy) @@ -0,0 +1,56 @@ +
    +
    +
    +
    +
    +
    + + +
    +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    No.{{ 'Device Group Name' | T }}{{ 'Managed Devices' | T }}{{ 'Action' | T }}
    {{ $index + 1 }}{{deviceGroup.group_name}}{{deviceGroup.device_list }} + +
    +
    +
    +
    +
    +
    +
    Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-add.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-add.controller.js (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-add.controller.js (working copy) @@ -0,0 +1,66 @@ +angular.module('cm.admin') + .controller('roleAddController', [ + '$scope', + '$rootScope', + '$state', + '$stateParams', + '$uibModal', + '$uibModalInstance', + '$filter', + 'roleMgmtService', + 'localStorageService', + function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, $filter, roleMgmtService, localStorageService) { + var addViewModal = this; + + addViewModal.showProgressBar = function () { + var modalInstance = $uibModal.open({ + templateUrl: 'app/modules/common/templates/progress.html', + controller: 'showProgressCtrl', + controllerAs: 'progress', + backdrop: false + }); + }; + + addViewModal.close = function () { + $uibModalInstance.dismiss(); + }; + addViewModal.submit = function () { + if (addViewModal.role_name === undefined || addViewModal.role_name === '') { + var errorMsg = $filter('T')("{0} can't be empty!", [$filter('T')('Role Name')]); + addViewModal.errorMsg = errorMsg; + return; + } else { + var name_pattern = /^[a-zA-Z_]{1}[a-zA-Z0-9_]*$/; + if (!name_pattern.test(addViewModal.role_name)) { + addViewModal.errorMsg = $filter('T')("Invalid {0}!", [$filter('T')('Role Name')]); + return; + } else if (addViewModal.role_name === 'test' || addViewModal.role_name === 'root') { + addViewModal.errorMsg = $filter('T')("Invalid {0}!", [$filter('T')('Role Name')]); + return; + } + } + addViewModal.showProgressBar(); + var data = { + role_name: addViewModal.role_name.replace(/\s/g, "") + }; + + roleMgmtService.addRole(data).then(function (response) { + $rootScope.$broadcast('endLoading', true); + if (response && response.status === 200) { + if (response.data && !response.data[0]) { + addViewModal.errorMsg = response.data[1]; + } else { + if (response.data[2] && angular.isArray(response.data[2]) + && response.data[2].length === 1 && response.data[2][0].length === 2) { + addViewModal.errorMsg = $filter("T")(response.data[2][0][1]); + } else { + $uibModalInstance.close(true); + } + } + } else { + addViewModal.errorMsg = $filter('T')('Internal server error'); + } + }); + }; + } + ]); Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-add.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-add.html (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-add.html (working copy) @@ -0,0 +1,34 @@ +
    +
    + +
    {{ 'Add User Role' | T}}
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    {{roleAdd.errorMsg}}
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    + + Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-del.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-del.controller.js (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-del.controller.js (working copy) @@ -0,0 +1,52 @@ +angular.module('cm.admin') + .controller('roleDelController', [ + '$scope', + '$rootScope', + '$state', + '$stateParams', + '$uibModal', + '$uibModalInstance', + 'roleMgmtService', + 'delInfo', + '$filter', + function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, roleMgmtService, delInfo, $filter) { + + var delViewModal = this; + + delViewModal.showProgressBar = function () { + var modalInstance = $uibModal.open({ + templateUrl: 'app/modules/common/templates/progress.html', + controller: 'showProgressCtrl', + controllerAs: 'progress', + backdrop: false + }); + }; + + delViewModal.submit = function () { + delViewModal.showProgressBar(); + roleMgmtService + .deleteRole(delInfo) + .then(function (response) { + $rootScope.$broadcast('endLoading', true); + if (response && response.status === 200) { + if (response.data && !response.data[0]) { + delViewModal.errorMsg = response.data[1]; + } else { + if (response.data[2] && angular.isArray(response.data[2]) + && response.data[2].length === 1 && response.data[2][0].length === 2) { + delViewModal.errorMsg = $filter("T")(response.data[2][0][1]); + } else { + $uibModalInstance.close(true); + } + } + } else { + alert($filter('T')(response.data[1])); + } + }); + }; + + delViewModal.close = function () { + $uibModalInstance.dismiss(); + } + } + ]); Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-del.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-del.html (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-del.html (working copy) @@ -0,0 +1,19 @@ +
    +
    + {{ 'Are you sure to perform the deletion?' | T}} +
    +
    {{roleDel.errorMsg}}
    +
    +
    + +
    + + +
    +
    + + Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-del.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-del.controller.js (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-del.controller.js (working copy) @@ -0,0 +1,24 @@ +angular.module('cm.admin') + .controller('roleDeviceGroupDelController', [ + '$scope', + '$rootScope', + '$state', + '$stateParams', + '$uibModal', + '$uibModalInstance', + 'roleMgmtService', + 'delInfo', + '$filter', + function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, roleMgmtService, delInfo, $filter) { + + let delViewModal = this; + + delViewModal.submit = function () { + $uibModalInstance.close(delInfo); + }; + + delViewModal.close = function () { + $uibModalInstance.dismiss(); + } + } + ]); Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-del.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-del.html (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-del.html (working copy) @@ -0,0 +1,19 @@ +
    +
    + {{ 'Are you sure to perform the deletion?' | T}} +
    +
    +
    +
    + +
    + + +
    +
    + + Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-manage.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-manage.controller.js (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-manage.controller.js (working copy) @@ -0,0 +1,17 @@ +angular.module('cm.admin') + .controller('roleDeviceGroupManageCtrl', ['$scope', '$rootScope', '$state', '$stateParams', '$uibModal', '$uibModalInstance', '$filter', 'roleMgmtService', 'localStorageService', 'modalData', 'deviceService', function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, $filter, roleMgmtService, localStorageService, modalData, deviceService) { + var roleDeviceGroupManageModel = this; + + roleDeviceGroupManageModel.showDevice = false; + roleDeviceGroupManageModel.modelData = modalData; + roleDeviceGroupManageModel.deviceGroupsMap = modalData.deviceGroupsMap; + roleDeviceGroupManageModel.selectedGroups = modalData.selectedGroups; + + roleDeviceGroupManageModel.close = function () { + $uibModalInstance.dismiss(); + }; + + roleDeviceGroupManageModel.save = function () { + $uibModalInstance.close(roleDeviceGroupManageModel.selectedGroups); + }; + }]) Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-manage.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-manage.html (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-device-group-manage.html (working copy) @@ -0,0 +1,32 @@ +
    + +

    {{'Bind Devices'|T}}

    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +


    +
    +
    +
    +
    +
    + + +
    Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-edit.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-edit.controller.js (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-edit.controller.js (working copy) @@ -0,0 +1,69 @@ +angular.module('cm.admin') + .controller('roleEditController', [ + '$scope', + '$rootScope', + '$state', + '$stateParams', + '$uibModal', + '$uibModalInstance', + '$filter', + 'roleMgmtService', + 'editInfo', + 'localStorageService', + function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, $filter, roleMgmtService, editInfo, localStorageService) { + var editViewModal = this; + + editViewModal.role_name = editInfo.role_name; + editViewModal.id = editInfo.id; + + editViewModal.showProgressBar = function () { + var modalInstance = $uibModal.open({ + templateUrl: 'app/modules/common/templates/progress.html', + controller: 'showProgressCtrl', + controllerAs: 'progress', + backdrop: false + }); + }; + + editViewModal.close = function () { + $uibModalInstance.dismiss(); + }; + + editViewModal.submit = function () { + if (editViewModal.role_name === undefined || editViewModal.role_name === '') { + var errorMsg = $filter('T')("{0} can't be empty!", [$filter('T')('Role Name')]); + editViewModal.errorMsg = errorMsg; + return; + } else { + var name_pattern = /^[a-zA-Z_]{1}[a-zA-Z0-9_]*$/; + if (!name_pattern.test(editViewModal.role_name)) { + editViewModal.errorMsg = $filter('T')("Invalid {0}!", [$filter('T')('Role Name')]); + return; + } else if (editViewModal.role_name === 'test' || editViewModal.role_name === 'root') { + editViewModal.errorMsg = $filter('T')("Invalid {0}!", [$filter('T')('Role Name')]); + return; + } + } + editViewModal.showProgressBar(); + + var data = { + id: editViewModal.id, + role_name: editViewModal.role_name.replace(/\s/g, "") + }; + + roleMgmtService.updateRole(data).then(function (response) { + $rootScope.$broadcast('endLoading', true); + if (response.data && !response.data[0]) { + editViewModal.errorMsg = response.data[1]; + } else { + if (response.data[2] && angular.isArray(response.data[2]) + && response.data[2].length === 1 && response.data[2][0].length === 2) { + editViewModal.errorMsg = $filter("T")(response.data[2][0][1]); + } else { + $uibModalInstance.close(true); + } + } + }); + }; + } + ]); Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-edit.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-edit.html (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/modal/role-edit.html (working copy) @@ -0,0 +1,32 @@ +
    +
    + +
    {{ 'Edit User Role' | T}}
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    {{roleEdit.errorMsg}}
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/roleMgmt.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/roleMgmt.controller.js (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/roleMgmt.controller.js (working copy) @@ -0,0 +1,101 @@ +angular.module('cm.admin') + .controller('roleMgmtCtrl', [ + '$scope', + '$rootScope', + '$state', + '$stateParams', + '$location', + '$uibModal', + '$aside', + 'roleMgmtService', + '$filter', + 'localStorageService', + 'FileUploader', + '$timeout', + function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $aside, roleMgmtService, $filter, localStorageService, FileUploader, $timeout) { + $rootScope.title = 'User Role'; + $scope.role_info = localStorageService.getWebStorage('role_info'); + + if ($scope.role_info.user_type === "Device Admin") { + $location.path('/admin/userMgmt'); + } + + let roleViewModel = this; + + $scope.currentPageIndex = 1; + $scope.pageSize = 10; + $scope.onPageChange = function (newPage) { + $scope.currentPageIndex = newPage; + }; + + roleViewModel.roleList = undefined; + + roleViewModel.refresh = function () { + getRoles(); + } + + function getRoles() { + roleViewModel.roleList = []; + roleMgmtService.getRoles().then(function (res) { + if (res && res.status === 200) { + roleViewModel.roleList = res.data; + } + }) + } + + roleViewModel.addRole = function () { + let modalInstance = $uibModal.open({ + templateUrl: 'app/modules/administrator/roleMgmt/modal/role-add.html', + controller: 'roleAddController', + controllerAs: 'roleAdd', + resolve: {} + }); + modalInstance.result.then(function (selectedItem) { + if (selectedItem) { + roleViewModel.refresh(); + } + }); + } + + roleViewModel.editRole = function (role) { + let modalInstance = $uibModal.open({ + templateUrl: 'app/modules/administrator/roleMgmt/modal/role-edit.html', + controller: 'roleEditController', + controllerAs: 'roleEdit', + resolve: { + editInfo: function () { + return role; + } + } + }); + modalInstance.result.then(function (selectedItem) { + if (selectedItem) { + roleViewModel.refresh(); + } + }); + } + + roleViewModel.deleteRole = function (role) { + let modalInstance = $uibModal.open({ + templateUrl: 'app/modules/administrator/roleMgmt/modal/role-del.html', + controller: 'roleDelController', + controllerAs: 'roleDel', + resolve: { + delInfo: function () { + return role; + } + } + }); + modalInstance.result.then(function (selectedItem) { + if (selectedItem) { + roleViewModel.refresh(); + } + }); + } + + roleViewModel.manageDeviceGroup = function (role) { + window.localStorage.__roleInfo__ = JSON.stringify({role_id: role.id, name: role.role_name}); + }; + getRoles(); + } + ]) Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/roleMgmt.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/roleMgmt.html (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/roleMgmt.html (working copy) @@ -0,0 +1,57 @@ +
    +
    +
    +
    +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    No.{{ 'Role Name' | T }}{{ 'Action' | T }}
    {{ $index + 1 }} + {{ role.role_name }} + + + + + +
    +
    +
    +
    +
    +
    +
    Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/roleMgmt.service.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/roleMgmt.service.js (revision 0) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/roleMgmt/roleMgmt.service.js (working copy) @@ -0,0 +1,98 @@ +angular.module('cm.admin') + .factory('roleMgmtService', [ + '$q', + '$filter', + '$http', + 'apiService', + function ($q, $filter, $http, api) { + return { + getRoles: getRoles, + addRole: addRole, + updateRole: updateRole, + deleteRole: deleteRole, + getRoleDeviceGroupMapping: getRoleDeviceGroupMapping, + updateRoleDeviceGroupMapping: updateRoleDeviceGroupMapping, + getConfigFilesByRoleId: getConfigFilesByRoleId, + // getDeviceRoles: getDeviceRoles, + // updateRoleDeviceMapping: updateRoleDeviceMapping + } + + function getRoles() { + return api.get('/api/cm/system/user_mgmt/Role/_get_list_data'); + } + + function addRole(data) { + let post_data = { + post_data: JSON.stringify(data) + }; + let url = '/api/cm/system/user_mgmt/Role/_add'; + return api.post(url, post_data); + } + + function updateRole(data) { + let post_data = { + post_data: JSON.stringify({ + id: data.id, + role_name: data.role_name + }) + }; + let url = '/api/cm/system/user_mgmt/Role/_update/id/' + data.id; + return api.post(url, post_data); + } + + function deleteRole(data) { + let post_data = { + pk: JSON.stringify({id: data.id}) + }; + let url = '/api/cm/system/user_mgmt/Role/_delete'; + return api.post(url, post_data); + } + + function getRoleDeviceGroupMapping(roleInfo) { + let roleId = roleInfo["role_id"]; + if (roleId === null) { + roleId = '0'; + } + let post_data = { + "role_id": roleId + } + let requestData = {"action": "FilterRoleDeviceGroups", "options": JSON.stringify(post_data)}; + let url = "/api/cm/device_mgmt/device_group/RoleDeviceGroup/_perform"; + return api.post(url, requestData); + } + + function updateRoleDeviceGroupMapping(payload) { + let url = "/api/cm/device_mgmt/device_group/RoleDeviceGroup/_perform"; + let requestData = {"action": "UpdateRoleDeviceGroups", "options": JSON.stringify(payload)} + return api.post(url, requestData); + } + + function getConfigFilesByRoleId(roleInfo) { + let roleId = roleInfo["role_id"]; + if (roleId === null) { + roleId = '0'; + } + let post_data = { + "role_id": roleId + } + let requestData = {"action": "ConfigFilesByRoleId", "options": JSON.stringify(post_data)}; + let url = "/api/cm/configuration/config_file/ConfigFile/_perform"; + return api.post(url, requestData); + } + + // function getDeviceRoles() { + // return api.get('/api/cm/device_mgmt/device/RoleDevice/_get_list_data'); + // } + + // function updateRoleDeviceMapping(data) { + // let post_data = { + // role_id: data.role_id, + // devices: data.devices + // }; + // let requestData = {"action": "UpdateRoleDevices", "options": JSON.stringify(post_data)}; + // let url = "/api/cm/device_mgmt/device/RoleDevice/_perform"; + // return api.post(url, requestData); + // } + } + ] + ) Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.controller.js (working copy) @@ -11,18 +11,23 @@ 'localStorageService', function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, $filter, userMgmtService, localStorageService) { var addViewModal = this; - addViewModal.roleList = [ + addViewModal.roleId = 0; + addViewModal.typeOfusers = [ { 'name': 'Common Admin', - 'value': 0 + 'value': 'Common Admin' + }, + { + 'name': 'Device Admin', + 'value': 'Device Admin', }, { 'name': 'Super Admin', - 'value': 1 + 'value': 'Super Admin', } ]; - addViewModal.showProgressBar = function() { + addViewModal.showProgressBar = function () { var modalInstance = $uibModal.open({ templateUrl: 'app/modules/common/templates/progress.html', controller: 'showProgressCtrl', @@ -34,6 +39,18 @@ addViewModal.close = function () { $uibModalInstance.dismiss(); }; + + function getUserRoles() { + addViewModal.roleList = undefined; + userMgmtService.getUserRoles().then(function (res) { + if (res && res.status === 200) { + addViewModal.roleList = res.data; + } + }); + } + + getUserRoles(); + addViewModal.submit = function () { if (addViewModal.username === undefined || addViewModal.username === '') { var errorMsg = $filter('T')("{0} can't be empty!", [$filter('T')('User Name')]); @@ -41,7 +58,7 @@ return; } else { var name_pattern = /^[a-zA-Z_]{1}[a-zA-Z0-9_]*$/; - if (!name_pattern.test(addViewModal.username)){ + if (!name_pattern.test(addViewModal.username)) { addViewModal.errorMsg = $filter('T')("Invalid {0}!", [$filter('T')('User Name')]); return; } else if (addViewModal.username === 'test' || addViewModal.username === 'root') { @@ -49,7 +66,12 @@ return; } } - if (addViewModal.root === undefined) { + if (addViewModal.userType === undefined) { + var errorMsg = $filter('T')("{0} can't be empty!", [$filter('T')('Type')]); + addViewModal.errorMsg = errorMsg; + return; + } + if (addViewModal.userType === 'Device Admin' && (addViewModal.roleId === 0 || addViewModal.roleId === undefined)) { var errorMsg = $filter('T')("{0} can't be empty!", [$filter('T')('Role')]); addViewModal.errorMsg = errorMsg; return; @@ -64,7 +86,7 @@ addViewModal.errorMsg = errorMsg; return; } - if (addViewModal.password1 != addViewModal.password2) { + if (addViewModal.password1 !== addViewModal.password2) { addViewModal.errorMsg = $filter('T')("The passwords you typed do not match."); return; } @@ -85,11 +107,15 @@ return; } addViewModal.showProgressBar(); + addViewModal.root = 0; + if (addViewModal.userType === "Super Admin") addViewModal.root = 1; var data = { - username : addViewModal.username.replace(/\s/g, ""), + username: addViewModal.username.replace(/\s/g, ""), + user_type: addViewModal.userType, + role_id: addViewModal.roleId, root: addViewModal.root, - passwords : addViewModal.password1, - level : 'config', + passwords: addViewModal.password1, + level: 'config', email: addViewModal.email.replace(/\s/g, ""), phone_num: addViewModal.phone }; @@ -101,7 +127,7 @@ addViewModal.errorMsg = response.data[1]; } else { if (response.data[2] && angular.isArray(response.data[2]) - && response.data[2].length === 1 && response.data[2][0].length == 2) { + && response.data[2].length === 1 && response.data[2][0].length === 2) { addViewModal.errorMsg = $filter("T")(response.data[2][0][1]); } else { $uibModalInstance.close(true); Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.html (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.add.html (working copy) @@ -1,7 +1,8 @@
    - +

    {{ 'Add System Administrator' | T}}

    @@ -13,11 +14,19 @@
    - +
    - - + + +
    +
    +
    + +
    +
    Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.auth.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.auth.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.auth.controller.js (working copy) @@ -20,7 +20,7 @@ authViewModal.current_user = user_info.current_user; authViewModal.root = user_info.root; authViewModal.current_user_root = modalData.root; - + authViewModal.modalData = modalData; authViewModal.data = { "username": modalData.username, "auth": modalData.auth Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.auth.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.auth.html (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.auth.html (working copy) @@ -1,11 +1,19 @@
    - +

    {{ 'User Authorization' | T}}

    - - + +
    @@ -15,7 +23,8 @@
    @@ -25,12 +34,16 @@
    -
    @@ -39,29 +52,45 @@
    -
    @@ -76,7 +105,7 @@ Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.controller.js (working copy) @@ -13,14 +13,32 @@ function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, $filter, userMgmtService, modalData, localStorageService) { var editViewModal = this; + editViewModal.typeOfusers = [ + { + 'name': 'Common Admin', + 'value': 'Common Admin' + }, + { + 'name': 'Device Admin', + 'value': 'Device Admin', + }, + { + 'name': 'Super Admin', + 'value': 'Super Admin', + } + ]; + editViewModal.root = localStorageService.getWebStorage("user_info").root; editViewModal.username = localStorageService.getWebStorage("user_info").current_user; editViewModal.current_user_name = modalData.username; - var root = modalData.root ? 1:0; + var root = modalData.root ? 1 : 0; + editViewModal.data = { "username": modalData.username, - "root": root+'', + "root": root + '', + userType: modalData.user_type, + roleId: modalData.role_id, //"level": modalData.level, "password1": '......',//for display,not real value "password2": '......', @@ -30,7 +48,7 @@ "phone_num": modalData.phone_num }; - editViewModal.showProgressBar = function() { + editViewModal.showProgressBar = function () { var modalInstance = $uibModal.open({ templateUrl: 'app/modules/common/templates/progress.html', controller: 'showProgressCtrl', @@ -53,7 +71,7 @@ return; } if (editViewModal.data.realPassword1 != editViewModal.data.realPassword2) { - editViewModal.errorMsg = $filter('T')("The passwords you typed do not match."); + editViewModal.errorMsg = $filter('T')("The passwords you typed do not match."); return false; } @@ -75,11 +93,13 @@ editViewModal.showProgressBar(); var data = { - passwords : editViewModal.data.realPassword1, + passwords: editViewModal.data.realPassword1, + user_type: editViewModal.data.userType, + role_id: editViewModal.data.roleId, root: editViewModal.data.root, //level : editViewModal.data.level, email: editViewModal.data.email, - phone_num : editViewModal.data.phone_num + phone_num: editViewModal.data.phone_num }; userMgmtService.modifyUser(editViewModal.data.username, data).then(function (response) { Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.html (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/modal/user.edit.html (working copy) @@ -12,11 +12,16 @@
    + +
    + +
    +
    +
    - +
    Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.controller.js (working copy) @@ -18,7 +18,7 @@ var administratorViewModel = this; administratorViewModel.current_user = user_info.current_user; administratorViewModel.root = user_info.root; - + $scope.currentPageIndex = 1; $scope.pageSize = 10; $scope.onPageChange = function (newPage) { @@ -29,11 +29,7 @@ if (administratorViewModel.root) { return true; } else { - if (administratorViewModel.current_user == user.username) { - return true; - } else { - return false; - } + return administratorViewModel.current_user === user.username; } }; @@ -92,9 +88,11 @@ }; administratorViewModel.editUserInfo = function (user) { - var user = { + user = { username: user.username, root: user.root, + user_type: user.user_type, + role_id: user.role_id, level :'config', passwords: user.passwords, email: user.email, @@ -119,10 +117,11 @@ }; administratorViewModel.editUserAuth = function (user) { - var user = { + user = { username: user.username, root: user.root, - auth: null + auth: null, + user_type: user.user_type, }; // fetch user auth info through api userMgmtService.getUserAuth(user.username).then(function (res) { @@ -151,6 +150,10 @@ window.open("/configExport/system,user_mgmt,Administrator+system,user_mgmt,UserAuthorization", "Export"); }; + administratorViewModel.manageDeviceGroup = function (user) { + window.localStorage.__roleInfo__ = JSON.stringify({role_id: user.role_id, name: user.role_name}); + } + var fileUploader = administratorViewModel.fileUploader = new FileUploader({ queueLimit: 1, url: '/configImport/system,user_mgmt,Administrator+system,user_mgmt,UserAuthorization', Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.html (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.html (working copy) @@ -3,20 +3,27 @@
    - - - - - + + + + +
    - +
    + @@ -24,28 +31,50 @@ - - + + - - - + + + - - + + + + @@ -53,7 +82,8 @@ @@ -64,11 +94,11 @@ Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.service.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.service.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.service.js (working copy) @@ -12,11 +12,13 @@ deleteUser: deleteUser, getUserAuth: getUserAuth, getUserAuthWhileLogin: getUserAuthWhileLogin, - updateUserAuth: updateUserAuth + updateUserAuth: updateUserAuth, + getUserRoles: getUserRoles, + getUserRoleInfo: getUserRoleInfo, }; function getUserList () { - api.get('/api/cm/system/user_mgmt/UserAuthorization/_get_list_data'); + // api.get('/api/cm/system/user_mgmt/UserAuthorization/_get_list_data'); return api.get('/api/cm/system/user_mgmt/Administrator/_get_list_data'); } @@ -59,5 +61,19 @@ var url = '/api/cm/system/user_mgmt/UserAuthorization/_update/username/%22' + name +'%22'; return api.post(url, post_data) } + + function getUserRoles() { + return api.get('/api/cm/system/user_mgmt/Role/_get_list_data'); + } + + function getUserRoleInfo(username) { + let post_data = { + "username": username + } + let requestData = {"action": "GetRoleByUsername", "options": JSON.stringify(post_data)}; + let url = "/api/cm/system/user_mgmt/UserAuthorization/_perform"; + return api.post(url, requestData); + } + } ]); Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.controller.js (working copy) @@ -13,11 +13,17 @@ 'dashboardService', 'storageService', 'timeService', - function ($scope, $rootScope, $state, $stateParams, $uibModal, $filter, $location, $interval, $window, dashboardService, storageService, timeService) { + 'roleMgmtService', + 'localStorageService', + function ($scope, $rootScope, $state, $stateParams, $uibModal, $filter, $location, $interval, $window, dashboardService, storageService, timeService, roleMgmtService, localStorageService) { $rootScope.title = "Overview"; var overviewModel = this; + $scope.role_info = localStorageService.getWebStorage('role_info'); + $scope.isDeviceAdmin = $scope.role_info.role_id !== null && $scope.role_info.role_id !== '0'; + overviewModel.deviceList = []; + overviewModel.agentHost = ''; overviewModel.licenseExpireModal = function (info) { var modalInstance = $uibModal.open({ templateUrl: 'app/modules/common/templates/licenseExpire.html', @@ -99,18 +105,20 @@ overviewModel.tab = "device" overviewModel.changeTab = function (tab) { - if (overviewModel.tab == tab) { + if (overviewModel.tab === tab) { return } overviewModel.tab = tab - if (overviewModel.tab == "device") { - getDeviceMonitoringData() - } else if (overviewModel.tab == "virtual_service") { - getVirtualMonitoringData() - } else if (overviewModel.tab == "real_service") { - getRealMonitoringData() - } else if (overviewModel.tab == "sslvpn_service") { - getSSLVPNMonitoringData() + if (($scope.isDeviceAdmin && overviewModel.agentHost !== '') || !$scope.isDeviceAdmin) { + if (overviewModel.tab === "device") { + getDeviceMonitoringData() + } else if (overviewModel.tab === "virtual_service") { + getVirtualMonitoringData() + } else if (overviewModel.tab === "real_service") { + getRealMonitoringData() + } else if (overviewModel.tab === "sslvpn_service") { + getSSLVPNMonitoringData() + } } } @@ -119,14 +127,19 @@ netMemUsageList: [], throughputList: [] } - var getDeviceMonitoringData = function () { + let getDeviceMonitoringData = function () { overviewModel.deviceLoading = true; - var query = 'select TOP(last, 5) as cpu, agent_host from (select last(cpu_usage) from snmp_system group by agent_host) where time > now()-20s;' + + let query = 'select TOP(last, 5) as cpu, agent_host from (select last(cpu_usage) from snmp_system group by agent_host) where time > now()-20s;' + 'select TOP(last, 5) as net_mem, agent_host from (select last(net_mem_usage) from snmp_system group by agent_host) where time > now()-20s;' + 'select TOP(total, 5), received, sent, agent_host from (select last(received)+last(sent) as total, last(received) as received, last(sent) as sent from (SELECT non_negative_derivative(first(total_in), 1s)*8 as received, non_negative_derivative(first(total_out), 1s)*8 as sent FROM snmp_system WHERE time > now()-30s group by time(10s), agent_host) group by agent_host)' + if($scope.isDeviceAdmin) { + query = 'select TOP(last, 5) as cpu, agent_host from (select last(cpu_usage) from snmp_system group by agent_host) where agent_host =~ '+ overviewModel.agentHost +' and time > now()-20s;' + + 'select TOP(last, 5) as net_mem, agent_host from (select last(net_mem_usage) from snmp_system group by agent_host) where agent_host =~ '+ overviewModel.agentHost +' and time > now()-20s;' + + 'select TOP(total, 5), received, sent, agent_host from (select last(received)+last(sent) as total, last(received) as received, last(sent) as sent from (SELECT non_negative_derivative(first(total_in), 1s)*8 as received, non_negative_derivative(first(total_out), 1s)*8 as sent FROM snmp_system WHERE agent_host =~ '+ overviewModel.agentHost +' and time > now()-30s group by time(10s), agent_host) group by agent_host)' + } dashboardService.influxdb_proxy({ "q": query }).then(function (res) { overviewModel.deviceLoading = false; - if (res && res.status == 200) { + if (res && res.status === 200) { var cpuUsageList = [] if (res.data.results[0].series) { _.each(res.data.results[0].series[0].values, function (value) { @@ -181,14 +194,19 @@ connectionsList: [], SLBThroughputList: [] } - var getVirtualMonitoringData = function () { + let getVirtualMonitoringData = function () { overviewModel.vsLoading = true; - var query = 'select TOP(hits, 5), ServerId, agent_host from (SELECT max(totalHits)-min(totalHits) as hits FROM virtualStats group by agent_host, ServerId) WHERE time > now()-20s;' + + let query = 'select TOP(hits, 5), ServerId, agent_host from (SELECT max(totalHits)-min(totalHits) as hits FROM virtualStats group by agent_host, ServerId) WHERE time > now()-20s;' + 'select TOP(last, 5), ServerId, agent_host from (select last(ConnCnt) from virtualStats group by ServerId, agent_host) where time > now()-20s;' + 'select TOP(total, 5), received, sent, ServerId, agent_host from (select last(InBytePerSec)+last(OutBytePerSec) as total, last(InBytePerSec)*8 as received, last(OutBytePerSec)*8 as sent from virtualStats group by ServerId, agent_host) where time > now()-20s;' + if($scope.isDeviceAdmin) { + query = 'select TOP(hits, 5), ServerId, agent_host from (SELECT max(totalHits)-min(totalHits) as hits FROM virtualStats group by agent_host, ServerId) WHERE agent_host =~ '+ overviewModel.agentHost +' and time > now()-20s;' + + 'select TOP(last, 5), ServerId, agent_host from (select last(ConnCnt) from virtualStats group by ServerId, agent_host) where agent_host =~ '+ overviewModel.agentHost +' and time > now()-20s;' + + 'select TOP(total, 5), received, sent, ServerId, agent_host from (select last(InBytePerSec)+last(OutBytePerSec) as total, last(InBytePerSec)*8 as received, last(OutBytePerSec)*8 as sent from virtualStats group by ServerId, agent_host) where agent_host =~ '+ overviewModel.agentHost +' and time > now()-20s;' + } dashboardService.influxdb_proxy({ "q": query }).then(function (res) { overviewModel.vsLoading = false; - if (res && res.status == 200) { + if (res && res.status === 200) { var hitsList = [] if (res.data.results[0].series) { _.each(res.data.results[0].series[0].values, function (value) { @@ -234,14 +252,19 @@ rsConnPerSecList: [], throughputList: [] } - var getRealMonitoringData = function () { + let getRealMonitoringData = function () { overviewModel.rsLoading = true; - var query = 'select TOP(last, 5), realServerId, agent_host from (select last(rsCntOfReq) from realStats group by realServerId, agent_host) where time > now()-20s;' + + let query = 'select TOP(last, 5), realServerId, agent_host from (select last(rsCntOfReq) from realStats group by realServerId, agent_host) where time > now()-20s;' + 'select TOP(last, 5), realServerId, agent_host from (select last(rsConnPerSec) from realStats group by realServerId, agent_host) where time > now()-20s;' + 'select TOP(total, 5), received, sent, realServerId, agent_host from (select last(rsInBytePerSec)+last(rsOutBytePerSec) as total, last(rsInBytePerSec)*8 as received, last(rsOutBytePerSec)*8 as sent from realStats group by realServerId, agent_host) where time > now()-20s;' + if ($scope.isDeviceAdmin) { + query = 'select TOP(last, 5), realServerId, agent_host from (select last(rsCntOfReq) from realStats group by realServerId, agent_host) where agent_host =~ '+ overviewModel.agentHost +' and time > now()-20s;' + + 'select TOP(last, 5), realServerId, agent_host from (select last(rsConnPerSec) from realStats group by realServerId, agent_host) where agent_host =~ '+ overviewModel.agentHost +' and time > now()-20s;' + + 'select TOP(total, 5), received, sent, realServerId, agent_host from (select last(rsInBytePerSec)+last(rsOutBytePerSec) as total, last(rsInBytePerSec)*8 as received, last(rsOutBytePerSec)*8 as sent from realStats group by realServerId, agent_host) where agent_host =~ '+ overviewModel.agentHost +' and time > now()-20s;' + } dashboardService.influxdb_proxy({ "q": query }).then(function (res) { overviewModel.rsLoading = false; - if (res && res.status == 200) { + if (res && res.status === 200) { var rsCntOfReqList = [] if (res.data.results[0].series) { _.each(res.data.results[0].series[0].values, function (value) { @@ -287,14 +310,19 @@ clientThroughputList: [], ServerThroughputList: [] } - var getSSLVPNMonitoringData = function () { + let getSSLVPNMonitoringData = function () { overviewModel.sslvpnLoading = true; - var query = 'select TOP(last, 5), Id, agent_host from (select last(ActiveSessions) from virtualSiteStats group by Id, agent_host) where time > now()-20s;' + + let query = 'select TOP(last, 5), Id, agent_host from (select last(ActiveSessions) from virtualSiteStats group by Id, agent_host) where time > now()-20s;' + 'select TOP(total, 5), received, sent, Id, agent_host from (select last(received)+last(sent) as total, last(received) as received, last(sent) as sent from (SELECT non_negative_derivative(first(ClientBytesIn), 1s)*8 as received, non_negative_derivative(first(ClientBytesOut), 1s)*8 as sent FROM virtualSiteStats WHERE time > now()-30s group by time(10s), Id, agent_host) group by Id, agent_host);' + 'select TOP(total, 5), received, sent, Id, agent_host from (select last(received)+last(sent) as total, last(received) as received, last(sent) as sent from (SELECT non_negative_derivative(first(ServerBytesIn), 1s)*8 as received, non_negative_derivative(first(ServerBytesOut), 1s)*8 as sent FROM virtualSiteStats WHERE time > now()-30s group by time(10s), Id, agent_host) group by Id, agent_host);' + if ($scope.isDeviceAdmin) { + query = 'select TOP(last, 5), Id, agent_host from (select last(ActiveSessions) from virtualSiteStats group by Id, agent_host) where agent_host =~ '+ overviewModel.agentHost +' and time > now()-20s;' + + 'select TOP(total, 5), received, sent, Id, agent_host from (select last(received)+last(sent) as total, last(received) as received, last(sent) as sent from (SELECT non_negative_derivative(first(ClientBytesIn), 1s)*8 as received, non_negative_derivative(first(ClientBytesOut), 1s)*8 as sent FROM virtualSiteStats WHERE agent_host =~ '+ overviewModel.agentHost +' and time > now()-30s group by time(10s), Id, agent_host) group by Id, agent_host);' + + 'select TOP(total, 5), received, sent, Id, agent_host from (select last(received)+last(sent) as total, last(received) as received, last(sent) as sent from (SELECT non_negative_derivative(first(ServerBytesIn), 1s)*8 as received, non_negative_derivative(first(ServerBytesOut), 1s)*8 as sent FROM virtualSiteStats WHERE agent_host =~ '+ overviewModel.agentHost +' and time > now()-30s group by time(10s), Id, agent_host) group by Id, agent_host);' + } dashboardService.influxdb_proxy({ "q": query }).then(function (res) { overviewModel.sslvpnLoading = false; - if (res && res.status == 200) { + if (res && res.status === 200) { var sessionList = [] if (res.data.results[0].series) { _.each(res.data.results[0].series[0].values, function (value) { @@ -338,10 +366,14 @@ overviewModel.auditRange = "1h"; overviewModel.getAuditingData = function () { + let remoteIPs = []; + overviewModel.deviceList.forEach(function (device) { + remoteIPs.push( device.ip) + }); var duration = timeService.parseDuration(overviewModel.auditRange); var endstamp = (new Date()).getTime() if (auditingService) { - var post_data = { + let post_data = { "from": (endstamp - duration) + '', "to": endstamp + '', "queries": [{ @@ -374,7 +406,7 @@ }); - var post_data = { + post_data = { "size": 50, "sort": [ { @@ -389,6 +421,7 @@ }, "query": { "bool": { + "must": [{"terms": {"tag.remote_ip": remoteIPs}}], "filter": [ { "range": { @@ -429,7 +462,7 @@ // var points = [] // _.each(res["data"]["aggregations"]["2"]["buckets"], function (bucket) { // points.push([bucket.key, bucket.doc_count]) - // }) + // }) // if (points.length > 0) { // newSeries.push({ // name: $filter('T')("Log Count"), @@ -450,21 +483,34 @@ overviewModel.eventNum = 0; overviewModel.refresh = function () { if (monitoringService) { + overviewModel.agentHost = ''; + overviewModel.deviceList = []; + // fetch the device group information for the specific role. monitoringService.getDeviceList().then(function (res) { overviewModel.deviceMap = {} + overviewModel.deviceList = res; _.each(res, function (host) { overviewModel.deviceMap[host.ip] = host; + if (overviewModel.agentHost === '') { + overviewModel.agentHost = overviewModel.agentHost + '/' + host.ip; + } else { + overviewModel.agentHost = overviewModel.agentHost + '|' + host.ip; + } }); - if (overviewModel.tab == "device") { - getDeviceMonitoringData() - } else if (overviewModel.tab == "virtual_service") { - getVirtualMonitoringData() - } else if (overviewModel.tab == "real_service") { - getRealMonitoringData() - } else if (overviewModel.tab == "sslvpn_service") { - getSSLVPNMonitoringData() + if (overviewModel.agentHost !== '') overviewModel.agentHost += '/'; + if (($scope.isDeviceAdmin && overviewModel.agentHost !== '') || !$scope.isDeviceAdmin) { + if (overviewModel.tab === "device") { + getDeviceMonitoringData() + } else if (overviewModel.tab === "virtual_service") { + getVirtualMonitoringData() + } else if (overviewModel.tab === "real_service") { + getRealMonitoringData() + } else if (overviewModel.tab === "sslvpn_service") { + getSSLVPNMonitoringData() + } } - }); + overviewModel.getAuditingData(); + }) } if (alertService) { @@ -520,63 +566,8 @@ overviewModel.eventNum = eventNum; } }); - - // if (reportingService) { - // reportingService.get_report_list().then(function (resp) { - // if (resp && resp.status === 200) { - // if (resp.data.code == 0) { - // var running = 0; - // var not_running = 0; - // var ready = 0; - // _.each(resp.data.data.data, function (each_data) { - // if (each_data.status == 1) { - // running++ - // } else if (each_data.status == 0) { - // not_running++ - // } else { - // ready++ - // } - // }) - // overviewModel.reportingWidget.seriesData = [{ - // name: $filter('T')('Not Running'), - // value: not_running - // }, { - // name: $filter('T')('Running'), - // value: running - // }, { - // name: $filter('T')('Ready'), - // value: ready - // }] - // } - // } - // }); - - // var start = 0; //从第几条数据开始查询，默认0条 - // var number = 4; //每页显示条数 - // var page = start / number + 1 - // var url = "?page=" + page + "&page_size=" + number; - // url += "&status=3" - - // reportingService.getReportLogList(url).then(function (res) { - // if (res.status === 200) { - // if (res.data.code === 0) { - // var dataList = res.data.data.data; - // dataList.forEach(function (item) { - // var date = new Date(item.start_time); - // item.time_text = date.format('yyyy-mm-dd HH:MM:ss'); - // item.subject_type = item.tags[0] - // item.subject_name = item.tags[1] - // // item.file_size = JSON.parse(item.result)['size'] - // }) - // overviewModel.reportList = dataList; - // } - // } - // }) - // } - } overviewModel.refresh(); - overviewModel.getAuditingData(); if (!angular.isDefined($scope.DataTimer)) { $scope.DataTimer = $interval(function () { @@ -584,11 +575,11 @@ }, 10000); } - if (!angular.isDefined($scope.DataTimer2)) { - $scope.DataTimer2 = $interval(function () { - overviewModel.getAuditingData(); - }, 30000); - } + // if (!angular.isDefined($scope.DataTimer2)) { + // $scope.DataTimer2 = $interval(function () { + // overviewModel.getAuditingData(); + // }, 30000); + // } $scope.$on('$destroy', function () { if (angular.isDefined($scope.DataTimer)) { Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/system_statistics/system_statistics.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/system_statistics/system_statistics.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/system_statistics/system_statistics.controller.js (working copy) @@ -15,12 +15,14 @@ 'storageService', '$stateParams', '$uibModal', - function ($scope, $q, $rootScope, $location, $filter, $state, $interval, dashboardService, deviceService, localStorageService, taskService, storageService, $stateParams, $uibModal) { + 'roleMgmtService', + function ($scope, $q, $rootScope, $location, $filter, $state, $interval, dashboardService, deviceService, localStorageService, taskService, storageService, $stateParams, $uibModal, roleMgmtService) { $rootScope.title = "Dashboard"; $scope.allow_config = $rootScope.allow_config; - - var dashboard = this; - + $scope.role_info = localStorageService.getWebStorage('role_info'); + $scope.isDeviceAdmin = $scope.role_info.role_id !== null && $scope.role_info.role_id !== '0'; + let dashboard = this; + dashboard.agentHost = ''; dashboard.deviceNum = 'N/A'; dashboard.serviceNum = 'N/A'; dashboard.taskNum = 'N/A'; @@ -105,8 +107,8 @@ seriesData: [0] } - var getSystemStatusData = function () { - var post_data = { + let getSystemStatusData = function () { + let post_data = { "from": "now-20s", "to": "now", "queries": [{ @@ -128,7 +130,7 @@ } }); - var post_data = { + post_data = { "from": "now-20s", "to": "now-10s", "queries": [{ @@ -164,8 +166,8 @@ dashboard.readRate = 'N/A'; dashboard.writeRate = 'N/A'; - var getDiskStatusData = function () { - var post_data = { + let getDiskStatusData = function () { + let post_data = { "from": "now-20s", "to": "now-10s", "queries": [{ @@ -181,9 +183,15 @@ var seriesData = []; _.each(res.data.data.results['A'].series, function (series) { if (series.name == "mean") { - seriesData.push({ name: dashboard.diskStatusWidget.legendData[0], value: series.points[0][1] }) + seriesData.push({ + name: dashboard.diskStatusWidget.legendData[0], + value: series.points[0][1] + }) } else if (series.name == "mean_1") { - seriesData.push({ name: dashboard.diskStatusWidget.legendData[1], value: series.points[0][1] }) + seriesData.push({ + name: dashboard.diskStatusWidget.legendData[1], + value: series.points[0][1] + }) } else if (series.name == "sum") { dashboard.readRate = storageService.formatBigData(series.points[0][1]) } else if (series.name == "sum_1") { @@ -199,10 +207,10 @@ title: $filter('T')('Tasks'), type: 'task', legendData: [$filter('T')('Waiting'), $filter('T')('Done'), $filter('T')('Ongoing'), $filter('T')('Failed')], - seriesData: [{ name: $filter('T')('Waiting'), value: 0 }, - { name: $filter('T')('Done'), value: 0 }, - { name: $filter('T')('Ongoing'), value: 0 }, - { name: $filter('T')('Failed'), value: 0 }] + seriesData: [{name: $filter('T')('Waiting'), value: 0}, + {name: $filter('T')('Done'), value: 0}, + {name: $filter('T')('Ongoing'), value: 0}, + {name: $filter('T')('Failed'), value: 0}] } var filter = function (arr, status) { @@ -231,19 +239,20 @@ dashboard.Inbound = 'N/A' dashboard.Outbound = 'N/A' - var getSystemThroughputData = function () { - var post_data = { + let getSystemThroughputData = function () { + let query = "SELECT (bytes_recv)*8/10, (bytes_sent)*8/10 FROM net_throughput WHERE $timeFilter AND interface = 'all'" + let post_data = { "from": "now-30s", "to": "now-10s", "queries": [{ "datasourceId": 1, - "query": "SELECT (bytes_recv)*8/10, (bytes_sent)*8/10 FROM net_throughput WHERE $timeFilter AND interface = 'all'", + "query": query, "rawQuery": true, "resultFormat": "time_series" }] }; dashboardService.get_composer_data('/composer/tsdb/query', JSON.stringify(post_data)).then(function (res) { - if (res && res.data.code == 0) { + if (res && res.data.code === 0) { _.each(res.data.data.results['A'].series, function (series) { if (series.name == "bytes_recv") { dashboard.Inbound = storageService.formatBigData(series.points[0][1]); @@ -305,96 +314,120 @@ if (dashboard.get_loading()) { dashboard.serviceList = []; - - deviceService.getDeviceList().then(function (res) { + let device_list = []; + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { dashboard.deviceNum = 0; + dashboard.agentHost = ''; if (res && res.status === 200 && res.data instanceof Array) { - var deviceMap = {}; - var deviceRunMap = {}; - var deviceStopMap = {}; - var total = 0; - _.each(device_type_info.DEVICE_STD_LIST, function (item) { - deviceRunMap[item] = 0 - deviceStopMap[item] = 0 - }) - - var CalService = function () { - if (dashboard.get_loading()) { - dashboard.serviceNum = 0; - var serviceMap = { - "SLB": 0, - "SSLVPN": 0 - }; - _.each(dashboard.serviceList, function (service) { - dashboard.serviceNum++ - if (service.origin_type == "SLB_vs") { - serviceMap["SLB"]++ - } else if (service.origin_type == "SSLVPN") { - serviceMap["SSLVPN"]++ - } + let data = res.data; + if (data.length > 1) { + try { + let deviceGMap = data[1]['result']; + deviceGMap.forEach(function (deviceGroup) { + deviceGroup['device_list'].forEach(function (device) { + device_list.push(device); + if (dashboard.agentHost === '') { + dashboard.agentHost = dashboard.agentHost + '/' + device.ip; + } else { + dashboard.agentHost = dashboard.agentHost + '|' + device.ip; + } + }) }) - dashboard.DeviceWidget.serviceMap = serviceMap; - } - } + if (dashboard.agentHost !== '') dashboard.agentHost += '/'; + var deviceMap = {}; + var deviceRunMap = {}; + var deviceStopMap = {}; + var total = 0; + _.each(device_type_info.DEVICE_STD_LIST, function (item) { + deviceRunMap[item] = 0 + deviceStopMap[item] = 0 + }) + + var CalService = function () { + if (dashboard.get_loading()) { + dashboard.serviceNum = 0; + var serviceMap = { + "SLB": 0, + "SSLVPN": 0 + }; + _.each(dashboard.serviceList, function (service) { + dashboard.serviceNum++ + if (service.origin_type == "SLB_vs") { + serviceMap["SLB"]++ + } else if (service.origin_type == "SSLVPN") { + serviceMap["SSLVPN"]++ + } + }) + dashboard.DeviceWidget.serviceMap = serviceMap; + } + } - _.each(res.data, function (host) { - dashboard.deviceNum++ - if (host.connection) { - if (device_type_info.ADC_TYPE_LIST.indexOf(host.type.toLowerCase()) != -1) { - dashboard.all_loadings[host.name] = false; - dashboardService.getAllVirtualService(host.name).then(function (res) { - dashboard.all_loadings[host.name] = true; - if (res && res.status === 200 && res.data.VirtualService) { - _.each(res.data.VirtualService, function (data) { - // if (data.protocol != 'vlink') { - var tmp = { - "name": data.service_name, - "origin_type": "SLB_vs", - "service_type": data.protocol + _.each(device_list, function (host) { + dashboard.deviceNum++ + if (host.connection) { + if (device_type_info.ADC_TYPE_LIST.indexOf(host.type.toLowerCase()) !== -1) { + dashboard.all_loadings[host.name] = false; + dashboardService.getAllVirtualService(host.name).then(function (res) { + dashboard.all_loadings[host.name] = true; + if (res && res.status === 200 && res.data.VirtualService) { + _.each(res.data.VirtualService, function (data) { + // if (data.protocol != 'vlink') { + var tmp = { + "name": data.service_name, + "origin_type": "SLB_vs", + "service_type": data.protocol + } + dashboard.serviceList.push(tmp) + // } + }); } - dashboard.serviceList.push(tmp) - // } + CalService() }); - } - CalService() - }); - } else if (device_type_info.VPN_TYPE_LIST.indexOf(host.type.toLowerCase()) != -1) { - dashboard.all_loadings[host.name] = false; - dashboardService.getAllVirtualSite(host.name).then(function (res) { - dashboard.all_loadings[host.name] = true; - if (res && res.status === 200 && res.data.contents) { - _.each(res.data.contents, function (data) { - var tmp = { - "name": data.vsite_name, - "origin_type": "SSLVPN", - "service_type": data.vsite_type, + } else if (device_type_info.VPN_TYPE_LIST.indexOf(host.type.toLowerCase()) !== -1) { + dashboard.all_loadings[host.name] = false; + dashboardService.getAllVirtualSite(host.name).then(function (res) { + dashboard.all_loadings[host.name] = true; + if (res && res.status === 200 && res.data.contents) { + _.each(res.data.contents, function (data) { + var tmp = { + "name": data.vsite_name, + "origin_type": "SSLVPN", + "service_type": data.vsite_type, + } + dashboard.serviceList.push(tmp) + }); } - dashboard.serviceList.push(tmp) + CalService() }); } - CalService() - }); + deviceRunMap[host.type]++ + } else { + deviceStopMap[host.type]++ + } + if (deviceMap[host.type]) { + deviceMap[host.type]++ + } else { + deviceMap[host.type] = 1 + } + total++ + }); + + dashboard.DeviceWidget.statusMap = { + all: total, + running: deviceRunMap, + not_running: deviceStopMap + }; + dashboard.DeviceWidget.deviceMap = deviceMap; + if (($scope.isDeviceAdmin && dashboard.agentHost !== '') || !$scope.isDeviceAdmin) { + getSystemThroughputData(); } - deviceRunMap[host.type]++ - } else { - deviceStopMap[host.type]++ + } catch (e) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); } - if (deviceMap[host.type]) { - deviceMap[host.type]++ - } else { - deviceMap[host.type] = 1 - } - total++ - }); - - dashboard.DeviceWidget.statusMap = { - all: total, - running: deviceRunMap, - not_running: deviceStopMap - }; - dashboard.DeviceWidget.deviceMap = deviceMap; + } } - if (dashboard.deviceNum == 0) { + if (dashboard.deviceNum === 0) { dashboard.serviceNum = 0; } }); @@ -403,15 +436,12 @@ getSystemStatusData(); getDiskStatusData(); - getSystemThroughputData(); getTaskInfo(); getNubData(); - if (!angular.isDefined($scope.DataTimer)) { $scope.DataTimer = $interval(function () { getSystemStatusData(); getDiskStatusData(); - getSystemThroughputData(); getTaskInfo(); getNubData(); }, 10000); @@ -427,8 +457,7 @@ ]) .directive('diskUsage', ['$filter', '$state', '$interval', 'storageService', function ($filter, $state, $interval, storageService) { return { - scope: { - }, + scope: {}, restrict: 'A', replace: true, link: function ($scope, element, attrs, controller) { @@ -495,6 +524,7 @@ default: break; } + function go(url) { $state.go(url); }; @@ -535,8 +565,7 @@ }]) .directive('statisticSimplePie', ['$filter', '$state', '$interval', function ($filter, $state, $interval) { return { - scope: { - }, + scope: {}, restrict: 'A', replace: true, link: function ($scope, element, attrs, controller) { @@ -580,12 +609,10 @@ radius: '50%', center: ['50%', '45%'], label: { - textStyle: { - } + textStyle: {} }, labelLine: { - lineStyle: { - }, + lineStyle: {}, smooth: 0.2, length: 25, length2: 15 @@ -620,6 +647,7 @@ default: break; } + function go(url) { $state.go(url); }; @@ -645,8 +673,7 @@ }]) .directive('liquidGraph', ['$filter', '$uibModal', '$state', function ($filter, $uibModal, $state) { return { - scope: { - }, + scope: {}, restrict: 'A', replace: true, link: function ($scope, element, attrs, controller) { @@ -740,8 +767,7 @@ }]) .directive('deviceMonitoring', ['$filter', '$uibModal', '$state', function ($filter, $uibModal, $state) { return { - scope: { - }, + scope: {}, restrict: 'A', replace: true, link: function ($scope, element, attrs, controller) { @@ -850,62 +876,63 @@ // yAxisIndex: 1, // z: 3, }, - // { - // type: 'bar', - // stack: 'component', - // silent: true, - // // xAxisIndex: 1, - // // yAxisIndex: 1, - // itemStyle: { - // normal: { - // color: 'transparent' - // } - // } - // }, - { - name: $filter('T')('Running'), - type: 'bar', - stack: "total", - }, - // { - // type: 'bar', - // stack: 'chart', - // silent: true, - // itemStyle: { - // normal: { - // color: 'transparent' - // } - // } - // }, - { - type: 'pie', - radius: [0, '30%'], - center: ['75%', '25%'], - itemStyle: { - shadowColor: 'rgba(0, 0, 0, 0.5)', - shadowBlur: 5 - }, - animationType: 'scale', - animationEasing: 'elasticOut', - animationDelay: function (idx) { - return Math.random() * 200; - } - }, { - type: 'pie', - radius: [0, '30%'], - center: ['75%', '75%'], - itemStyle: { - shadowColor: 'rgba(0, 0, 0, 0.5)', - shadowBlur: 5 + // { + // type: 'bar', + // stack: 'component', + // silent: true, + // // xAxisIndex: 1, + // // yAxisIndex: 1, + // itemStyle: { + // normal: { + // color: 'transparent' + // } + // } + // }, + { + name: $filter('T')('Running'), + type: 'bar', + stack: "total", }, - animationType: 'scale', - animationEasing: 'elasticOut', - animationDelay: function (idx) { - return Math.random() * 200; - } - }] + // { + // type: 'bar', + // stack: 'chart', + // silent: true, + // itemStyle: { + // normal: { + // color: 'transparent' + // } + // } + // }, + { + type: 'pie', + radius: [0, '30%'], + center: ['75%', '25%'], + itemStyle: { + shadowColor: 'rgba(0, 0, 0, 0.5)', + shadowBlur: 5 + }, + animationType: 'scale', + animationEasing: 'elasticOut', + animationDelay: function (idx) { + return Math.random() * 200; + } + }, { + type: 'pie', + radius: [0, '30%'], + center: ['75%', '75%'], + itemStyle: { + shadowColor: 'rgba(0, 0, 0, 0.5)', + shadowBlur: 5 + }, + animationType: 'scale', + animationEasing: 'elasticOut', + animationDelay: function (idx) { + return Math.random() * 200; + } + }] } - var cur_theme = window.localStorage.theme || 'dark';; + var cur_theme = window.localStorage.theme || 'dark'; + if (cur_theme != 'dark') { option.title[0].textStyle.color = '#555'; option.title[1].textStyle.color = '#555'; Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device/device.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device/device.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device/device.controller.js (working copy) @@ -12,11 +12,14 @@ '$filter', '$interval', 'userAuthService', - function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $aside, deviceService, dashboardService, $filter, $interval, userAuthService) { + 'roleMgmtService', + 'localStorageService', + function ($scope, $rootScope, $state, $stateParams, $location, $uibModal, $aside, deviceService, dashboardService, $filter, $interval, userAuthService, roleMgmtService, localStorageService) { $rootScope.title = 'Device'; //get user auth data - //here not use localStorageService, beacuse we want to get raw str + //here not use localStorageService, because we want to get raw str $scope.user_auth_data = userAuthService.build_auth_data(0, localStorage["auth_data"]); + $scope.role_info = localStorageService.getWebStorage('role_info'); $scope.currentPageIndex = 1; $scope.pageSize = 10; @@ -39,25 +42,35 @@ return "REST API" } - // $scope.$on("$destroy", function() { - // clearInterval(deviceViewModel.timer); - // }); - - // deviceViewModel.timer = setInterval(function(){ - // getDevice(); - // }, 10000); + getRoleDeviceGroupMapping(); + function getRoleDeviceGroupMapping() { + deviceViewModel.deviceList = []; - getDevice(); - function getDevice() { - deviceService.getDeviceList().then(function (res) { + // fetch the device group information for the specific role. + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { if (res && res.status === 200) { - var deviceList = res.data; - deviceList.forEach(function (item) { - item.protocol_verbose = getProtocolVerbose(item.protocol) - item.webui = 'https://' + item.ip + ':' + item.webui_port; - }) - deviceViewModel.deviceList = deviceList; + try { + let data = res.data; + if (data.length > 1) { + try { + let deviceMap = data[1]['result']; + deviceMap.forEach(function (deviceGroup) { + deviceGroup['device_list'].forEach(function (device) { + device.protocol_verbose = getProtocolVerbose(device.protocol) + device.webui = 'https://' + device.ip + ':' + device.webui_port; + deviceViewModel.deviceList.push(device); + }) + }) + } catch (e) { + console.error('Error getRoleDeviceGroupMapping returned error.' + e); + deviceViewModel.deviceList = []; + } + } + } catch (e) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); + } } }); } @@ -74,14 +87,14 @@ }); modalInstance.result.then(function (selectedItem) { if (selectedItem) { - getDevice(); + deviceViewModel.refresh(); } }); }; deviceViewModel.refresh = function () { deviceViewModel.deviceList = undefined; - getDevice(); + getRoleDeviceGroupMapping(); }; deviceViewModel.getDetail = function (deviceItem) { @@ -112,7 +125,7 @@ }); modalInstance.result.then(function (selectedItem) { if (selectedItem) { - getDevice(); + deviceViewModel.refresh(); } }); }; @@ -134,7 +147,7 @@ }; deviceViewModel.licenseInfo = function (deviceItem) { - var licenseKey = { + $rootScope.__licenseKey__ = { id: deviceItem.id, name: deviceItem.name, type: deviceItem.type, @@ -142,7 +155,6 @@ license_date: deviceItem.license_date, license_feature: deviceItem.license_feature }; - $rootScope.__licenseKey__ = licenseKey; var modalInstance = $uibModal.open({ templateUrl: 'app/modules/device/modal/device.license.html', @@ -154,7 +166,7 @@ }); modalInstance.result.then(function (selectedItem) { if (selectedItem) { - getDevice(); + deviceViewModel.refresh(); } }); } Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device/device.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device/device.html (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device/device.html (working copy) @@ -9,7 +9,7 @@
    - +
    @@ -93,4 +93,4 @@ - \ No newline at end of file + Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group.controller.js (working copy) @@ -9,11 +9,14 @@ '$uibModal', 'deviceGroupService', 'userAuthService', - function($scope, $rootScope, $state, $location, $filter, $uibModal, deviceGroupService, userAuthService) { + 'localStorageService', + 'roleMgmtService', + function($scope, $rootScope, $state, $location, $filter, $uibModal, deviceGroupService, userAuthService, localStorageService, roleMgmtService) { $rootScope.title = 'Device Group'; //get user auth data - //here not use localStorageService, beacuse we want to get raw str + //here not use localStorageService, because we want to get raw str $scope.user_auth_data = userAuthService.build_auth_data(0, localStorage["auth_data"]); + $scope.role_info = localStorageService.getWebStorage('role_info'); var deviceGroupTableView = this; @@ -32,34 +35,9 @@ }); }; - deviceGroupTableView.get_device_group = function () { - deviceGroupService - .getDeviceGroup() - .then(function (res) { - if (res && res.status === 200) { - for (var i = res.data.length - 1; i >= 0; i--) { - var device_list = []; - if (res.data[i]["device_list"]) { - for (var j = res.data[i]["device_list"].length - 1; j >= 0; j--) { - device_list.push(res.data[i]["device_list"][j]["ip"]); - } - res.data[i]["device_list"] = device_list.join(", "); - res.data[i]["devices"] = device_list; - } else { - res.data[i]["device_list"] = ""; - res.data[i]["devices"] = []; - } - } - deviceGroupTableView.tableData = res.data; - } - }); - }; - - deviceGroupTableView.get_device_group(); - deviceGroupTableView.refresh = function () { deviceGroupTableView.tableData = undefined; - deviceGroupTableView.get_device_group(); + getRoleDeviceGroupMapping(); }; deviceGroupTableView.showGroupAddModal = function () { @@ -96,7 +74,7 @@ }; deviceGroupTableView.delete = function (row) { - reminder = confirm($filter('T')('If you delete the device group also deletes all devices bound to this device group. Are you sure you want to delete it?')); + let reminder = confirm($filter('T')('If you delete the device group also deletes all devices bound to this device group. Are you sure you want to delete it?')); if (reminder) { deviceGroupTableView.showProgressBar(); deviceGroupService @@ -115,6 +93,51 @@ }); } }; + + function getRoleDeviceGroupMapping() { + deviceGroupTableView.deviceMap = []; + deviceGroupTableView.deviceGroupList = []; + + // fetch the device group information for the specific role. + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { + if (res && res.status === 200) { + try { + let data = res.data; + if (data.length > 1) { + try { + let deviceMap = data[1]['result']; + deviceGroupTableView.deviceGroupList = deviceMap; + $scope.group_list = []; + deviceMap.forEach(function (deviceGroup) { + let device_list = ''; + let devices = []; + $scope.group_list.push(deviceGroup['group_name']); + deviceGroup['device_list'].forEach(function (device) { + if (device_list !== '') { + device_list += ', ' + } + device_list += device.ip; + devices.push(device.ip); + }) + deviceGroupTableView.deviceMap.push({ + name: deviceGroup['group_name'], device_list: device_list, devices: devices + }) + }) + deviceGroupTableView.tableData = deviceGroupTableView.deviceMap; + } catch (e) { + console.error('Error getRoleDeviceGroupMapping returned error.' + e); + deviceGroupTableView.deviceMap = []; + } + } + } catch (e) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); + } + } + }); + } + + getRoleDeviceGroupMapping(); } ]) .controller('deviceGroupAddCtrl', [ @@ -195,7 +218,7 @@ deviceGroupManageView.modalClose = function () { $uibModalInstance.dismiss(); } - + deviceService.getDeviceList().then(function (res) { if (res && res.status === 200) { var devices_list = []; @@ -224,7 +247,7 @@ $rootScope.$broadcast('endLoading', true); if (res&&res.status === 200) { if (res.data[0]) { - if (res.data[2] && res.data[2][0] && res.data[2][0][0] == "warning") { + if (res.data[2] && res.data[2][0] && res.data[2][0][0] === "warning") { $rootScope.TipService.setMessage(res.data[2][0][1]); } else { $uibModalInstance.close(true); Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group.html (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group.html (working copy) @@ -1,47 +1,57 @@ -
    -
    - - - -
    -
    -
    - - -
    +
    +
    + + + +
    +
    +
    + +
    -
    -
    -
    -
    No. {{ 'Username' | T }} {{ 'Type' | T }}{{ 'Role Name' | T }} {{ 'Email' | T }} {{ 'Phone' | T }} {{ 'Action' | T }}
    - +
    {{ $index + 1 }}{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{ user.username }}{{ $index + 1 }} + {{ ((currentPageIndex - 1) * + pageSize) + $index + 1 }} + {{ user.username }} + {{ user.username }}{{ 'Super Admin' | T }}{{ 'Common Admin' | T }}{{ user.user_type }}Super AdminCommon Admin{{ user.role_name }} {{ user.email }} {{ user.phone_num }} - - - + + + +
    -
    +
    - - - - - - - - - - - - - - - - -
    No.{{'Name'|T}}{{'Managed Devices'|T}}{{'Action'|T}}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{row.name}}{{row.device_list}} - - -
    -
    -
    -
    -
    - -
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + +
    No.{{'Name'|T}}{{'Managed Devices'|T}}{{'Action'|T}}
    {{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{row.name}}{{row.device_list}} + + + + + + +
    +
    +
    +
    +
    +
    - -
    - \ No newline at end of file + + + + Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_add.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_add.html (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_add.html (working copy) @@ -10,7 +10,8 @@
    - +
    @@ -18,6 +19,8 @@
    - +
    Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_manage.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_manage.html (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/device_group/device_group_manage.html (working copy) @@ -21,6 +21,8 @@
    - +
    Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/system-update.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/system-update.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/image/modal/system-update.controller.js (working copy) @@ -12,8 +12,11 @@ 'deviceService', 'deviceGroupService', 'sysUpdateImageInfo', - function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, $filter, apiService, imageTableService, deviceService, deviceGroupService, sysUpdateImageInfo) { + 'roleMgmtService', + 'localStorageService', + function ($scope, $rootScope, $state, $stateParams, $uibModal, $uibModalInstance, $filter, apiService, imageTableService, deviceService, deviceGroupService, sysUpdateImageInfo, roleMgmtService, localStorageService) { + $scope.role_info = localStorageService.getWebStorage('role_info'); var sysUpdateViewModal = this; sysUpdateViewModal.isDeferred = false; sysUpdateViewModal.backup_db = false; @@ -24,62 +27,65 @@ sysUpdateViewModal.sysUpdateInfo = sysUpdateImageInfo; sysUpdateViewModal.isASFDevice = new Object(); sysUpdateViewModal.asfProductName = ["asf", "vasf", 'netwaf', 'vnetwaf']; - - deviceService.getDeviceList().then(function (res) { + + sysUpdateViewModal.deviceList = []; + sysUpdateViewModal.deviceGroupList = []; + // fetch the device group information for the specific role. + roleMgmtService.getRoleDeviceGroupMapping($scope.role_info).then(function (res) { if (res && res.status === 200) { - sysUpdateViewModal.deviceList = res.data; - _.each(res.data, function(data){ - sysUpdateViewModal.isASFDevice[data['name']] = false; - if (sysUpdateViewModal.asfProductName.indexOf(data['type'].toLowerCase()) != -1) { - sysUpdateViewModal.isASFDevice[data['name']] = true; + try { + let data = res.data; + if (data.length > 1) { + try { + let deviceMap = data[1]['result']; + deviceMap.forEach(function (deviceGroup) { + deviceGroup['name'] = deviceGroup['group_name']; + deviceGroup['device_list'].forEach(function (device) { + sysUpdateViewModal.isASFDevice[device['name']] = false + if (sysUpdateViewModal.asfProductName.indexOf(device['type'].toLowerCase()) !== -1) { + sysUpdateViewModal.isASFDevice[data['name']] = true; + } + sysUpdateViewModal.deviceList.push(device); + }) + }) + sysUpdateViewModal.deviceGroupList = deviceMap; + } catch (e) { + console.error('Error getRoleDeviceGroupMapping returned error.' + e); + sysUpdateViewModal.deviceList = [] + sysUpdateViewModal.deviceGroupList = []; + } } - }); - } else { - sysUpdateViewModal.deviceList = []; + if (sysUpdateViewModal.deviceGroupList.length > 0) sysUpdateViewModal.showDeviceGroup = true; + if (sysUpdateViewModal.deviceList.length > 0)sysUpdateViewModal.showDevice = true; + } catch (e) { + console.log('500 - Internal server error.'); + alert('500 - Internal server error. Failed to fetch device group mapping info.'); + } } - //data gotten, display the dropdown box - sysUpdateViewModal.showDevice = true; }); - - deviceGroupService.getDeviceGroup().then(function (res) { - if (res && res.status === 200) { - sysUpdateViewModal.deviceGroupList = $filter("FG")(res.data); - _.each(res.data, function(data){ - sysUpdateViewModal.isASFDevice[data['name']] = false; - _.each(data['device_list'], function(each_data){ - if (sysUpdateViewModal.asfProductName.indexOf(each_data['type'].toLowerCase()) != -1) { - sysUpdateViewModal.isASFDevice[data['name']] = true; - } - }); - }); - } else { - sysUpdateViewModal.deviceGroupList = []; - } - sysUpdateViewModal.showDeviceGroup = true; - }); - $scope.$watch(function() { + $scope.$watch(function () { return sysUpdateViewModal.option; - },function(value) { + }, function (value) { if (value == '2') { sysUpdateViewModal.isDeferred = true; } else { sysUpdateViewModal.isDeferred = false; } }, true); - + sysUpdateViewModal.click_device = function () { sysUpdateViewModal.showDeviceTab = true; - sysUpdateViewModal.checkDeviceType(sysUpdateViewModal.device||[]); + sysUpdateViewModal.checkDeviceType(sysUpdateViewModal.device || []); }; - + sysUpdateViewModal.click_device_group = function () { sysUpdateViewModal.showDeviceTab = false; - sysUpdateViewModal.checkDeviceType(sysUpdateViewModal.device_group||[]); + sysUpdateViewModal.checkDeviceType(sysUpdateViewModal.device_group || []); }; - - sysUpdateViewModal.checkDeviceType = function(device_name) { - for (var i=0; i<= device_name.length; i++) { + + sysUpdateViewModal.checkDeviceType = function (device_name) { + for (var i = 0; i <= device_name.length; i++) { if (sysUpdateViewModal.isASFDevice[device_name[i]]) { sysUpdateViewModal.display_backup_db = true; return; @@ -87,7 +93,7 @@ } sysUpdateViewModal.display_backup_db = false; } - var showProgressBar = function() { + var showProgressBar = function () { var modalInstance = $uibModal.open({ templateUrl: 'app/modules/common/templates/progress.html', controller: 'showProgressCtrl', @@ -121,14 +127,14 @@ } showProgressBar(); var sysUpdateInfoJSON = { - "action" :"System_update", - "options" : { + "action": "System_update", + "options": { "__pk_list": [ JSON.stringify( { - "app_name" : sysUpdateViewModal.sysUpdateInfo.app_name, - "build_version" : sysUpdateViewModal.sysUpdateInfo.build_version, - "id" : sysUpdateViewModal.sysUpdateInfo.id + "app_name": sysUpdateViewModal.sysUpdateInfo.app_name, + "build_version": sysUpdateViewModal.sysUpdateInfo.build_version, + "id": sysUpdateViewModal.sysUpdateInfo.id } ) ] @@ -137,11 +143,11 @@ //device if (sysUpdateViewModal.showDeviceTab) { sysUpdateInfoJSON.options.devices = { - 'device' : sysUpdateViewModal.device + 'device': sysUpdateViewModal.device }; } else { sysUpdateInfoJSON.options.devices = { - 'group' : sysUpdateViewModal.device_group + 'group': sysUpdateViewModal.device_group }; } //sysUpdateInfoJSON.options.devices = JSON.stringify(sysUpdateInfoJSON.options.devices); Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/login/login.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/login/login.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/login/login.controller.js (working copy) @@ -146,6 +146,15 @@ } }); + userMgmtService.getUserRoleInfo(loginData.username).then(function(res) { + if (res && res.status === 200) { + if (res.data.length > 0) { + $rootScope.role_info = res.data[1]['result']; + localStorageService.setWebStorage("role_info", $rootScope.role_info); + } + } + }) + // reset composer language cmService.get_composer_language().then(function(res) { var default_lang = CMSettings.language[0].name; Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/main/main.controller.js =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/main/main.controller.js (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/main/main.controller.js (working copy) @@ -8,7 +8,7 @@ function ($scope, $rootScope, TipService, CMSettings) { var default_theme = CMSettings.theme[0].name; var default_lang = CMSettings.language[0].name; - if ( !window.localStorage.theme ) { + if (!window.localStorage.theme) { window.localStorage.theme = default_theme; } if (!window.localStorage.lang) { @@ -36,15 +36,15 @@ $rootScope.title = 'AMP'; $rootScope.showSideBar = true; - $scope.root_menu_active = function(url_prefix){ - if (typeof(url_prefix) == 'string') { - if($location.path().indexOf(url_prefix) === 0){ + $scope.root_menu_active = function (url_prefix) { + if (typeof (url_prefix) == 'string') { + if ($location.path().indexOf(url_prefix) === 0) { return true; } } else { var result = false; - _.each(url_prefix, function(url){ - if($location.path().indexOf(url) === 0){ + _.each(url_prefix, function (url) { + if ($location.path().indexOf(url) === 0) { result = true; return false; //this means break } @@ -57,29 +57,29 @@ $scope.url_contain = function (url) { if ($location.path().indexOf(url) != -1) { // we should avoid these following cases when implementing the router, but making special now. - // To avoid the case when url is "device" but location is "device-group", + // To avoid the case when url is "device" but location is "device-group", // both "device" and "device-group" sidebar will be highlighted. if ($location.path().indexOf('device_group') != -1) { - if(url.indexOf('device_group') == -1 ) { + if (url.indexOf('device_group') == -1) { return false; } } - // To avoid the case when url is "device" but location is "/configuration/device", + // To avoid the case when url is "device" but location is "/configuration/device", // both "device" and "/configuration/device" sidebar will be highlighted. if ($location.path().indexOf('/configuration/device') != -1) { - if(url.indexOf('/configuration/device') == -1 ) { + if (url.indexOf('/configuration/device') == -1) { return false; } } - // To avoid the case when url is "system" but location is "/configuration/system", + // To avoid the case when url is "system" but location is "/configuration/system", // both "system" and "/configuration/system" sidebar will be highlighted. if ($location.path().indexOf('/configuration/system') != -1) { - if(url.indexOf('/configuration/system') == -1 ) { + if (url.indexOf('/configuration/system') == -1) { return false; } } if ($location.path().indexOf('/volume_license/device') != -1) { - if(url.indexOf('/volume_license/device') == -1 ) { + if (url.indexOf('/volume_license/device') == -1) { return false; } } @@ -88,7 +88,7 @@ return false; }; - SBViewModel.show_or_hide = function(){ + SBViewModel.show_or_hide = function () { // if ( $location.path().indexOf("/monitor") == 0 ) { // $rootScope.showSecond = true; // } @@ -96,7 +96,7 @@ }; - SBViewModel.show_or_hide_by_submenu = function(state1, state2){ + SBViewModel.show_or_hide_by_submenu = function (state1, state2) { $rootScope.showSideBar = state1; if (state2 && !state1) { $rootScope.showSecond = true; @@ -111,7 +111,7 @@ if (res && res.status == 200) { var m = []; var n = []; - _.each(res.data, function(each){ + _.each(res.data, function (each) { if (each.has_webui) { var each_sidebar = each['webui_sidebar']; each_sidebar.name = each.name; @@ -122,13 +122,13 @@ m.push(each_sidebar); } else { n.push(each_sidebar); - } + } } } }); SBViewModel.extensions = m; // for those with parents, we should update them into their parents' json - _.each(n, function(d){ + _.each(n, function (d) { _.each(SBViewModel.main, function (main) { if (main.name == d.parent) { main.elements.push(d); @@ -141,11 +141,11 @@ }); }); } - + check_sidebar_auth(); }); }; var check_sidebar_auth = function () { - _.each(SBViewModel.main, function(main) { + _.each(SBViewModel.main, function (main) { if (main.auth_path) { if (userAuthService.check_user_auth(main.auth_path)) { main.show = true; @@ -154,7 +154,7 @@ } } // if no auth_path defined, do nothing if (main.elements) { - _.each(main.elements, function(ele) { + _.each(main.elements, function (ele) { if (ele.auth_path) { if (userAuthService.check_user_auth(ele.auth_path)) { ele.show = true; @@ -163,8 +163,8 @@ } } // if no auth_path defined, do nothing if (ele.submenu && ele.submenu.list) { - var main_show=false; - _.each(ele.submenu.list, function(sub) { + var main_show = false; + _.each(ele.submenu.list, function (sub) { if (sub.auth_path) { if (userAuthService.check_user_auth(sub.auth_path)) { sub.show = true; @@ -184,36 +184,74 @@ } }); // Checking twice to hide parent title when all elements are hidden - _.each(SBViewModel.main, function(main) { + _.each(SBViewModel.main, function (main) { var parent_title_show_flag = false; - _.each(main.elements, function(ele) { + _.each(main.elements, function (ele) { parent_title_show_flag = parent_title_show_flag | ele.show; }); main.show = parent_title_show_flag; }); + // Extensions + _.each(SBViewModel.extensions, function (extension) { + if (extension.auth_path) { + extension.show = userAuthService.check_user_auth(extension.auth_path); + } // if no auth_path defined, do nothing + if (extension.elements) { + _.each(extension.elements, function (ele) { + if (ele.auth_path) { + ele.show = userAuthService.check_user_auth(ele.auth_path); + } // if no auth_path defined, do nothing + if (ele.submenu && ele.submenu.list) { + var extension_show = false; + _.each(ele.submenu.list, function (sub) { + if (sub.auth_path) { + if (userAuthService.check_user_auth(sub.auth_path)) { + sub.show = true; + extension_show = true; + } else { + sub.show = false; + } + } else { + // if no auth_path defined, always show + sub.show = true; + extension_show = true; + } + }); + ele.show = extension_show; + } + }); + } + }); + // Checking twice to hide parent title when all elements are hidden + _.each(SBViewModel.extensions, function (extension) { + var parent_title_show_flag = false; + _.each(extension.elements, function (ele) { + parent_title_show_flag = parent_title_show_flag || ele.show; + }); + extension.show = parent_title_show_flag; + }); }; var render_sidebar = function () { get_extensions(); - check_sidebar_auth(); }; render_sidebar(); - $scope.$on('sidebar',function(event, data){ + $scope.$on('sidebar', function (event, data) { render_sidebar(); }); - $scope.$watch(function() { + $scope.$watch(function () { return $rootScope.user_auth; - },function(newValue, oldValue, scope) { + }, function (newValue, oldValue, scope) { //when user auth is changed by super admin // 1. should render sidebar again // 2. should update local storage // 3. should parse auth data again if (oldValue && newValue && oldValue.auth != newValue.auth) { $rootScope.auth_data = userAuthService.build_auth_data(0, $rootScope.user_auth.auth); - localStorageService.setWebStorage("user_auth", $rootScope.user_auth); + localStorageService.setWebStorage("user_auth", $rootScope.user_auth); localStorageService.setWebStorage("auth_data", $rootScope.auth_data); render_sidebar(); } Index: /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/main/navbar.html =================================================================== --- /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/main/navbar.html (revision 2350) +++ /branches/amp_3_6_0_role/src/webui/webui/htdocs/new/src/client/app/modules/main/navbar.html (working copy) @@ -129,7 +129,7 @@