Add non-heap metrics and threads.totalStarted

spring-boot-admin-server-ui/modules/applications-details/components/jvmStats.tpl.html

 <table class="table">
-    <tr>
-        <td>Uptime</td>
-        <td colspan="2">
-            <sba-uptime value="$ctrl.metrics.uptime"></sba-uptime>
-        </td>
-    </tr>
-    <tr ng-if="$ctrl.systemload">
-        <td>Systemload</td>
-        <td colspan="2">{{$ctrl.systemload}} (last min. &#x2300; runq-sz)</td>
-    </tr>
-    <tr>
-        <td>Available Processors</td>
-        <td colspan="2" ng-bind="$ctrl.metrics.processors"></td>
-    </tr>
-    <tr>
-        <td rowspan="3">Classes</td>
-        <td>current loaded</td>
-        <td ng-bind="$ctrl.metrics.classes"></td>
-    </tr>
-    <tr>
-        <td>total loaded</td>
-        <td ng-bind="$ctrl.metrics['classes.loaded']"></td>
-    </tr>
-    <tr>
-        <td>unloaded </td>
-        <td ng-bind="$ctrl.metrics['classes.unloaded']"></td>
-    </tr>
-    <tr>
-        <td rowspan="3">Threads</td>
-        <td>total</td>
-        <td ng-bind="$ctrl.metrics.threads"></td>
-    </tr>
-    <tr>
-        <td>daemon</td>
-        <td ng-bind="$ctrl.metrics['threads.daemon']"></td>
-    </tr>
-    <tr>
-        <td>peak</td>
-        <td ng-bind="$ctrl.metrics['threads.peak']"></td>
-    </tr>
+  <tr>
+    <td>Uptime</td>
+    <td colspan="2">
+      <sba-uptime value="$ctrl.metrics.uptime"></sba-uptime>
+    </td>
+  </tr>
+  <tr ng-if="$ctrl.systemload">
+    <td>Systemload</td>
+    <td colspan="2">{{$ctrl.systemload}} (last min. &#x2300; runq-sz)</td>
+  </tr>
+  <tr>
+    <td>Available Processors</td>
+    <td colspan="2" ng-bind="$ctrl.metrics.processors"></td>
+  </tr>
+  <tr>
+    <td rowspan="3">Classes</td>
+    <td>current loaded</td>
+    <td ng-bind="$ctrl.metrics.classes"></td>
+  </tr>
+  <tr>
+    <td>total loaded</td>
+    <td ng-bind="$ctrl.metrics['classes.loaded']"></td>
+  </tr>
+  <tr>
+    <td>unloaded </td>
+    <td ng-bind="$ctrl.metrics['classes.unloaded']"></td>
+  </tr>
+  <tr>
+    <td rowspan="4">Threads</td>
+    <td>current</td>
+    <td ng-bind="$ctrl.metrics.threads"></td>
+  </tr>
+  <tr>
+    <td>total started</td>
+    <td ng-bind="$ctrl.metrics['threads.totalStarted']"></td>
+  </tr>
+  <tr>
+    <td>daemon</td>
+    <td ng-bind="$ctrl.metrics['threads.daemon']"></td>
+  </tr>
+  <tr>
+    <td>peak</td>
+    <td ng-bind="$ctrl.metrics['threads.peak']"></td>
+  </tr>
 </table>

spring-boot-admin-server-ui/modules/applications-details/components/memoryStats.js

@@ -37,6 +37,14 @@ module.exports = {
         max: ctrl.metrics.heap
       };
       ctrl.heap.percentUsed = $filter('number')(ctrl.heap.used / ctrl.heap.total * 100, 2);
+
+      ctrl.nonheap = {
+        total: ctrl.metrics['nonheap.committed'],
+        used: ctrl.metrics['nonheap.used'],
+        init: ctrl.metrics['nonheap.init'],
+        max: ctrl.metrics.nonheap
+      };
+      ctrl.nonheap.percentUsed = $filter('number')(ctrl.nonheap.used / ctrl.nonheap.total * 100, 2);
     };
 
     ctrl.getBarClass = function (percentage) {

spring-boot-admin-server-ui/modules/applications-details/components/memoryStats.tpl.html

 <table class="table">
-    <tr>
-        <td colspan="2"> <span>Memory ({{ $ctrl.memory.used | humanBytes:'K' }} / {{ $ctrl.memory.total | humanBytes:'K' }})</span>
-            <div class="progress" style="margin-bottom: 0px;">
-                <div class="bar" ng-class="$ctrl.getBarClass($ctrl.memory.percentUsed)" style="width: {{$ctrl.memory.percentUsed}}%;">{{$ctrl.memory.percentUsed}}%</div>
-            </div>
-        </td>
-    </tr>
-    <tr>
-        <td colspan="2"> <span>Heap Memory ({{ $ctrl.heap.used | humanBytes:'K' }} / {{ $ctrl.heap.total | humanBytes:'K' }})</span>
-            <div class="progress" style="margin-bottom: 0px;">
-                <div class="bar" ng-class="$ctrl.getBarClass($ctrl.heap.percentUsed)" style="width: {{$ctrl.heap.percentUsed}}%;">{{$ctrl.heap.percentUsed}}%</div>
-            </div>
-        </td>
-    </tr>
-    <tr>
-        <td>Initial Heap (-Xms)</td>
-        <td>{{$ctrl.heap.init | humanBytes:'K' }}</td>
-    </tr>
-    <tr>
-        <td>Maximum Heap (-Xmx)</td>
-        <td>{{$ctrl.heap.max | humanBytes:'K' }}</td>
-    </tr>
+  <tr>
+    <td colspan="2"> <span>Memory ({{ $ctrl.memory.used | humanBytes:'K' }} / {{ $ctrl.memory.total | humanBytes:'K' }})</span>
+      <div class="progress" style="margin-bottom: 0px;">
+        <div class="bar" ng-class="$ctrl.getBarClass($ctrl.memory.percentUsed)" style="width: {{$ctrl.memory.percentUsed}}%;">{{$ctrl.memory.percentUsed}}%</div>
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2"> <span>Heap Memory ({{ $ctrl.heap.used | humanBytes:'K' }} / {{ $ctrl.heap.total | humanBytes:'K' }})</span>
+      <div class="progress" style="margin-bottom: 0px;">
+        <div class="bar" ng-class="$ctrl.getBarClass($ctrl.heap.percentUsed)" style="width: {{$ctrl.heap.percentUsed}}%;">{{$ctrl.heap.percentUsed}}%</div>
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <td>Initial Heap (-Xms)</td>
+    <td>{{$ctrl.heap.init | humanBytes:'K' }}</td>
+  </tr>
+  <tr>
+    <td>Maximum Heap (-Xmx)</td>
+    <td>{{$ctrl.heap.max | humanBytes:'K' }}</td>
+  </tr>
+  <tr>
+    <td colspan="2"> <span>Non-Heap Memory ({{ $ctrl.nonheap.used | humanBytes:'K' }} / {{ $ctrl.nonheap.total | humanBytes:'K' }})</span>
+      <div class="progress" style="margin-bottom: 0px;">
+        <div class="bar" ng-class="$ctrl.getBarClass($ctrl.nonheap.percentUsed)" style="width: {{$ctrl.nonheap.percentUsed}}%;">{{$ctrl.nonheap.percentUsed}}%</div>
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <td>Initial Non-Heap</td>
+    <td>{{$ctrl.nonheap.init | humanBytes:'K' }}</td>
+  </tr>
+  <tr>
+    <td>Maximum Non-Heap</td>
+    <td ng-show="$ctrl.nonheap.max > 0">{{$ctrl.nonheap.max | humanBytes:'K' }}</td>
+    <td ng-show="$ctrl.nonheap.max <= 0">unbounded</td>
+  </tr>
 </table>