redis-stat 0.4.3-java → 0.4.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 814990cec2629f891bf110dba907ce984628b81e
-  data.tar.gz: dbfab2225e10eee3bf6805430854df961bfd8927
+  metadata.gz: 8141fc0b8abb82ab7927fd3dcd1b9b9264088ec2
+  data.tar.gz: f52fbc1e912d769910eb39c3c00c654c0b6c5010
 SHA512:
-  metadata.gz: a56f0ec2aba3ba341a274875a0e89af1637c203fc096ee2f0d60c1265dfeccc761e06ffb161929ce9194036a974922ffc23048fe9e014f55ce9c7b1a2ee181d1
-  data.tar.gz: 706244730e1cfd29a873bb848c0bafd2e9cee44abace52567c49c36870cd723f44e906c1fb15cdab907e203f938e7a409bcafcb1dec5d8c54f1c497f7878f41a
+  metadata.gz: 9fc14d060c405e106292085b02db992be984a493142757676ea3659cff0c7b2965aa86f924c7c8cb9f36bacce32834d1aeb1ce801477d258196bd22ce0ca6964
+  data.tar.gz: 941a314949a1809b19cb251ec0292451ccc639e608b857427a410e3fe341c8a9bf51b429a1f870069f085a640f6c9028b4b6ebcfeb80f8a7a87b82197d0182c1

data/lib/redis-stat.rb

@@ -40,7 +40,7 @@ class RedisStat
     @verbose       = options[:verbose]
     @measures      = MEASURES[ @verbose ? :verbose : :default ].map { |m| [*m].first }
     @tab_measures  = MEASURES[:static].map { |m| [*m].first }
-    @all_measures  = MEASURES.values.inject(:+).uniq - [:at]
+    @all_measures  = TYPES.keys
     @count         = 0
     @style         = options[:style]
     @varwidth      = STDOUT.tty? && !windows
@@ -71,7 +71,7 @@ class RedisStat
       # Check elasticsearch status
       if @elasticsearch
         begin
-          output_es info
+          output_es Hash[process(info, nil)]
         rescue Exception => e
           output_term_errors! format_exceptions({ :elasticsearch => e })
           exit 1
@@ -96,13 +96,16 @@ class RedisStat
           next
         end
 
+        info_output_all = process info, prev_info
         begin
-          output_es info if @elasticsearch && @count > 0
+          output_es Hash[info_output_all] if @elasticsearch && @count > 0
+        rescue Interrupt
+          raise
         rescue Exception => e
           exceptions[:elasticsearch] = e.to_s
         end
         error_messages = format_exceptions(exceptions)
-        info_output = process info, prev_info
+        info_output = @measures.map { |key| [key, info_output_all[key][:sum]] }
         unless @daemonized
           output_static_info info if @count == 0
           output_term info_output, error_messages
@@ -150,21 +153,43 @@ private
     RedisStat::Server
   end
 
-  def collect
-    info = {
-      :at => Time.now.to_f,
-      :instances => Hash.new { |h, k| h[k] = {}.insensitive }
-    }
-    class << info
-      def sumf label
-        self[:instances].values.map { |hash| hash[label].to_f }.inject(:+) || 0
-      end
+  module ExtendedHash
+    def hosts host
+      host == :sum ? self.values : [self[host]]
+    end
+
+    def vals host, label
+      hosts(host).map { |hash| hash[label] }
+    end
+
+    def s host, label
+      hosts(host).map { |hash| hash[label] }.join('/')
+    end
+
+    def i host, label
+      f(host, label).to_i
+    end
+
+    def f host, label
+      hosts(host).map { |hash|
+        case label
+        when Proc
+          label.call(hash)
+        else
+          hash[label].to_f
+        end
+      }.inject(:+) || 0
     end
+  end
+
+  def collect
+    info = Hash.new { |h, k| h[k] = {}.insensitive }.extend(ExtendedHash)
     exceptions = {}
 
     @hosts.pmap(@hosts.length) { |host|
       begin
-        [host, @redises[host].info.insensitive]
+        hash = { :at => Time.now }.insensitive
+        [host, hash.merge(@redises[host].info)]
       rescue Exception => e
         [host, e]
       end
@@ -176,7 +201,7 @@ private
           ks = [*k]
           v = ks.map { |e| rinfo[e] }.compact.first
           k = ks.first
-          info[:instances][host][k] = v
+          info[host][k] = v
         end
       end
     end
@@ -228,7 +253,12 @@ private
     }) if @count == 0
 
     file.puts CSV.generate_line(info_output.map { |pair|
-      [*pair.last].last
+      case val = [*pair.last].last
+      when Time
+        val.to_f
+      else
+        val
+      end
     })
     file.flush
   end
