elastic_manager 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c798157f6af433e26a76c9935307a298d7d6fa4d1e164cb4234f0a144438586
-  data.tar.gz: a26879da569ed538f6320dc56cb9e2944aedcf6bf30a4850bfee97ab40c13ce6
+  metadata.gz: 148e67ba5bd9356c710f18b2ffb120b98bcc8c44d7f2e604ab4c88c593b17909
+  data.tar.gz: 69f86a4c5b4459edba65c181338d13017502c649ec41066ce3912dc0f45f7d1b
 SHA512:
-  metadata.gz: 5f6f5cf3017e6bc33acd2ecf5b2eec443e17f37aa08681cefb30861fb5c95eaba00d229ed862f4ecc8549387f0de6bd9a47ebc79085ae85b3d1901d851b41dd1
-  data.tar.gz: c05c07cdaad9135cc47a5c2b25696d4ebb135f824ed42251d3c156dcd275e552cf135b98e85cba62d5a7f34029433233963a1a8b0b3e58e66bab8f18a91494b0
+  metadata.gz: f8c53506b2b2d32261db8f38b6eeb955bd471617a006de6724bc4256754a6d5551826b5554bcd8ac24b992386e688351949f783a77d435a240d84f2049e785d6
+  data.tar.gz: 4d39477d8cba63dbdb51097032ba2121b5b5310f0c0b07c7232c0b34e258f586d0e4357415e15357d7359c29ac9add5404a9058f05246cfdc26c035b3e48b8a1

data/elastic_manager.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.name        = 'elastic_manager'
   s.executables = ['elastic_manager']
-  s.version     = '0.1.8'
+  s.version     = '0.1.9'
   s.date        = '2018-10-15'
   s.summary     = 'Because qurator sucks'
   s.description = 'Manager for logstash indices in elastic'

data/lib/elastic_manager/chill.rb

@@ -10,10 +10,10 @@ module Chill
     result = []
 
     if indices.length == 1 && indices.first == '_all'
-      result = @elastic.all_indices(date_from, date_to, daysago, 'open', @config['settings']['box_types']['ingest'], @config['settings']['indices'])
+      result = @elastic.all_indices(date_from, date_to, daysago, 'open', @config['settings']['box_types']['ingest'], @config)
     else
       if date_from.nil?
-        result = @elastic.all_indices(date_from, date_to, daysago, 'open', @config['settings']['box_types']['ingest'], @config['settings']['indices']).select { |r| r.start_with?(*indices) }
+        result = @elastic.all_indices(date_from, date_to, daysago, 'open', @config['settings']['box_types']['ingest'], @config).select { |r| r.start_with?(*indices) }
       else
         date_from.upto(date_to) do |date|
           indices.each do |index|

data/lib/elastic_manager/close.rb

@@ -10,10 +10,10 @@ module Close
     result = []
 
     if indices.length == 1 && indices.first == '_all'
-      result = @elastic.all_indices(date_from, date_to, daysago, 'open', nil, @config['settings']['indices'])
+      result = @elastic.all_indices(date_from, date_to, daysago, 'open', nil, @config)
     else
       if date_from.nil?
-        result = @elastic.all_indices(date_from, date_to, daysago, 'open', nil, @config['settings']['indices']).select { |r| r.start_with?(*indices) }
+        result = @elastic.all_indices(date_from, date_to, daysago, 'open', nil, @config).select { |r| r.start_with?(*indices) }
       else
         date_from.upto(date_to) do |date|
           indices.each do |index|

data/lib/elastic_manager/delete.rb

@@ -10,10 +10,10 @@ module Delete
     result = []
 
     if indices.length == 1 && indices.first == '_all'
-      result = @elastic.all_indices(date_from, date_to, daysago, nil, nil, @config['settings']['indices'])
+      result = @elastic.all_indices(date_from, date_to, daysago, nil, nil, @config)
     else
       if date_from.nil?
-        result = @elastic.all_indices(date_from, date_to, daysago, nil, nil, @config['settings']['indices']).select { |r| r.start_with?(*indices) }
+        result = @elastic.all_indices(date_from, date_to, daysago, nil, nil, @config).select { |r| r.start_with?(*indices) }
       else
         date_from.upto(date_to) do |date|
           indices.each do |index|

data/lib/elastic_manager/open.rb

@@ -10,14 +10,14 @@ module Open
     result = []
 
     if indices.length == 1 && indices.first == '_all'
-      result = @elastic.all_indices(date_from, date_to, daysago, 'close', nil, @config['settings']['indices'])
-      result += @elastic.all_indices_in_snapshots(date_from, date_to, daysago, @config['settings']['indices'])
+      result = @elastic.all_indices(date_from, date_to, daysago, 'close', nil, @config)
+      result += @elastic.all_indices_in_snapshots(date_from, date_to, daysago, @config)
       return result
     end
 
     if date_from.nil?
