bug fix.

- disable realtime function in server-list. - resize height of application list. - rename active trace to active thread. - add "Total" label to TPS chart.
pinpoint-apm · Oct 11, 2016 · 991219e · 991219e
1 parent c67e512
commit 991219e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/web/src/main/webapp/components/select2/dist/css/select2.min.css b/web/src/main/webapp/components/select2/dist/css/select2.min.css
diff --git a/web/src/main/webapp/features/activeTraceChart/active-trace-chart.directive.js b/web/src/main/webapp/features/activeTraceChart/active-trace-chart.directive.js
@@ -63,7 +63,7 @@
                                     "gridAlpha": 0,
                                     "axisAlpha": 1,
                                     "position": "left",
-                                    "title": "Active Trace",
+                                    "title": "Active Thread",
                                     "minimum" : 0
                                 }
                             ],

diff --git a/web/src/main/webapp/features/agentInfo/agent-info.directive.js b/web/src/main/webapp/features/agentInfo/agent-info.directive.js
@@ -168,7 +168,7 @@
 	                    var cpuLoad = { id: 'cpuLoad', title: 'JVM/System Cpu Usage', span: 'span12', isAvailable: false};
 
 	                    var tps = { id: 'tps', title: 'Transactions Per Second', span: 'span12', isAvailable: false };
-	                    var activeTrace = { id: "activeTrace", title: "Active Trace Chart", span: "span12", isAvailable: false};
+	                    var activeTrace = { id: "activeTrace", title: "Active Thread Chart", span: "span12", isAvailable: false};
 
 	                    scope.memoryGroup = [ heap, nonheap ];
 	                    scope.cpuLoadChart = cpuLoad;

diff --git a/web/src/main/webapp/features/scatter/scatter.directive.js b/web/src/main/webapp/features/scatter/scatter.directive.js
@@ -72,6 +72,7 @@
 				},
 				link: function (scope, element, attrs) {
 					var oNavbarVoService = null, htScatterSet = {}, htLastNode = null;
+					var enableRealtime = attrs["enableRealtime"] == "true" ? true : false;
 
 					function makeScatter(target, application, w, h, scatterData) {
 						// var from = oNavbarVoService.getQueryStartTime();
@@ -91,7 +92,7 @@
 						options.maxX = to;
 						options.errorImage = cfg.images.error;
 						// options.realtime = isRealtime();
-						options.realtime = UrlVoService.isRealtime();
+						options.realtime = UrlVoService.isRealtime() && enableRealtime;
 
 						var oScatterChart = new BigScatterChart2(options, getAgentList(scatterData), [
 							new BigScatterChart2.SettingPlugin( cfg.images.config ).addCallback( function( oChart, oValue ) {
@@ -105,7 +106,7 @@
 							}),
 							new BigScatterChart2.WideOpenPlugin( cfg.images.fullscreen ).addCallback( function() {
 								// var partialURL = oNavbarVoService.isRealtime() ? "realtime/" + oNavbarVoService.getQueryEndDateTime() : oNavbarVoService.getPartialURL( false, true );
-								var partialURL = UrlVoService.isRealtime() ? "realtime/" + UrlVoService.getQueryEndDateTime() : UrlVoService.getPartialURL( false, true );
+								var partialURL = UrlVoService.isRealtime() && enableRealtime ? "realtime/" + UrlVoService.getQueryEndDateTime() : UrlVoService.getPartialURL( false, true );
 								$window.open( "#/scatterFullScreenMode/" + htLastNode.applicationName + "@" + htLastNode.serviceType + "/" + partialURL + "/" + getAgentList().join(","), "width=900, height=700, resizable=yes");
 							}),
 							new BigScatterChart2.HelpPlugin( tooltipService )
@@ -135,7 +136,7 @@
 							if (angular.isUndefined(scatterData)) {
 								oScatterChart.drawWithDataSource( new BigScatterChart2.DataLoadManager( applicationName, filter, {
 									"url": cfg.scatterDataUrl,
-									"realtime": UrlVoService.isRealtime(),
+									"realtime": UrlVoService.isRealtime() && enableRealtime,
 									"realtimeInterval": 2000,
 									"realtimeDefaultTimeGap": 3000,
 									"realtimeResetTimeGap": 20000,
@@ -160,7 +161,7 @@
 						pauseScatterAll();
 						if ( angular.isDefined(htScatterSet[application]) ) {
 							htScatterSet[application].target.show();
-							if ( UrlVoService.isRealtime() ) {
+							if ( UrlVoService.isRealtime() && enableRealtime ) {
 								commonAjaxService.getServerTime( function( serverTime ) {
 									// serverTime -= 3000;
 									htScatterSet[application].scatter.resume( serverTime - preferenceService.getRealtimeScatterXRange(), serverTime );

diff --git a/web/src/main/webapp/features/serverList/serverList.html b/web/src/main/webapp/features/serverList/serverList.html
@@ -43,7 +43,7 @@
 			<span class="selected-agent">{{selectedAgent}}</span>
 			<button ng-click="hideLayer()" class="btn btn-sm"><span class="glyphicon glyphicon-remove"></span></button>
 		</div>
-		<scatter-directive ng-show="hasScatter" namespace="forServerList"></scatter-directive>
+		<scatter-directive ng-show="hasScatter" namespace="forServerList" enable-realtime="false"></scatter-directive>
 		<div class="chart-list" style="{{hasScatter ? 'border-top:1px solid #DDD;' : ''}}">
 			<h5>Response Summary</h5>
 			<response-time-chart-directive namespace="forServerList"></response-time-chart-directive>

diff --git a/web/src/main/webapp/features/tpsChart/tps-chart.directive.js b/web/src/main/webapp/features/tpsChart/tps-chart.directive.js
@@ -116,6 +116,7 @@
                                     "legendValueText": "[[value]]",
                                     "lineColor": "rgba(31, 119, 180, 0)",
                                     "fillColor": "rgba(31, 119, 180, 0)",
+									"title": "Total",
                                     "valueField": "totalTps",
                                     "fillAlphas": 0.4,
                                     "connect": true

diff --git a/web/src/main/webapp/pages/main/main.html b/web/src/main/webapp/pages/main/main.html
@@ -12,7 +12,7 @@
     <div class="sidebar" ng-class="sidebar" loading-directive="sidebarLoading" loading-message="Loading..." style="z-index:100;background-color:white">
         <sidebar-title-directive namespace="forMain"></sidebar-title-directive>
         <filter-information-directive namespace="forMain" ng-show="hasFilter"></filter-information-directive>
-		<scatter-directive ng-show="hasScatter" namespace="forMain"></scatter-directive>
+		<scatter-directive ng-show="hasScatter" namespace="forMain" enable-realtime="true"></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>