@@ -310,7 +340,7 @@ private
     tab << [nil] + @hosts.map { |h| h.bold.green }
     tab.separator!
     @tab_measures.each do |key|
-      tab << [key.to_s.bold] + @hosts.map { |host| info[:instances][host][key] }
+      tab << [key.to_s.bold] + @hosts.map { |host| info[host][key] }
     end
     @os.puts tab
   end
@@ -341,18 +371,27 @@ private
   end
 
   def process info, prev_info
-    @measures.map { |key|
-      # [ key, [humanized, raw] ]
-      [ key, process_how(info, prev_info, key) ]
-    }.select { |pair| pair.last }
+    hosts = [:sum].concat(@hosts)
+    Hash[@all_measures.map { |key|
+      [ key,
+        hosts.select { |h| info.has_key?(h) || h == :sum }.inject({}) { |sum, h|
+          sum[h] = process_how(h, info, prev_info, key)
+          sum
+        }
+      ]
+    }]
   end
 
-  def process_how info, prev_info, key
-    dur = prev_info && (info[:at] - prev_info[:at])
+  def process_how host, info, prev_info, key
+    dur = prev_info && begin
+      max = info.vals(host, :at).compact.max
+      min = prev_info.vals(host, :at).compact.min
+      max && min && (max - min)
+    end
 
     get_diff = lambda do |label|
       if dur && dur > 0
-        (info.sumf(label) - prev_info.sumf(label)) / dur
+        (info.f(host, label) - prev_info.f(host, label)) / dur
       else
         nil
       end
@@ -360,27 +399,29 @@ private
 
     case key
     when :at
-      val = Time.now.strftime('%H:%M:%S')
-      [val, val]
+      now = info.vals(host, :at).compact.max || Time.now
+      [now.strftime('%H:%M:%S'), now]
     when :used_cpu_user, :used_cpu_sys
       val = get_diff.call(key)
       val &&= (val * 100).round
       [humanize_number(val), val]
     when :keys
-      val = Hash[ info.select { |k, v| k =~ /^db[0-9]+$/ } ].values.inject(0) { |sum, vs|
-        sum + vs.map { |v| Hash[ v.split(',').map { |e| e.split '=' } ]['keys'].to_i }.inject(:+)
-      }
+      val = info.f(host, proc { |hash|
+        Hash[ hash.select { |k, v| k =~ /^db[0-9]+$/ } ].values.inject(0) { |sum, vs|
+          sum + Hash[ vs.split(',').map { |e| e.split '=' } ]['keys'].to_i
+        }
+      })
       [humanize_number(val), val]
     when :evicted_keys_per_second, :expired_keys_per_second, :keyspace_hits_per_second,
          :keyspace_misses_per_second, :total_commands_processed_per_second
       val = get_diff.call(key.to_s.gsub(/_per_second$/, '').to_sym)
       [humanize_number(val), val]
     when :used_memory, :used_memory_rss, :aof_current_size, :aof_base_size
-      val = info.sumf(key)
+      val = info.f(host, key)
       [humanize_number(val.to_i, true), val]
     when :keyspace_hit_ratio
-      hits = info.sumf(:keyspace_hits)
-      misses = info.sumf(:keyspace_misses)
+      hits = info.f(host, :keyspace_hits)
+      misses = info.f(host, :keyspace_misses)
       val = ratio(hits, misses)
       [humanize_number(val), val]
     when :keyspace_hit_ratio_per_second
@@ -389,8 +430,10 @@ private
       val = ratio(hits, misses)
       [humanize_number(val), val]
     else
-      val = info.sumf(key)
-      [humanize_number(val), val]
+      conv = TYPES.fetch key, :s
+      val = info.send(conv, host, key)
+      val.is_a?(String) ?
+        [val, val] : [humanize_number(val), val]
     end
   end
 

data/lib/redis-stat/constants.rb

@@ -121,5 +121,48 @@ class RedisStat
     :pubsub_channels                     => 'psch',
     :pubsub_patterns                     => 'psp',
   }
