elasticsearch-drain 0.1.13 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a31db66bfab268b9baa36a02862d1dfac8dc92e53a87e287232a317afecd2f7
-  data.tar.gz: b353ce1a26f91b4ee43053c018b6b7244ac8cf0fc018bd5873d247e23636267d
+  metadata.gz: 07ae3b4a6bb377e9683a62e8053b01b72d0d26a9e4aeef977cabf12642d46a85
+  data.tar.gz: 6ea43a33c74b41e35405b3eaf636c18281af547fb11179110ac82436b908ab7e
 SHA512:
-  metadata.gz: b64cfa2de83d8b9bfb1da0c35de583c14c6050b74d47d1c323d43113ab29b39c7fc954ce5ba8ab2d5561138f789e52fcdf51f2bb34afd704692e9ef5c2667a2e
-  data.tar.gz: ac1b0319c3aadceac52fc177d8c781085e182bcdb1a9ce5c24519d8af2cbc2a740d3dd311c129a386be93a0d0599c0b5ad0c1e99ebf5638adb44e78f14d8b7ea
+  metadata.gz: ff79b6e90b309aec0176094d00361029663c3c922164e662a9560e5faddd463095ecab9ec694914098216e8866bb9015ad5551d4e4a74c745e5744981af116df
+  data.tar.gz: f5f8ff84e9e4cd6452e2ac0186b82b7ff9811fd5e05dd7907c56efcdfa6fdf5011812aede95258dbbcb4c2df52f5137c809700513f5864ef36570be63a0a08c6

data/.ruby-version

@@ -0,0 +1 @@
+2.3.0

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     elasticsearch-drain (0.0.1)
       aws-sdk (~> 3)
-      elasticsearch (~> 1.0)
+      elasticsearch (~> 7)
       thor (~> 0.19)
 
 GEM
@@ -14,7 +14,7 @@ GEM
     ansi (1.5.0)
     ast (2.4.1)
     aws-eventstream (1.1.0)
-    aws-partitions (1.385.0)
+    aws-partitions (1.388.0)
     aws-sdk (3.0.1)
       aws-sdk-resources (~> 3)
     aws-sdk-accessanalyzer (1.14.0)
@@ -238,7 +238,7 @@ GEM
     aws-sdk-ebs (1.11.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.202.0)
+    aws-sdk-ec2 (1.203.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ec2instanceconnect (1.11.0)
@@ -310,7 +310,7 @@ GEM
     aws-sdk-globalaccelerator (1.25.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-glue (1.77.0)
+    aws-sdk-glue (1.78.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-greengrass (1.37.0)
@@ -343,7 +343,7 @@ GEM
     aws-sdk-inspector (1.32.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iot (1.59.0)
+    aws-sdk-iot (1.60.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-iot1clickdevicesservice (1.26.0)
@@ -382,7 +382,7 @@ GEM
     aws-sdk-kafka (1.29.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kendra (1.16.0)
+    aws-sdk-kendra (1.17.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kinesis (1.30.0)
@@ -493,7 +493,7 @@ GEM
     aws-sdk-mturk (1.27.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-neptune (1.30.0)
+    aws-sdk-neptune (1.31.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-networkmanager (1.8.0)
@@ -827,7 +827,7 @@ GEM
     aws-sdk-s3outposts (1.0.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sagemaker (1.70.0)
+    aws-sdk-sagemaker (1.71.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-sagemakerruntime (1.27.0)
@@ -944,7 +944,7 @@ GEM
     aws-sdk-worklink (1.21.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-workmail (1.32.0)
+    aws-sdk-workmail (1.33.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-workmailmessageflow (1.9.0)
@@ -962,18 +962,18 @@ GEM
     coderay (1.1.3)
     crack (0.4.4)
     docile (1.3.2)
-    elasticsearch (1.1.3)
-      elasticsearch-api (= 1.1.3)
-      elasticsearch-transport (= 1.1.3)
-    elasticsearch-api (1.1.3)
+    elasticsearch (7.5.0)
+      elasticsearch-api (= 7.5.0)
+      elasticsearch-transport (= 7.5.0)
+    elasticsearch-api (7.5.0)
       multi_json
     elasticsearch-extensions (0.0.18)
       ansi
       ruby-prof
-    elasticsearch-transport (1.1.3)
-      faraday
+    elasticsearch-transport (7.5.0)
+      faraday (>= 0.14, < 1)
       multi_json
-    faraday (1.0.1)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     ffi (1.13.1)
     formatador (0.2.5)

data/elasticsearch-drain.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 10.0'
 
-  spec.add_dependency 'elasticsearch', '~> 1.0'
+  spec.add_dependency 'elasticsearch', '~> 7'
   spec.add_dependency 'aws-sdk', '~> 3'
   spec.add_dependency 'thor', '~> 0.19'
 end

data/lib/elasticsearch/drain/cluster.rb

@@ -11,8 +11,7 @@ module Elasticsearch
 
       def health(opts = {})
         default_opts = {
-          wait_for_status: 'green',
-          timeout: 60
+          wait_for_status: 'green'
         }
         opts = default_opts.merge(opts)
         cluster.health(opts)

data/lib/elasticsearch/drain/node.rb

@@ -50,10 +50,21 @@ module Elasticsearch
       end
 
       # The Elasticsearch node ipaddress
+      # 
+      # For ES v1.x, we must extract and modify the IP
+      # address from the http_address key. For all later
+      # versions, we can use the host key directly.
+      # That's why we check with the if/else statement.
       #
       # @return [String] Elasticsearch node ipaddress
       def ipaddress
-        address(info[1]['http_address']).split(':')[0]
+        block = /\d{,2}|1\d{2}|2[0-4]\d|25[0-5]/
+        re = /\A#{block}\.#{block}\.#{block}\.#{block}\z/
+        if info[1]['host'] && re =~ info[1]['host']
+          info[1]['host']
+        else
+          address(info[1]['http_address']).split(':')[0]  
+        end
       end
 
       # The Elasticsearch node Transport Address
@@ -86,7 +97,10 @@ module Elasticsearch
       end
 
       def in_recovery?
-        recovery = client.cat.recovery(format: 'json', v: true).first.values
+        recovery = client.cat.recovery(format: 'json', v: true)
+        if recovery.first != nil
+          recovery = recovery.first.values
+        end
         [hostname, name].any? { |a| recovery.include?(a) }
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-drain
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.18
 platform: ruby
 authors:
 - Andrew Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -141,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.14
 signing_key: 
 specification_version: 4
 summary: Elasticsearch node replacement utility that tries to keep the cluster healthy