diff --git a/app/models/commons/NodeRoles.scala b/app/models/commons/NodeRoles.scala index 4f7bb8f476521a3f589690bbe99704543debcfda..33aef89ef506c74a12b6a1b23e4f8d6fd0fdf85d 100644 --- a/app/models/commons/NodeRoles.scala +++ b/app/models/commons/NodeRoles.scala @@ -6,19 +6,6 @@ case class NodeRoles(master: Boolean, data: Boolean, ingest: Boolean) { def coordinating: Boolean = !master && !data && !ingest - def toEsString = { - val builder = StringBuilder.newBuilder - if (master) - builder.append("m") - if (data) - builder.append("d") - if (ingest) - builder.append("i") - if (builder.isEmpty) - builder.append("-") - builder.toString() - } - } object NodeRoles { diff --git a/app/models/nodes/Node.scala b/app/models/nodes/Node.scala index ce734444910dc2a0883beb17c81cb57525781b9f..58270d424de0ca699912405868d3d0bd9418ed64 100644 --- a/app/models/nodes/Node.scala +++ b/app/models/nodes/Node.scala @@ -7,7 +7,6 @@ object Node { def apply(id: String, currentMaster: Boolean, info: JsValue, stats: JsValue): JsValue = { val jvmVersion = (info \ "jvm" \ "version").asOpt[JsString].getOrElse(JsNull) - val nodeRoles = NodeRoles(info) Json.obj( "id" -> JsString(id), @@ -18,12 +17,12 @@ object Node { "cpu" -> cpu(stats), "uptime" -> (stats \ "jvm" \ "uptime_in_millis").as[JsValue], "jvm" -> jvmVersion, - "version" -> (info \ "version").as[JsValue], - "node.role" -> JsString(nodeRoles.toEsString) - ) ++ roles(nodeRoles) + "version" -> (info \ "version").as[JsValue] + ) ++ roles(info) } - private def roles(roles: NodeRoles): JsObject = { + private def roles(info: JsValue): JsObject = { + val roles = NodeRoles(info) Json.obj( "master" -> JsBoolean(roles.master), "coordinating" -> JsBoolean(roles.coordinating), diff --git a/test/models/nodes/NodeSpec.scala b/test/models/nodes/NodeSpec.scala index a79410d3e620f9e68c3bf8c96ede0fe998aff129..9ca6c5936a44e3820aefe4a970c1362516e5dde1 100644 --- a/test/models/nodes/NodeSpec.scala +++ b/test/models/nodes/NodeSpec.scala @@ -41,8 +41,7 @@ object NodeSpec extends Specification { | "master": true, | "name": "-qkZcMt", | "uptime": 109228, - | "version": "5.1.1", - | "node.role":"mdi" + | "version": "5.1.1" |} """.stripMargin ) @@ -78,8 +77,7 @@ object NodeSpec extends Specification { | "master": true, | "name": "007ywNv", | "uptime": 492790575, - | "version": "5.1.1", - | "node.role":"mdi" + | "version": "5.1.1" |} """.stripMargin ) diff --git a/tests/components/nodes/controller.tests.js b/tests/components/nodes/controller.tests.js index b8802a94f26c29538715f0ec749c215f2d14f122..d399d76bd6441d24a555175d081a1bb05178e1f8 100644 --- a/tests/components/nodes/controller.tests.js +++ b/tests/components/nodes/controller.tests.js @@ -116,8 +116,8 @@ describe('NodesController', function() { it('refresh list of visible nodes by applying the filter to the complete list', function() { var nodes = [ - {name: 'a', master: true, data: true, client: false, 'node.role': 'md'}, - {name: 'b', master: true, data: true, client: false, 'node.role': 'md'} + {name: 'a', master: true, data: true, client: false}, + {name: 'b', master: true, data: true, client: false} ]; this.scope.filter.name = 'b'; this.scope._nodes = nodes;