+
+  TYPES = {
+    :at                                  => :f,
+    :used_cpu_user                       => :f,
+    :used_cpu_sys                        => :f,
+    :connected_clients                   => :i,
+    :blocked_clients                     => :i,
+    :used_memory                         => :i,
+    :used_memory_rss                     => :i,
+    :mem_fragmentation_ratio             => :f,
+    :total_commands_processed            => :i,
+    :total_commands_processed_per_second => :f,
+    :expired_keys                        => :i,
+    :expired_keys_per_second             => :f,
+    :evicted_keys                        => :i,
+    :evicted_keys_per_second             => :f,
+    :keys                                => :i,
+    :keyspace_hits                       => :i,
+    :keyspace_hits_per_second            => :f,
+    :keyspace_misses                     => :i,
+    :keyspace_misses_per_second          => :f,
+    :keyspace_hit_ratio                  => :i,
+    :keyspace_hit_ratio_per_second       => :f,
+    :aof_current_size                    => :i,
+    :aof_base_size                       => :i,
+    :changes_since_last_save             => :i,
+    :rdb_changes_since_last_save         => :i,
+    :pubsub_channels                     => :i,
+    :pubsub_patterns                     => :i,
+
+    :redis_version                       => :s,
+    :redis_mode                          => :s,
+    :process_id                          => :i,
+    :uptime_in_seconds                   => :i,
+    :uptime_in_days                      => :i,
+    :role                                => :s,
+    :connected_slaves                    => :i,
+    :aof_enabled                         => :i,
+    :rdb_bgsave_in_progress              => :i,
+    :bgsave_in_progress                  => :i,
+    :rdb_last_save_time                  => :i,
+    :last_save_time                      => :i,
+  }
 end
 

data/lib/redis-stat/elasticsearch.rb

@@ -6,16 +6,6 @@ class RedisStat
 class ElasticsearchSink
   attr_reader :hosts, :info, :index, :client
 
-  TO_I = {
-    :process_id              => true,
-    :uptime_in_seconds       => true,
-    :uptime_in_days          => true,
-    :connected_slaves        => true,
-    :aof_enabled             => true,
-    :rdb_bgsave_in_progress  => true,
-    :rdb_last_save_time      => true,
-  }
-
   DEFAULT_INDEX = 'redis-stat'
 
   def self.parse_url elasticsearch
@@ -38,15 +28,22 @@ class ElasticsearchSink
   end
 
   def output info
-    convert_to_i(info).each do |host, entries|
-      time = info[:at].to_i
+    @hosts.each do |host|
+      entries = Hash[info.map { |k, v|
+        if v.has_key?(host) && raw = v[host].last
+          [k, raw]
+        end
+      }.compact]
+      next if entries.empty?
+
+      time = entries[:at]
       entry = {
         :index => index,
         :type  => "redis",
         :body  => entries.merge({
           :@timestamp => format_time(time),
           :host       => host,
-          :at         => time
+          :at         => time.to_f
         }),
       }
 
@@ -57,27 +54,14 @@ class ElasticsearchSink
 private
   if RUBY_VERSION.start_with? '1.8.'
     def format_time time
-      fmt = Time.at(time).strftime("%FT%T%z")
+      fmt = time.strftime("%FT%T%z")
       fmt[0..-3] + ':' + fmt[-2..-1]
     end
   else
     def format_time time
-      Time.at(time).strftime("%FT%T%:z")
+      time.strftime("%FT%T%:z")
     end
   end
-
-  def convert_to_i info
-    Hash[info[:instances].map { |host, entries|
-      output = {}
-      entries.each do |name, value|
-        convert = RedisStat::LABELS[name] || TO_I[name]
-        if convert
-          output[name] = value.to_i
-        end
-      end
-      output.empty? ? nil : [host, output]
-    }.compact]
-  end
 end
 end
 

data/lib/redis-stat/server.rb

@@ -85,7 +85,7 @@ class Server < Sinatra::Base
 
     def push hosts, info, data, error
       static = Hash[settings.redis_stat.tab_measures.map { |stat|
-        [stat, hosts.map { |h| info[:instances][h][stat] }]
+        [stat, hosts.map { |h| info[h][stat] }]
       }]
       data = {:at      => (Time.now.to_f * 1000).to_i,
               :static  => static,

data/lib/redis-stat/server/views/index.erb

@@ -102,7 +102,7 @@
                 <tr id="<%= stat %>">
                   <% @hosts.each do |host| %>
                   <td>
-                    <%= @info[:instances][host][stat] %>
+                    <%= @info[host][stat] %>
                   </td>
                   <% end %>
                 </tr>

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: java
 authors:
 - Junegunn Choi