diff --git a/web/src/main/webapp/common/services/preference.service.js b/web/src/main/webapp/common/services/preference.service.js
index b7a392c54..891f949bc 100644
--- a/web/src/main/webapp/common/services/preference.service.js
+++ b/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 ) {
diff --git a/web/src/main/webapp/components/time-slider/time-slider.js b/web/src/main/webapp/components/time-slider/time-slider.js
index ec1c66fcf..30b5c8b41 100644
--- a/web/src/main/webapp/components/time-slider/time-slider.js
+++ b/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
};
diff --git a/web/src/main/webapp/features/agentInfo/agentInfoMain.html b/web/src/main/webapp/features/agentInfo/agentInfoMain.html
index a640a92d8..b0d1b2898 100644
--- a/web/src/main/webapp/features/agentInfo/agentInfoMain.html
+++ b/web/src/main/webapp/features/agentInfo/agentInfoMain.html
@@ -64,10 +64,10 @@
| Application Name |
- {{agent.applicationName}} |
- {{agent.applicationName}} |
+ {{agent.applicationName}} |
+ {{agent.applicationName}} |
Agent Version |
- {{agent.agentVersion}} |
+ {{agent.agentVersion}} |
| Agent Id |
diff --git a/web/src/main/webapp/features/agentList/agentList.html b/web/src/main/webapp/features/agentList/agentList.html
index 4538b9c8a..75f2c982c 100644
--- a/web/src/main/webapp/features/agentList/agentList.html
+++ b/web/src/main/webapp/features/agentList/agentList.html
@@ -9,7 +9,7 @@
{{key}}
-
+
-
diff --git a/web/src/main/webapp/lib/css/pinpoint.css b/web/src/main/webapp/lib/css/pinpoint.css
index eea6046e7..4fa8c85c0 100644
--- a/web/src/main/webapp/lib/css/pinpoint.css
+++ b/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 {
diff --git a/web/src/main/webapp/pages/filteredMap/filtered-map.controller.js b/web/src/main/webapp/pages/filteredMap/filtered-map.controller.js
index d3aaeed2c..0d856b781 100644
--- a/web/src/main/webapp/pages/filteredMap/filtered-map.controller.js
+++ b/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;
diff --git a/web/src/main/webapp/pages/filteredMap/filteredMap.html b/web/src/main/webapp/pages/filteredMap/filteredMap.html
index c38931de3..b3f54d079 100644
--- a/web/src/main/webapp/pages/filteredMap/filteredMap.html
+++ b/web/src/main/webapp/pages/filteredMap/filteredMap.html
@@ -6,10 +6,13 @@
-