Merge pull request #1805 from denzelsN/master

bug fix

web/src/main/webapp/common/services/preference.service.js

@@ -34,7 +34,20 @@
 			realtimeScatterPeriod: 5 * 60 * 1000,//5m
 			responseType: [ "1s", "3s", "5s", "Slow", "Error" ],
 			responseTypeColor: [ "#2ca02c", "#3c81fa", "#f8c731", "#f69124", "#f53034" ],
-			agentAllStr: "All"
+			agentAllStr: "All",
+			updateTimes: [{
+				time: 10,
+				label: '10 seconds'
+			},{
+				time: 20,
+				label: '20 seconds'
+			}, {
+				time: 30,
+				label: '30 seconds'
+			}, {
+				time: 60,
+				label: '1 minute'
+			}]
 		}
 	});
 	
@@ -85,6 +98,9 @@
 		this.getAgentAllStr = function() {
 			return cfg.cst.agentAllStr;
 		};
+		this.getUpdateTimes = function() {
+			return cfg.cst.updateTimes;
+		}
 		this.getResponseTypeFormat = function() {
 			var o = {};
 			$.each( cfg.cst.responseType, function( index, value ) {

web/src/main/webapp/components/time-slider/time-slider.js

@@ -24,8 +24,7 @@
             "headerZoneHeight": 20,       // 상단 시간 표시영역의 height
             "stateLineThickness": 4,       // 상태선의 두께
             "minSliderTimeSeries": 6000,             // 6sec
-            // "maxSliderTimeSeries": 172800000,         // 2day
-            "maxSelectionTimeSeries": 172800000,
+            "maxSelectionTimeSeries": 172800000,	// 2day
             "headerTextTopPadding": 10,   // 상단 상태선과 시간 text의 간격
             "selectionPointRadius": 4
         };

web/src/main/webapp/features/agentInfo/agentInfoMain.html

@@ -64,10 +64,10 @@
 					</tr>
                     <tr>
                         <td class="col-md-2 text-right"><strong>Application Name</strong></td>
-                        <td class="col-md-3 text-left" ng-show="isSameApplication()">{{agent.applicationName}}</td>
-						<td class="col-md-3 text-left" ng-hide="isSameApplication()"><span style="color:red">{{agent.applicationName}}</span> <button type="button" class="btn btn-xs btn-danger _wrongApp" ng-click="toggleHelp(this)" style="font-size:10px;float:right" data-toggle="popover" data-container="body" data-trigger="manual"  data-placement="bottom"><span class="glyphicon glyphicon-exclamation-sign"></span></button></td>
+                        <td class="col-md-4 text-left" ng-show="isSameApplication()">{{agent.applicationName}}</td>
+						<td class="col-md-4 text-left" ng-hide="isSameApplication()"><span style="color:red">{{agent.applicationName}}</span> <button type="button" class="btn btn-xs btn-danger _wrongApp" ng-click="toggleHelp(this)" style="font-size:10px;float:right" data-toggle="popover" data-container="body" data-trigger="manual"  data-placement="bottom"><span class="glyphicon glyphicon-exclamation-sign"></span></button></td>
                         <td class="col-md-2 text-right"><strong>Agent Version</strong></td>
-                        <td class="col-md-5 text-left">{{agent.agentVersion}}</td>
+                        <td class="col-md-4 text-left">{{agent.agentVersion}}</td>
                     </tr>
                     <tr>
                         <td class="text-right"><strong>Agent Id</strong></td>

web/src/main/webapp/features/agentList/agentList.html

@@ -9,7 +9,7 @@
                 <span class="glyphicon glyphicon-home"></span>
                 {{key}}
             </h5>
-            <ul class="nav nav-pills nav-stacked">
+            <ul class="nav nav-pills nav-stacked" style="font-size:12px">
                 <li ng-class="{active: currentAgent == agent}" ng-repeat="agent in group | filter:searchAgents.name">
                     <a href ng-click="select(agent)">
                         <span class="glyphicon glyphicon-hdd"></span>

web/src/main/webapp/lib/css/pinpoint.css

@@ -407,7 +407,7 @@ canvas {outline:none}
     display: inline-block;
     box-shadow: 0px 0px 4px 2px #FF0;
     border-radius: 5px;
-    margin-bottom: -2px;
+    margin-bottom: -1px;
     background-color: #FF0;
 }
 .inspector-container .slider > span {

web/src/main/webapp/pages/filteredMap/filtered-map.controller.js

@@ -55,8 +55,9 @@
 	
 	            $timeout(function () {
 	                $scope.$broadcast('timeSliderDirective.initialize', oTimeSliderVoService);
-	                $scope.$broadcast('serverMapDirective.initialize', oNavbarVoService);
-	                $scope.$broadcast('scatterDirective.initialize.forMain', oNavbarVoService);
+					$scope.$broadcast('serverListDirective.initialize', oNavbarVoService );
+	                $scope.$broadcast('scatterDirective.initialize.forFilteredMap', oNavbarVoService);
+					$scope.$broadcast('serverMapDirective.initialize', oNavbarVoService);
 	            });
 	
 	        }, 500);
