Commit f9f98e8a authored by Leonardo Menezes's avatar Leonardo Menezes
Browse files

fixes cpu percent for 1.x and 2.x

parent 256b8491
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
package models.overview

import elastic.ElasticClient._
import play.api.libs.json._

import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future

class ClusterOverview(clusterState: JsValue, nodesStats: JsValue, indicesStats: JsValue,
                      clusterSettings: JsValue, aliases: JsValue, clusterHealth: JsValue,
                      nodes: JsValue, main: JsValue) {
@@ -51,9 +47,12 @@ object Nodes {
      val client = (info \ "attributes" \ "client").asOpt[String].getOrElse("false").equals("true")

      val stats = (nodesStats \ "nodes" \ nodeId).as[JsObject]
      val totalInBytes = (stats \ "fs" \ "total" \ "total_in_bytes").asOpt[Long].getOrElse(0l) // FIXME: 1.X
    val diskFreeInBytes = (stats \ "fs" \ "total" \ "free_in_bytes").asOpt[Long].getOrElse(0l) // FIXME: 1.X
    val cpuPercent = (stats \ "process" \ "cpu" \ "percent").asOpt[JsNumber].getOrElse((stats \ "os" \ "user").as[JsNumber])
      // FIXME: 1.X
      val totalInBytes = (stats \ "fs" \ "total" \ "total_in_bytes").asOpt[Long].getOrElse(0l)
      // FIXME: 1.X
      val diskFreeInBytes = (stats \ "fs" \ "total" \ "free_in_bytes").asOpt[Long].getOrElse(0l)
      // FIXME 1.X
      val cpuPercent = (stats \ "os" \ "cpu" \ "user").asOpt[JsNumber].getOrElse((stats \ "process" \ "cpu" \ "percent").as[JsNumber])
      Json.obj(
        "id"             -> JsString(nodeId),
        "current_master" -> JsBoolean(nodeId.equals(currentMaster)),