-      result = @elastic.all_indices(date_from, date_to, daysago, 'close', nil, @config['settings']['indices'])
-      result += @elastic.all_indices_in_snapshots(date_from, date_to, daysago, @config['settings']['indices'])
+      result = @elastic.all_indices(date_from, date_to, daysago, 'close', nil, @config)
+      result += @elastic.all_indices_in_snapshots(date_from, date_to, daysago, @config)
       return result.select { |r| r.start_with?(*indices) }
     else
       date_from.upto(date_to) do |date|

data/lib/elastic_manager/request.rb

@@ -70,17 +70,18 @@ module Request
       false
     end
 
-    def override_daysago(index_name, indices_config, daysago)
-      if indices_config[index_name] &&
-         indices_config[index_name]['daysago'] &&
-         !indices_config[index_name]['daysago'].to_s.empty?
-        indices_config[index_name]['daysago']
+    def override_daysago(index_name, config, daysago)
+      if config[index_name] &&
+         config[index_name]['daysago'] &&
+         config[index_name]['daysago'][config['task']] &&
+         !config[index_name]['daysago'][config['task']].to_s.empty?
+        config[index_name]['daysago']
       else
         daysago
       end
     end
 
-    def all_indices_in_snapshots(from=nil, to=nil, daysago=nil, indices_config)
+    def all_indices_in_snapshots(from=nil, to=nil, daysago=nil, config)
       all_snapshots = get_all_snapshots
       all_snapshots.select! { |snap| snap['status'] == 'SUCCESS' }
 
@@ -94,7 +95,7 @@ module Request
         end
 
         index = snap['id'].gsub('snapshot_', '')
-        daysago_local = override_daysago(make_index_name(index), indices_config, daysago)
+        daysago_local = override_daysago(make_index_name(index), config, daysago)
 
         if from.nil? && snap_date < (Date.today - daysago_local)
           result << CGI.escape(index)
@@ -118,7 +119,7 @@ module Request
       end
     end
 
-    def all_indices(from=nil, to=nil, daysago=nil, state=nil, type=nil, indices_config)
+    def all_indices(from=nil, to=nil, daysago=nil, state=nil, type=nil, config)
       indices = get_all_indices
 
       # TODO: (anton.ryabov) next line just for debug purpose, need better handling
@@ -136,7 +137,7 @@ module Request
           next
         end
 
-        daysago_local = override_daysago(make_index_name(index), indices_config, daysago)
+        daysago_local = override_daysago(make_index_name(index), config, daysago)
 
         if from.nil? && index_date < (Date.today - daysago_local)
           result << CGI.escape(index)

data/lib/elastic_manager/snapdelete.rb

@@ -10,10 +10,10 @@ module SnapDelete
     result = []
 
     if indices.length == 1 && indices.first == '_all'
-      result = @elastic.all_indices_in_snapshots(date_from, date_to, daysago, @config['settings']['indices'])
+      result = @elastic.all_indices_in_snapshots(date_from, date_to, daysago, @config)
     else
       if date_from.nil?
-        result = @elastic.all_indices_in_snapshots(date_from, date_to, daysago, @config['settings']['indices']).select { |r| r.start_with?(*indices) }
+        result = @elastic.all_indices_in_snapshots(date_from, date_to, daysago, @config).select { |r| r.start_with?(*indices) }
       else
         date_from.upto(date_to) do |date|
           indices.each do |index|

data/lib/elastic_manager/snapshot.rb

@@ -10,10 +10,10 @@ module Snapshot
     result = []
 
     if indices.length == 1 && indices.first == '_all'
-      result = @elastic.all_indices(date_from, date_to, daysago, nil, @config['settings']['box_types']['store'], @config['settings']['indices'])
+      result = @elastic.all_indices(date_from, date_to, daysago, nil, @config['settings']['box_types']['store'], @config)
     else
       if date_from.nil?
-        result = @elastic.all_indices(date_from, date_to, daysago, nil, @config['settings']['box_types']['store'], @config['settings']['indices']).select { |r| r.start_with?(*indices) }
+        result = @elastic.all_indices(date_from, date_to, daysago, nil, @config['settings']['box_types']['store'], @config).select { |r| r.start_with?(*indices) }
       else
         date_from.upto(date_to) do |date|
           indices.each do |index|

data/lib/elastic_manager/utils.rb

@@ -44,7 +44,7 @@ module Utils
   end
 
   def prepare_vars
-    indices   = @config['indices'].split(',')
+    indices   = @config['indices'].split(',').map(&:strip)
     daysago   = @config['daysago']
     date_from = @config['from']
     date_to   = @config['to']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Antony Ryabov