ddstat 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTBlOWNmNTk5OGMxOTZiOGYxZDY4Y2UxNTQ5ZTcyMzljNzUyZGI4ZA==
+  data.tar.gz: !binary |-
+    NzdlNjBjOTY4NjI4Zjc2YzllMDE3OWQ5M2I3YjhkMzcyMGE2NTkwMQ==
+SHA512:
+  metadata.gz: !binary |-
+    Y2JlMTI1Y2MzN2YzOTA3OGIxMmYzMTNlMDY4YWM1ODFmMWQxY2IxNjQyNGE5
+    NGQ1NmQ3MDczYjhmMDRjODI3ZTJmNThkYTI3NzFmNjNjMjA5MWFkYWNkYjEz
+    MWZlN2M2ZjA1YTdmNmU3YzNmZjRlZjg4Y2RiMjY2YTMzMmJmOTA=
+  data.tar.gz: !binary |-
+    ZDRmZDk3OWZmYjBiZGNjZjZiZTUxZGFlOWEwODhjOGY2NWFmOThiMTQ2OTgz
+    NzU3MGQxYzBiMjVjYTNmNzRjOTc0ZWQwZWExZTMzOGIyMTk5MTEzODhlNTVk
+    MmIyZDBhMGFhZjAxOWVkZDc2OGY3NjRlNTJhYjM5ZWNlYTM0YTY=

data/README.md

@@ -22,7 +22,6 @@ Or install it yourself as:
 
 ```sh
 $ export DD_API_KEY=...
-$ #export DD_APP_KEY=...
 $ ddstat -tclmsdrn 5 # The outputted data is transmitted to Datadog.
 ----system---- ----total-cpu-usage---- ---load-avg--- ------memory-usage----- ----swap--- -dsk/total- --io/total- -net/total-
   date/time   |usr sys idl wai hiq siq| 1m   5m  15m | used  buff  cach  free| used  free| read  writ| read  writ| recv  send

data/bin/ddstat

@@ -1,4 +1,10 @@
 #!/usr/bin/env ruby
 $: << File.expand_path("#{File.dirname __FILE__}/../lib")
 require 'ddstat'
+
+trap(:INT) do
+  print "\e[0m"
+  exit
+end
+
 Ddstat.run

data/ddstat.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'dogapi'
+  spec.add_dependency 'json'
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
 end

data/lib/ddstat.rb

@@ -4,9 +4,11 @@ module Ddstat
   end
 end
 
-require 'thread'
+require 'json'
+require 'net/http'
+require 'pty'
 require 'time'
 require 'socket'
-require 'dogapi'
 require 'ddstat/version'
 require 'ddstat/ddstat'
+require 'ddstat/ddclient'

data/lib/ddstat/ddstat.rb

@@ -4,19 +4,24 @@ class Ddstat::Ddstat
 
   def initialize
     api_key = ENV['DD_API_KEY']
-    app_key = ENV['DD_APP_KEY']
     host = %x[hostname -f 2> /dev/null].strip
     host = Socket.gethostname if host.empty?
-    @dog = Dogapi::Client.new(api_key, app_key, host)
+    @dog = Ddstat::Ddclient.new(api_key, host)
   end
 
   def run
-    cmd = "#{DSTAT_PATH} #{ARGV.join(' ')}"
-
-    IO.popen(cmd) do |dstat|
-      while line = gets_with_print(dstat)
-        line = line.gsub("\e[7l-", '-')
-        parse_line(dstat, line)
+    rows, cols = curr_rows_cols
+    cmd = [
+      "stty rows #{rows}",
+      "stty cols #{cols}",
+      "#{DSTAT_PATH} #{ARGV.join(' ')}"
+    ].join(';')
+
+    PTY.spawn(cmd) do |r, w, pid|
+      while line = gets_with_print(r)
+        line = line.gsub(/\e\[?7l?-/, '-')
+        line = line.split("\e8").last
+        parse_line(r, line)
       end
     end
   end
@@ -26,13 +31,17 @@ class Ddstat::Ddstat
   def gets_with_print(dstat)
     line = dstat.gets
     print line
-    return line
+    return remove_color(line)
   end
 
   def parse_line(dstat, line)
     if line =~ /\A-/
-      categories = parse_category_header(line)
-      @fields = parse_header(categories, gets_with_print(dstat))
+      header = gets_with_print(dstat)
+
+      unless @fields
+        categories = parse_category_header(line)
+        @fields = parse_header(categories, header)
+      end
     else
       field_values = parse_values(line)
       emit_points(field_values)
@@ -85,17 +94,27 @@ class Ddstat::Ddstat
                   Time.now
                 end
 
+    metrics = {}
+
     field_values.each do |category, fields|
       fields.each do |name, value|
-        Thread.start do
-          begin
-            metric_name = [PREFIX, category, name].join('.')
-            @dog.emit_point(metric_name, value.to_f)
-          rescue Timeout::Error
-            # nothing to do
-          end
-        end
+        metric_name = [PREFIX, category, name].join('.')
+        metrics[metric_name] = value.to_f
       end
     end
+
+    @dog.emit_series(date_time, metrics)
+  rescue Timeout::Error
+    # nothing to do
+  end
+
+  def remove_color(str)
+    str.gsub(/\e\[\d{1,2}(?:;\d{1,2})*[mK]/, '')
+  end
+
+  def curr_rows_cols
+    `stty -a`.split("\n").first.split(';').values_at(1, 2).map do |nv|
+      nv.strip.split(/\s+/, 2)[1]
+    end
   end
 end

data/lib/ddstat/version.rb

@@ -1,3 +1,3 @@
 module Ddstat
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddstat
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Genki Sugawara
@@ -12,9 +11,8 @@ cert_chain: []
 date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dogapi
+  name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -80,26 +73,25 @@ files:
 homepage: https://bitbucket.org/winebarrel/ddstat
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool that send to Datadog the data while execute dstat
 test_files: []