elasticsearch-manager 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzUxYjRmNjI1YTNiMWM4ODMwODZjZTE4NTllNmIzYWQ2NmUxOGFkNA==
+    N2FlYzM2ZDk2Njg4M2I5NTJkOGQ4M2ZjMGM3ZjA2MjFiMjk3MmY3ZQ==
   data.tar.gz: !binary |-
-    OTc0NjdmM2YxNDkwZTcwMDM0ZDUwNzI0YWFlZjlhYTg0ODZkYjZkNg==
+    OGVjMGNiNjUxZjhjZGNmNThmYWZlZDZiOWVkMzYyY2M1MzI3YWZiOQ==
 SHA512:
   metadata.gz: !binary |-
-    Zjc4M2Y4NTY4YmQ0NzczYTNmZjAwM2VlZjEwN2Q2OGI5NDBjOWQ1OWQwOWE0
-    YjJiMzRmODc2NTYzNzNkZjBiMmNkNTVhM2YxY2RhMmYxZWVmNDAxYTkzOTE4
-    NGIxMTk3Zjc4ZmJmZTU2YWQ4ZmM0MTI2NjU4ZDNkODBiNTE1MDg=
+    Yzk1YTMwYjBmYmRkZTVmYjU0ZmYwNjg1NzhhMTRiNDk3NjczMDdjMjVkNDNm
+    Mjk2NGYyOTM5YmNjOGZjMmNhNTkwNmQ0M2NlMzBhMjRjMzk0MGUxODUwZmVj
+    NDViNjU2N2ZjNDZlNGRlNzFmYTgzODNhYWUzNjY1MDE4MTg2MWI=
   data.tar.gz: !binary |-
-    ZDFkM2NiOTFmMjVhYzEyMWI3NDA1YzlmYzRjMmVmMDZjMDU4YzI3MzcwNDgy
-    YTZkMWIxNmQwNDAxYTQzZDRmY2Y5NzMzNDMxMGI5NzIzOTU4MmM5YjliMzkz
-    ZWE2NmY1NDUxYThjZTdkNDU2YmU2ZmQ2MDNlOTVhNmZiMThmNzQ=
+    Y2Y1YTg4Mjg0NjhjN2ZhZjZiYzZiMmU2Zjk3MjhiNmNhM2VkZWIwOWE3NmUw
+    ODhiNDA0ZjI2NWEyZDhkNGFmZTAzODJiYTY0YzZjZWE2NzJlNjE3MGVkZjVj
+    Mjg0ZmRhODI5ZmU1NjU4N2NhMzFjZmVlNDk3MjNjYzA2YzYwNTA=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elasticsearch-manager (0.1.0)
+    elasticsearch-manager (0.1.1)
       colorize (~> 0.7)
       highline (~> 1.7)
       json (~> 1.8)

data/bin/elasticsearch-manager

@@ -38,6 +38,11 @@ EOC
   opts.on('-t TIMEOUT', '--timeout TIMEOUT', 'Timeout for waiting for cluster to stabilize during rolling-restart [default: 600]') do |p|
     options[:port] = p
   end
+
+  options[:verbose] = false
+  opts.on('-v', '--verbose', 'Print verbose messaging') do |v|
+    options[:verbose] = v
+  end
 end
 
 opt_parser.parse!

data/lib/elasticsearch/manager/cmd.rb

@@ -14,7 +14,7 @@ module Elasticsearch
         manager = _manager(opts)
         # Check that the cluster is stable?
         unless manager.cluster_stable?
-          print_cluster_stable(manager)
+          print_cluster_status(manager, 'The cluster is currently unstable! Not proceeding with rolling-restart')
           return 2
         end
         puts "Discovering cluster members...\n"
@@ -35,6 +35,7 @@ module Elasticsearch
         manager = _manager(opts)
         status = manager.cluster_status
         puts "The Elasticsearch cluster is currently: #{status.colorize(status.to_sym)}"
+        print_cluster_status(manager) if opts[:verbose]
         return 0
       end
 
@@ -43,19 +44,19 @@ module Elasticsearch
         ESManager.new(opts[:hostname], opts[:port])
       end
 
-      def self.print_cluster_stable(manager)
+      def self.print_cluster_status(manager, msg = nil)
         health = manager.cluster_health
-        puts 'The cluster is currently unstable! Not proceeding with rolling-restart'
+        puts msg unless msg.nil?
         puts "\tCluster status: #{health.status.colorize(health.status.to_sym)}"
 
         relocating = health.relocating_shards == 0 ? :green : :red
         puts "\tRelocating shards: #{health.relocating_shards.to_s.colorize(relocating)}"
 
         initializing = health.initializing_shards == 0 ? :green : :red
-        puts "\tInitializing shards: #{health.relocating_shards.to_s.colorize(relocating)}"
+        puts "\tInitializing shards: #{health.initializing_shards.to_s.colorize(initializing)}"
 
         unassigned = health.unassigned_shards == 0 ? :green : :red
-        puts "\tUnassigned shards: #{health.relocating_shards.to_s.colorize(relocating)}"
+        puts "\tUnassigned shards: #{health.unassigned_shards.to_s.colorize(unassigned)}"
       end
     end
   end

data/lib/elasticsearch/manager/rollingrestart.rb

@@ -14,11 +14,11 @@ module Elasticsearch
       def rolling_restart(timeout = 600, sleep_interval = 30)
         highline = HighLine.new
         @members.each do |m|
-          restart_node(m, timeout, sleep_interval) unless m == @leader
-          if m != @members[-1]
+          unless m == @leader
             unless highline.agree('Continue with rolling restart of cluster? (y/n) ')
               raise UserRequestedStop, "Stopping rolling restart at user request!".colorize(:red)
             end
+            restart_node(m, timeout, sleep_interval)
           end
         end
         unless highline.agree("\nRestarting current cluster master, continue? (y/n) ")

data/lib/elasticsearch/manager/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Manager
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Brian Oldfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler