diff --git a/app/services/overview/OverviewDataService.scala b/app/services/overview/OverviewDataService.scala index aa6b1df940378679750cc68a3c0c2e8f271045d5..9a5bbea736499ba62bd80fe439b367e5c7232577 100644 --- a/app/services/overview/OverviewDataService.scala +++ b/app/services/overview/OverviewDataService.scala @@ -20,8 +20,7 @@ class OverviewDataService @Inject()(client: ElasticClient) { "_cluster/settings", "_aliases", "_cluster/health", - s"_nodes/_all/os,jvm?human=true", - "" + s"_nodes/_all/os,jvm?human=true" ) val start = System.currentTimeMillis() @@ -39,8 +38,7 @@ class OverviewDataService @Inject()(client: ElasticClient) { responses(3).body, responses(4).body, responses(5).body, - responses(6).body, - responses(7).body + responses(6).body ) println(s"Requesting took [${end - start}]") overview diff --git a/test/models/overview/ClusterInitializingShards.scala b/test/models/overview/ClusterInitializingShards.scala index 5fba37af4c7f098edfa192258e09acb687981455..2c62fc90601745faa3e6323c8dc8206d3b3bd625 100644 --- a/test/models/overview/ClusterInitializingShards.scala +++ b/test/models/overview/ClusterInitializingShards.scala @@ -4,7 +4,7 @@ import play.api.libs.json.Json object ClusterInitializingShards { - def apply() = ClusterOverview(clusterState, nodesStats, indicesStats, clusterSettings, aliases, clusterHealth, nodes, main) + def apply() = ClusterOverview(clusterState, nodesStats, indicesStats, clusterSettings, aliases, clusterHealth, nodes) val clusterState = Json.parse( """ @@ -701,21 +701,4 @@ object ClusterInitializingShards { """.stripMargin ) - val main = Json.parse( - """ - |{ - | "name" : "Cecilia Reyes", - | "cluster_name" : "elasticsearch", - | "version" : { - | "number" : "2.1.0", - | "build_hash" : "72cd1f1a3eee09505e036106146dc1949dc5dc87", - | "build_timestamp" : "2015-11-18T22:40:03Z", - | "build_snapshot" : false, - | "lucene_version" : "5.3.1" - | }, - | "tagline" : "You Know, for Search" - |} - """.stripMargin - ) - } diff --git a/test/models/overview/ClusterStub.scala b/test/models/overview/ClusterStub.scala index 650b87d1167a224f7e3ed353d66acaa58190544c..caaed945bb53f6ccde5b87bf3763aaff7bc35adb 100644 --- a/test/models/overview/ClusterStub.scala +++ b/test/models/overview/ClusterStub.scala @@ -4,7 +4,7 @@ import play.api.libs.json.JsValue trait ClusterStub { - def apply() = ClusterOverview(clusterState, nodesStats, indicesStats, clusterSettings, aliases, clusterHealth, nodes, main) + def apply() = ClusterOverview(clusterState, nodesStats, indicesStats, clusterSettings, aliases, clusterHealth, nodes) val clusterState: JsValue @@ -20,6 +20,4 @@ trait ClusterStub { val nodes: JsValue - val main: JsValue - }