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

added support for ES basic http auth

parent 9e2f76fa

app/controllers/ClearIndexCacheController.scala

+3 −1
Original line number Diff line number Diff line 
package controllers



import models.ElasticServer



class ClearIndexCacheController extends ElasticActionController {



  def processElasticRequest = (request, client) => client.clearIndexCache(request.get("indices"), request.host)

  def processElasticRequest = (request, client) => client.clearIndexCache(request.get("indices"), ElasticServer(request.host, request.authentication))



}

app/controllers/CloseIndexController.scala

+3 −1
Original line number Diff line number Diff line 
package controllers



import models.ElasticServer



class CloseIndexController extends ElasticActionController {



  def processElasticRequest = (request, client) => client.closeIndex(request.get("indices"), request.host)

  def processElasticRequest = (request, client) => client.closeIndex(request.get("indices"), ElasticServer(request.host, request.authentication))



}

app/controllers/ClusterOverviewController.scala

+9 −8
Original line number Diff line number Diff line 
package controllers



import models.ElasticServer

import models.overview.ClusterOverview



import scala.concurrent.ExecutionContext.Implicits.global
@@ -11,14 +12,14 @@ class ClusterOverviewController extends BaseController { 
    (request, client) => {

      Future.sequence(

        Seq(

          client.clusterState(request.host),

          client.nodesStats(request.host),

          client.indicesStats(request.host),

          client.clusterSettings(request.host),

          client.aliases(request.host),

          client.clusterHealth(request.host),

          client.nodes(request.host),

          client.main(request.host)

          client.clusterState(ElasticServer(request.host, request.authentication)),

          client.nodesStats(ElasticServer(request.host, request.authentication)),

          client.indicesStats(ElasticServer(request.host, request.authentication)),

          client.clusterSettings(ElasticServer(request.host, request.authentication)),

          client.aliases(ElasticServer(request.host, request.authentication)),

          client.clusterHealth(ElasticServer(request.host, request.authentication)),

          client.nodes(ElasticServer(request.host, request.authentication)),

          client.main(ElasticServer(request.host, request.authentication))

        )

      ).map { f =>

        new ClusterOverview(f(0).body, f(1).body, f(2).body, f(3).body, f(4).body, f(5).body, f(6).body, f(7).body).json

app/controllers/DeleteIndexController.scala

+3 −1
Original line number Diff line number Diff line 
package controllers



import models.ElasticServer



class DeleteIndexController extends ElasticActionController {



  def processElasticRequest = (request, client) => client.deleteIndex(request.get("indices"), request.host)

  def processElasticRequest = (request, client) => client.deleteIndex(request.get("indices"), ElasticServer(request.host, request.authentication))



}

app/controllers/DisableShardAllocationController.scala

+3 −1
Original line number Diff line number Diff line 
package controllers



import models.ElasticServer



class DisableShardAllocationController extends ElasticActionController {



  def processElasticRequest = (request, client) => client.disableShardAllocation(request.host)

  def processElasticRequest = (request, client) => client.disableShardAllocation(ElasticServer(request.host, request.authentication))



}