7.x somehow cause os.cpu.percent=-1, fix it & update to latest

lmenezes · Sep 17, 2020 · a2e530c · a2e530c
1 parent 71a63ed
commit a2e530c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/app/models/overview/Node.scala b/app/models/overview/Node.scala
@@ -59,8 +59,10 @@ object Node extends NodeInfo {
   }
 
   def cpuPercent(nodeStats: JsValue): JsNumber = {
-    val cpu = (nodeStats \ "os" \ "cpu" \ "percent").asOpt[Int].getOrElse(// 5.X
-      (nodeStats \ "os" \ "cpu_percent").asOpt[Int].getOrElse(0) // FIXME 2.X
+    val cpu = (nodeStats \ "os" \ "cpu" \ "percent").asOpt[Int].filter(i => i > 0).getOrElse(// 5.X
+      (nodeStats \ "process" \ "cpu" \ "percent").asOpt[Int].filter(i => i > 0).getOrElse( // 7.X
+        (nodeStats \ "os" \ "cpu_percent").asOpt[Int].getOrElse(0) // FIXME 2.X
+      )
     )
     JsNumber(BigDecimal(cpu))
   }

diff --git a/public/overview.html b/public/overview.html
@@ -75,6 +75,12 @@
             <i class="fa fa-sort-alpha-desc fa-2x normal-action table-control" title="sort descending"
                ng-hide="indices_filter.asc" ng-click="indices_filter.asc = true"></i>
           </div>
+          <div class="col-lg-2 col-md-6">
+            <i class="fa fa-eye fa-2x normal-action table-control" ng-hide="showAllAliases"
+               title="show all aliases" ng-click="showAllAliases = true"></i>
+            <i class="fa fa-eye-slash fa-2x normal-action table-control" ng-show="showAllAliases"
+               title="show single alias" ng-click="showAllAliases = false"></i>
+          </div>
           <div class="col-lg-3 col-md-6">
             <div class="dropdown">
               <span class="title normal-action" type="button" id="dropcluster" data-toggle="dropdown"
@@ -108,12 +114,6 @@
               </ul>
             </div>
           </div>
-          <div class="col-lg-2 col-md-6">
-            <i class="fa fa-eye fa-2x normal-action table-control" ng-hide="showAllAliases"
-               title="show all aliases" ng-click="showAllAliases = true"></i>
-            <i class="fa fa-eye-slash fa-2x normal-action table-control" ng-show="showAllAliases"
-               title="show single alias" ng-click="showAllAliases = false"></i>
-          </div>
         </div>
       </td>
       <td ng-repeat="index in page.elements track by $index" ng-class="{'closed-index': index.closed}">