You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/08/08 15:17:14 UTC
svn commit: r1616748 - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src:
main/webapp/js/app/controllers/controllers-jvm.js
main/webapp/js/app/services/services.js main/webapp/partials/jvm.html
test/resources/META-INF/spring-context.xml
Author: olamy
Date: Fri Aug 8 13:17:14 2014
New Revision: 1616748
URL: http://svn.apache.org/r1616748
Log:
add environment infos
Modified:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html
incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js?rev=1616748&r1=1616747&r2=1616748&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js Fri Aug 8 13:17:14 2014
@@ -25,7 +25,8 @@ define(['angular','services','morris'],
var jvmControllers = angular.module('jvmControllers', ['sironaJvmServices']);
jvmControllers.controller( 'JvmHomeCtrl', ['$scope','jvmCpu','jvmMemory','nonHeapMemory','activeThreads',
- function ( $scope,jvmCpu,jvmMemory,nonHeapMemory,activeThreads ){
+ 'osInfo','memoryInfo',
+ function ( $scope,jvmCpu,jvmMemory,nonHeapMemory,activeThreads,osInfo,memoryInfo){
console.log("JvmHomeCtrl");
@@ -106,6 +107,15 @@ define(['angular','services','morris'],
});
+ osInfo.query().$promise.then(function(result){
+ $scope.os=result;
+
+ });
+
+ memoryInfo.query().$promise.then(function(result){
+ $scope.memory=result;
+ });
+
}]);
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js?rev=1616748&r1=1616747&r2=1616748&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js Fri Aug 8 13:17:14 2014
@@ -25,27 +25,47 @@ define(['angular','angular-resource'], f
return $resource('restServices/sironaServices/jvmreports/cpu/:start/:end',
{start:'@start',end:'@end'},
{query: {method:'GET', params:{}}});
- }]);
+ }
+ ]);
sironaServices.factory('jvmMemory', ['$resource',
function($resource){
return $resource('restServices/sironaServices/jvmreports/memory/:start/:end',
{start:'@start',end:'@end'},
{query: {method:'GET', params:{}}});
- }]);
+ }
+ ]);
sironaServices.factory('nonHeapMemory', ['$resource',
function($resource){
return $resource('restServices/sironaServices/jvmreports/nonheapmemory/:start/:end',
{start:'@start',end:'@end'},
{query: {method:'GET', params:{}}});
- }]);
+ }
+ ]);
sironaServices.factory('activeThreads', ['$resource',
function($resource){
return $resource('restServices/sironaServices/jvmreports/activethreads/:start/:end',
{start:'@start',end:'@end'},
{query: {method:'GET', params:{}}});
- }]);
+ }
+ ]);
+
+ sironaServices.factory('osInfo', ['$resource',
+ function($resource){
+ return $resource('restServices/sironaServices/environment/os',
+ {},
+ {query: {method:'GET', params:{}}});
+ }
+ ]);
+
+ sironaServices.factory('memoryInfo', ['$resource',
+ function($resource){
+ return $resource('restServices/sironaServices/environment/memory',
+ {},
+ {query: {method:'GET', params:{}}});
+ }
+ ]);
});
\ No newline at end of file
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html?rev=1616748&r1=1616747&r2=1616748&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html Fri Aug 8 13:17:14 2014
@@ -26,6 +26,23 @@
<div id="cpu"><i class="fa fa-spinner fa-spin"></i></div>
</div>
</div>
+ <div class="panel panel-primary">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <i class="icon-table"></i>Computer Info
+ </h3>
+ </div>
+ <div class="panel-body">
+ <table id="cpu-table" class="table table-bordered table-striped table-hover">
+ <tbody>
+ <tr><td>OS Name</td><td>{{os.name}}</td></tr>
+ <tr><td>Version</td><td>{{os.version}}</td></tr>
+ <tr><td>Architecture</td><td>{{os.arch}}</td></tr>
+ <tr><td>Number of processors</td><td>{{os.numberProcessor}}</td></tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
</div>
<div class="col-lg-3">
<div class="panel panel-primary">
@@ -38,6 +55,21 @@
<div id="memory"><i class="fa fa-spinner fa-spin"></i></div>
</div>
</div>
+ <div class="panel panel-primary">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <i class="icon-table"></i>Memory Status
+ </h3>
+ </div>
+ <div class="panel-body">
+ <table id="memory-table" class="table table-bordered table-striped table-hover">
+ <tbody>
+ <tr><td>Init</td><td>{{memory.initMemory}}</td></tr>
+ <tr><td>Max</td><td>{{memory.maxMemory}}</td></tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
</div>
<div class="col-lg-3">
<div class="panel panel-primary">
@@ -50,6 +82,21 @@
<div id="nonheapmemory"><i class="fa fa-spinner fa-spin"></i></div>
</div>
</div>
+ <div class="panel panel-primary">
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <i class="icon-table"></i>Non Heap Memory Status
+ </h3>
+ </div>
+ <div class="panel-body">
+ <table id="memory-table" class="table table-bordered table-striped table-hover">
+ <tbody>
+ <tr><td>Init</td><td>{{memory.initNonHeapMemory}}</td></tr>
+ <tr><td>Max</td><td>{{memory.maxNonHeapMemory}}</td></tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
</div>
<div class="col-lg-3">
<div class="panel panel-primary">
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml?rev=1616748&r1=1616747&r2=1616748&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml Fri Aug 8 13:17:14 2014
@@ -40,7 +40,7 @@
</property>
</bean>
- <jaxrs:server id="sironaServices" address="/sironaServices" basePackages="org.apache.sirona.reporting.web.**">
+ <jaxrs:server id="sironaServices" address="/sironaServices" basePackages="org.apache.sirona.reporting.web.**,org.apache.sirona.reporting.web**">
<jaxrs:providers>
<ref bean="jsonProvider"/>
</jaxrs:providers>