@@ -78,7 +79,7 @@
 	        broadcastScatterScanResultToScatter = function (applicationScatterData) {
 	            if (angular.isDefined(applicationScatterData)) {
 	                angular.forEach(applicationScatterData, function (val, key) {
-	                    $scope.$broadcast('scatterDirective.initializeWithData.forMain', key, val);
+	                    $scope.$broadcast('scatterDirective.initializeWithData.forFilteredMap', key, val);
 	                });
 	            }
 	        };
@@ -87,7 +88,8 @@
 	         * get main container class
 	         */
 	        $scope.getMainContainerClass = function () {
-	            return bNoData ? 'no-data' : '';
+				return "";
+	            // return bNoData ? 'no-data' : '';
 	        };
 	
 	        /**
@@ -183,6 +185,7 @@
 	         * scope event on serverMapDirective.nodeClicked
 	         */
 	        $scope.$on('serverMapDirective.nodeClicked', function (event, e, query, node, data) {
+				console.log( node, data );
 	            bNodeSelected = true;
 	            var oSidebarTitleVoService = new SidebarTitleVoService();
 	            oSidebarTitleVoService.setImageType(node.serviceType);
@@ -190,7 +193,7 @@
 	            if (node.isWas === true) {
 	                $scope.hasScatter = true;
 	                oSidebarTitleVoService.setTitle(node.applicationName);
-	                $scope.$broadcast('scatterDirective.showByNode.forMain', node);
+	                $scope.$broadcast('scatterDirective.showByNode.forFilteredMap', node);
 	            } else if (node.unknownNodeGroup) {
 	            	oSidebarTitleVoService.setTitle( node.serviceType.replace( "_", " " ) );
 	                $scope.hasScatter = false;

web/src/main/webapp/pages/filteredMap/filteredMap.html

@@ -6,10 +6,13 @@
     <div class="main">
         <server-map-directive></server-map-directive>
     </div>
-    <div class="sidebar" ng-class="sidebar" loading-directive="sidebarLoading" loading-message="Loading...">
+	<div style="position:absolute;top:0px;right:0px;overflow:hidden;width:100%;height:100%;">
+		<server-list-directive></server-list-directive>
+	</div>
+	<div class="sidebar" ng-class="sidebar" loading-directive="sidebarLoading" loading-message="Loading..." style="z-index:100;background-color:white">
         <sidebar-title-directive namespace="forFilteredMap"></sidebar-title-directive>
         <filter-information-directive namespace="forFilteredMap" ng-show="hasFilter"></filter-information-directive>
-        <scatter-directive ng-show="hasScatter"></scatter-directive>
+        <scatter-directive ng-show="hasScatter" namespace="forFilteredMap"></scatter-directive>
         <div class="info-details" ng-class="getInfoDetailsClass()">
             <node-info-details-directive></node-info-details-directive>
             <link-info-details-directive></link-info-details-directive>

web/src/main/webapp/styles/inspector.css

@@ -167,7 +167,7 @@
     display: inline-block;
     box-shadow: 0px 0px 4px 2px #FF0;
     border-radius: 5px;
-    margin-bottom: -2px;
+    margin-bottom: -1px;
     background-color: #FF0;
 }
 .inspector-container .slider > span {