elastic_manager 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bbd15e2da30e4a11d0dc0c3b32ea03b356579ceabe146c3f91015e2a7749ba1
-  data.tar.gz: 82c74c8b34544c38ac72c1ac62552fbb630261280f397305c0536ebf69974822
+  metadata.gz: fd391f78658812583275fc9020e0619bf72ff0db870cee4d49bd82788b45dfb2
+  data.tar.gz: b3a32961e8477a22b736d13c20afa81581b72f0a174c8a9d4016c2b85827e39d
 SHA512:
-  metadata.gz: b4144e9edfb97ab8f243bec70759f8ff370f8c74a8194a128ca746125e96df461a67c2f6a77ad7052f1569f6f411efe7779c5cafcfd83caa2c7a78aeff2f0309
-  data.tar.gz: 8993611c5a89371964e03b45c370dca3f243aec520108985c3785c731509becfab5740a83b6235b7945f105fadffee215f58d60c60c80545bca039eefbcf08ee
+  metadata.gz: 07ed650f13e9c63a128a74992b557b3f1ab3d5afc3e6f64b065c4c73ea869adadb8817696946e466079ba18dd1879aca9df0759094e4fd1dc6c43e999daffe87
+  data.tar.gz: 1bbf27bc2a26b942acd9a3f5cdc9aadc8006cc32e4efc48fc754d5f4acb31e15d41731988758c5be151d7ea6246ca90cc9fa35af47aa5da99f7fc1d22a5474f7

data/elastic_manager.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.name        = 'elastic_manager'
   s.executables = ['elastic_manager']
-  s.version     = '0.3.1'
+  s.version     = '0.3.6'
   s.date        = '2018-10-15'
   s.summary     = 'Because qurator sucks'
   s.description = 'Manager for logstash indices in elastic'
@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'colorize',  '~> 0.8'
   s.add_dependency 'dotenv',    '~> 2.4'
   s.add_dependency 'http',      '~> 3.3'
-  s.add_dependency 'rake',      '~> 12.3'
+  s.add_dependency 'rake',      '>= 12.3', '< 14.0'
   s.add_dependency 'yajl-ruby', '~> 1.4'
 end

data/lib/elastic_manager/config.rb

@@ -29,7 +29,7 @@ module Config
 
     default['es']['url']          = 'http://127.0.0.1:9200'
     default['retry']              = '10'
-    default['sleep']              = '60'
+    default['sleep']              = '30'
     default['force']              = 'false'
     default['timeout']['write']   = '2'
     default['timeout']['connect'] = '3'

data/lib/elastic_manager/open.rb

@@ -35,6 +35,8 @@ module Open
   end
 
   def do_open(indices)
+    results = []
+
     indices.each do |index|
       next if skip_index?(index, 'open')
 
@@ -43,14 +45,24 @@ module Open
       if index_exist?(response)
         next if already?(response, 'open')
 
-        elastic_action_with_log('open_index', index)
+        results << elastic_action_with_log('open_index', index)
       else
         log.warn "#{index} index not found"
         log.info "#{index} trying snapshot restore"
 
-        elastic_action_with_log('restore_snapshot', index, @config['settings']['box_types']['store'])
+        results << elastic_action_with_log('restore_snapshot', index, @config['settings']['box_types']['store'])
       end
     end
+
+    if results.empty?
+      log.warn 'looks like we skipped all indices'
+      exit 0
+    end
+
+    exit 1 if results.all? { |e| e.is_a?(FalseClass) }
+    # It is little bit confusing, but we catch exit code 2 in jenkins
+    # for mark build as unstable instead of just fail it
+    exit 2 if results.any? { |e| e.is_a?(FalseClass) }
   end
 
   def open

data/lib/elastic_manager/request.rb

@@ -90,7 +90,7 @@ module Request
       result = []
       all_snapshots.each do |snap|
         begin
-          snap_date = Date.parse(snap['id'].delete('-'))
+          snap_date = Date.parse(snap['id'].split('-').last)
         rescue ArgumentError => e
           log.error "#{e.message} for #{index}"
           next
@@ -133,7 +133,7 @@ module Request
       result = []
       indices.each do |index, _|
         begin
-          index_date = Date.parse(index.delete('-'))
+          index_date = Date.parse(index.split('-').last)
         rescue ArgumentError => e
           log.error "#{e.message} for #{index}"
           next
@@ -341,7 +341,7 @@ module Request
       snapshot_ok = false
 
       until snapshot_ok
-        sleep @sleep
+        sleep @sleep / 2
         response = request(:get, "/_snapshot/#{repo}/#{snapshot}/_status")
 
         if response.code == 200

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - Antony Ryabov
@@ -56,16 +56,22 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Because qurator sucks