redis-stat 0.3.9 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2RkODI2MDg1MDYyYTNlN2Y2NTY4N2FiZGQyMWNmODM0NTE2ZTBhYw==
-  data.tar.gz: !binary |-
-    NDVmNmQ1MjRiY2FiNTg0YjIxNjRiZjA5NTU5MDRjNTI5NDRhMjY0Mg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDE5OWVhMDQ2NWNlODUxNGUwZGYwNGY0M2EzMTU3ZDQyYWRmMmRlNzNiNzkz
-    ZDhlMTIwYWY0YTljMTgzYzcyM2JhMWVkOTljY2M4MTg2OTIwODdmYTMyNDky
-    YWEyZmM3YWZmZjJhZTgwM2EwYmE1ZTRhZmMyZmU3MmY0MmI1MWM=
-  data.tar.gz: !binary |-
-    NmQ0YzBkOTcwMGE4NTU5YTNmNDE3MTczNTI2NzFlNDMyNWJkYzcxNWRhZWM5
-    NzUyMTAxODA3NTg3M2I0NGY3NTMzOThhNjEyM2E1Yjc0MmMzZmFkYzdkYTU2
-    OGM0YzBmYjYzZDQ0NmUwNmEwMDc0ODlhNWZhMmMyZjAwZjI1MDM=
+SHA1:
+  metadata.gz: 88b48d390b0584414c03baf3f3201af816bf89e9
+  data.tar.gz: 8cba293490f939431fc0aa82a45f06ae3f7a140b
+SHA512:
+  metadata.gz: fc1a3324b2f435c39edb17114fa96714ac3e1e24ba2e1f57a8f9d89ec6ad1c7bb54d209beb9e1f151d391d0ef94a5114850d79f19585f6d38606aba38429f04c
+  data.tar.gz: 3fdc739c0858e5830760e2b227a8562e73b611f745f0456de1c150c6a240e9bdc10372ce78eb9b7b278c77b9932db18e88967fe44a0e26e83680b7b67e976728

data/README.md

@@ -26,6 +26,7 @@ usage: redis-stat [HOST[:PORT] ...] [INTERVAL [COUNT]]
         --style=STYLE                Output style: unicode|ascii
         --no-color                   Suppress ANSI color codes
         --csv=OUTPUT_CSV_FILE_PATH   Save the result in CSV format
+        --es=ELASTICSEARCH_URL       Send results to Elasticsearch
 
         --server[=PORT]              Launch redis-stat web server (default port: 63790)
         --daemon                     Daemonize redis-stat. Must be used with --server option.
