Fix formatting of data in tables

Author: DomGarguilo

server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/table.js

@@ -47,6 +47,26 @@ function initTabletsTable(tableId) {
       "url": tabletsUrl,
       "dataSrc": ""
     },
+    "stateSave": true,
+    "columnDefs": [{
+        "targets": "big-num",
+        "render": function (data, type) {
+          if (type === 'display') {
+            data = bigNumberForQuantity(data);
+          }
+          return data;
+        }
+      },
+      {
+        "targets": "big-size",
+        "render": function (data, type) {
+          if (type === 'display') {
+            data = bigNumberForSize(data);
+          }
+          return data;
+        }
+      }
+    ],
     "columns": [{
         "data": "tabletId",
         "title": "Tablet ID"
@@ -75,8 +95,7 @@ function initTabletsTable(tableId) {
         "data": "location",
         "title": "Location"
       }
-    ],
-    "stateSave": true
+    ]
   });
 }
 
@@ -97,6 +116,29 @@ function initTableServerTable(tableId) {
         return [json];
       }
     },
+    "stateSave": true,
+    "searching": false,
+    "paging": false,
+    "info": false,
+    "columnDefs": [{
+        "targets": "big-num",
+        "render": function (data, type) {
+          if (type === 'display') {
+            data = bigNumberForQuantity(data);
+          }
+          return data;
+        }
+      },
+      {
+        "targets": "big-size",
+        "render": function (data, type) {
+          if (type === 'display') {
+            data = bigNumberForSize(data);
+          }
+          return data;
+        }
+      }
+    ],
     "columns": [{
         "data": "totalEntries",
         "title": "Entry Count"
@@ -149,17 +191,7 @@ function initTableServerTable(tableId) {
         "data": "totalUnassignedTablets",
         "title": "UnassignedTablets"
       }
-    ],
-    "stateSave": true,
-    "columnDefs": [{
-      "targets": "big-num",
-      "render": function (data, type) {
-        if (type === 'display') {
-          data = bigNumberForQuantity(data);
-        }
-        return data;
-      }
-    }]
+    ]
   });
 
   refreshTable();

server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/table.ftl

@@ -37,19 +37,19 @@
             <caption><span class="table-caption">${table}</span></caption>
             <thead>
               <tr>
-                <th>Entry Count</th>
-                <th>Size on disk</th>
-                <th>File Count</th>
-                <th>WAL Count</th>
-                <th>Total Tablet Count</th>
-                <th>Always Hosted Count</th>
-                <th>On Demand Count</th>
-                <th>Never Hosted Count</th>
-                <th>Assigned Count</th>
-                <th>Assigned To Dead Server Tablets</th>
-                <th>Hosted Tablets</th>
-                <th>Suspended Tablets</th>
-                <th>Unassigned Tablets</th>
+                <th class="big-num">Entry Count</th>
+                <th class="big-size">Size on disk</th>
+                <th class="big-num">File Count</th>
+                <th class="big-num">WAL Count</th>
+                <th class="big-num">Total Tablet Count</th>
+                <th class="big-num">Always Hosted Count</th>
+                <th class="big-num">On Demand Count</th>
+                <th class="big-num">Never Hosted Count</th>
+                <th class="big-num">Assigned Count</th>
+                <th class="big-num">Assigned To Dead Server Tablets</th>
+                <th class="big-num">Hosted Tablets</th>
+                <th class="big-num">Suspended Tablets</th>
+                <th class="big-num">Unassigned Tablets</th>
               </tr>
             </thead>
             <tbody></tbody>
@@ -65,11 +65,11 @@
             <thead>
               <tr>
                 <th>Tablet ID</th>
-                <th>Estimated Size</th>
-                <th>Estimated Entries</th>
+                <th class="big-size">Estimated Size</th>
+                <th class="big-num">Estimated Entries</th>
                 <th>Availability</th>
-                <th>Files</th>
-                <th>WALs</th>
+                <th class="big-num">Files</th>
+                <th class="big-num">WALs</th>
                 <th>Location</th>
               </tr>
             </thead>

server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl

@@ -40,11 +40,20 @@
             "stateSave": true,
             "columnDefs": [
               {
-                "type": "num",
                 "targets": "big-num",
-                "render": function (data, type, row) {
-                  if (type === 'display')
+                "render": function (data, type) {
+                  if (type === 'display') {
                     data = bigNumberForQuantity(data);
+                  }
+                  return data;
+                }
+              },
+              {
+                "targets": "big-size",
+                "render": function (data, type) {
+                  if (type === 'display') {
+                    data = bigNumberForSize(data);
+                  }
                   return data;
                 }
               }
@@ -101,7 +110,7 @@
               <th title="Table Name">Table&nbsp;Name</th>
               <th title="Tables are broken down into ranges of rows called tablets." class="big-num">Tablets</th>
               <th title="Key/value pairs over each instance, table or tablet." class="big-num">Entries</th>
-              <th title="Total size on disk." class="big-num">Size on Disk</th>
+              <th title="Total size on disk." class="big-size">Size on Disk</th>
               <th title="Total number of files." class="big-num">Files</th>
               <th title="Total number of WALs." class="big-num">WALs</th>
               <th title="Number of tablets that are always hosted." class="big-num">Always Available</th>