@@ -102,3 +103,7 @@ the original [redis-stat](https://github.com/antirez/redis-tools/blob/master/red
 included in [redis-tools](https://github.com/antirez/redis-tools) written by the creator of Redis himself. (My bad)
 Although the original C-version hasn't been updated for the past couple of years, you might want to check it out first.
 
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/junegunn/redis-stat/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/redis-stat.rb

@@ -4,6 +4,7 @@ require 'redis-stat/version'
 require 'redis-stat/constants'
 require 'redis-stat/option'
 require 'redis-stat/server'
+require 'redis-stat/elasticsearch'
 require 'insensitive_hash'
 require 'redis'
 require 'tabularize'
@@ -24,27 +25,28 @@ class RedisStat
     Ansi256.enabled = STDOUT.tty? && !(windows || options[:mono])
     options[:style] = :ascii if windows
 
-    @hosts       = options[:hosts]
-    @redises     = @hosts.map { |e|
-      host, port = e.split(':')
+    @hosts         = options[:hosts]
+    @redises       = @hosts.map { |e|
+      host, port   = e.split(':')
       Redis.new(Hash[ {:host => host, :port => port, :timeout => DEFAULT_REDIS_TIMEOUT}.select { |k, v| v } ])
     }
-    @interval    = options[:interval]
-    @max_count   = options[:count]
-    @colors      = options[:colors] || COLORS
-    @csv         = options[:csv]
-    @auth        = options[:auth]
-    @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]
-    @count       = 0
-    @style       = options[:style]
-    @varwidth    = STDOUT.tty? && !windows
-    @first_batch = true
-    @server_port = options[:server_port]
-    @server_thr  = nil
-    @daemonized  = options[:daemon]
+    @interval      = options[:interval]
+    @max_count     = options[:count]
+    @colors        = options[:colors] || COLORS
+    @csv           = options[:csv]
+    @auth          = options[:auth]
+    @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]
+    @count         = 0
+    @style         = options[:style]
+    @varwidth      = STDOUT.tty? && !windows
+    @first_batch   = true
+    @server_port   = options[:server_port]
+    @server_thr    = nil
+    @daemonized    = options[:daemon]
+    @elasticsearch = options[:es] && ElasticsearchSink.new(@hosts, options[:es])
   end
 
   def info
@@ -89,7 +91,7 @@ class RedisStat
             end
           end
         info_output = process info, prev_info
-        output info, info_output, csv unless @daemonized
+        output info, info_output, csv
         server.push info, Hash[info_output] if server
         prev_info = info
 
@@ -105,6 +107,7 @@ class RedisStat
         @server_thr.join
       end
     rescue Exception => e
+      @os.puts
       @os.puts e.to_s.red.bold
       raise
     ensure
@@ -262,8 +265,15 @@ private
   end
 
   def output info, info_output, file
-    output_term info_output
+    output_term info_output       unless @daemonized
     output_file info_output, file if file
+    output_es   info              if @elasticsearch
+  end
+
+  def output_es info
+    @elasticsearch.output info
+  rescue Exception
+    raise unless @daemonized
   end
 
   def init_table info_output

data/lib/redis-stat/elasticsearch.rb

@@ -0,0 +1,84 @@
+require 'elasticsearch'
+require 'date'
+require 'uri'
+
+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
+    unless elasticsearch.match(%r[^https?://])
+      elasticsearch = "http://#{elasticsearch}"
+    end
+
+    uri      = URI.parse elasticsearch
+    path     = uri.path
+    index    = path == '' ? DEFAULT_INDEX : path.split('/').last
+    uri.path = ''
+
+    [uri.to_s, index]
+  end
+
+  def initialize hosts, elasticsearch
+    url, @index  = elasticsearch
+    @hosts       = hosts
+    @client      = Elasticsearch::Client.new :url => url
+  end
+
+  def output info
+    results = convert_to_i info
+    results.map do |host, entries|
+      time = entries[:at]
+      entry = {
+        :index => index,
+        :type  => "redis",
+        :body  => entries.merge({
+          :@timestamp => Time.at(time).strftime("%FT%T%:z"),
+          :host       => host
+        }),
+      }
+
+      client.index entry
+    end
+  end
+
+private
+  def link_hosts_to_info info
+    {}.tap do |output|
+      hosts.each_with_index do |host, index|
+        output[host] = {}.tap do |host_output|
+          info.each do |name, entries|
+            value = name == :at ? entries : entries[index]
+            host_output[name] = value
+          end
+        end
+      end
+    end
+  end
+
+  def convert_to_i info
+    info = link_hosts_to_info info
+    info.each do |host, entries|
+      entries.each do |name, value|
+        convert = RedisStat::LABELS[name] || TO_I[name]
+        if convert
+          entries[name] = value.to_i
+        end
+      end
+    end
+  end
+end
+end
+

data/lib/redis-stat/option.rb

@@ -38,6 +38,10 @@ module Option
         options[:csv] = v
       end
 
+      opts.on('--es=ELASTICSEARCH_URL', 'Send results to Elasticsearch') do |v|
+        options[:es] = RedisStat::ElasticsearchSink.parse_url v
+      end
+
       opts.separator ''
 
       opts.on('--server[=PORT]', "Launch redis-stat web server (default port: #{RedisStat::DEFAULT_SERVER_PORT})") do |v|

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

data/redis-stat.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "sinatra", '~> 1.3.3'
   gem.add_runtime_dependency "json", '~> 1.7.5'
   gem.add_runtime_dependency "lps", '~> 0.2.0'
+  gem.add_runtime_dependency "elasticsearch", '~> 1.0.0'
 
   if RUBY_PLATFORM == 'java'
     gem.add_runtime_dependency "puma", '~> 2.3.2'
@@ -33,6 +34,4 @@ Gem::Specification.new do |gem|
     gem.add_runtime_dependency "thin", '~> 1.5.0'
     gem.add_runtime_dependency "daemons", '~> 1.1.9'
   end
-
-  gem.add_development_dependency 'test-unit'
 end

data/test/bin_helper.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-# DISCLAIMER: 
+# DISCLAIMER:
 #   Not a real test!
 #   Just a helper script for running scripts with local source
 

data/test/test_redis-stat.rb

@@ -1,14 +1,15 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'rubygems'
-require 'test-unit'
+$VERBOSE = true
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
 require 'redis-stat'
 require 'redis'
 require 'stringio'
+require 'minitest/autorun'
 
-class TestRedisStat < Test::Unit::TestCase
+class TestRedisStat < MiniTest::Unit::TestCase
   def test_humanize_number
     rs = RedisStat.new
     assert_equal '0', rs.send(:humanize_number, 0.00)
@@ -102,9 +103,20 @@ class TestRedisStat < Test::Unit::TestCase
       :style => :ascii
     }.sort, options.sort)
 
+    options = RedisStat::Option.parse(%w[-h localhost:8888 10 -a password --csv=/tmp/a.csv --style=ascii --es=localhost/index])
+    assert_equal({
+      :auth => 'password',
+      :hosts => ['localhost:8888'],
+      :interval => 10,
+      :count => nil,
+      :csv => '/tmp/a.csv',
+      :style => :ascii,
+      :es => %w[http://localhost index]
+    }.sort, options.sort)
+
     # Server
     if RUBY_PLATFORM == 'java'
-      assert_raise(SystemExit) {
+      assert_raises(SystemExit) {
         RedisStat::Option.parse(%w[-h localhost:8888 10 -a password --csv=/tmp/a.csv --style=ascii --server=5555 --daemon])
       }
     else
@@ -130,16 +142,16 @@ class TestRedisStat < Test::Unit::TestCase
       %w[localhost 0],
       %w[localhost 5 0]
     ].each do |argv|
-      assert_raise(SystemExit) {
+      assert_raises(SystemExit) {
         options = RedisStat::Option.parse(argv)
       }
     end
 
-    assert_raise(SystemExit) {
+    assert_raises(SystemExit) {
       RedisStat::Option.parse(%w[--style=html])
     }
 
-    assert_raise(SystemExit) {
+    assert_raises(SystemExit) {
       RedisStat::Option.parse(%w[--daemon])
     }
   end
@@ -183,8 +195,19 @@ class TestRedisStat < Test::Unit::TestCase
     else
       raise NotImplementedError.new # FIXME
     end
-  rescue Redis::CannotConnectError, NotImplementedError 
-    pend "redises not ready"
+  rescue Redis::CannotConnectError, NotImplementedError
+    skip "redises not ready"
+  end
+
+  def test_elasticsearch_url
+    {
+      'localhost/index'         => %w[http://localhost index],
+      'https://localhost/index' => %w[https://localhost index],
+      'https://localhost'       => %w[https://localhost services],
+      'httpserver:9200/index'   => %w[http://httpserver:9200 index],
+    }.each do |arg, ret|
+      assert_equal ret, RedisStat::ElasticsearchSink.parse_url(arg)
+    end
   end
 end
 

metadata

@@ -1,183 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Junegunn Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi256
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: tabularize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.9
 - !ruby/object:Gem::Dependency
   name: insensitive_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: parallelize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: si
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: lps
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: daemons
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.1.9
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.9
 description: A real-time Redis monitoring tool written in Ruby
 email:
 - junegunn.c@gmail.com
@@ -186,7 +186,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -194,6 +194,7 @@ files:
 - bin/redis-stat
 - lib/redis-stat.rb
 - lib/redis-stat/constants.rb
+- lib/redis-stat/elasticsearch.rb
 - lib/redis-stat/option.rb
 - lib/redis-stat/server.rb
 - lib/redis-stat/server/public/bootstrap/css/bootstrap-responsive.min.css
@@ -227,17 +228,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A real-time Redis monitoring tool written in Ruby