metrix 0.0.2 → 0.0.3

data/lib/metrix/base.rb

@@ -38,5 +38,9 @@ module Metrix
     def unfiltered_metrics
       extract(attributes)
     end
+
+    def cast_int(value)
+      value.to_i if value
+    end
   end
 end

data/lib/metrix/cli.rb

@@ -1,6 +1,7 @@
 require "metrix"
 require "metrix/elastic_search"
 require "metrix/mongodb"
+require "metrix/nginx"
 require "metrix/system"
 require "metrix/load"
 require "logger"
@@ -32,6 +33,7 @@ module Metrix
           now = Time.now.utc
           reporter << Metrix::ElasticSearch.new(elastic_search_status)  if elastic_search?
           reporter << Metrix::Mongodb.new(mongodb_status)               if mongodb?
+          reporter << Metrix::Nginx.new(nginx_status)                   if nginx?
           if system?
             reporter << Metrix::System.new(File.read("/proc/stat"))
             reporter << Metrix::Load.new(File.read("/proc/loadavg"))
@@ -50,8 +52,12 @@ module Metrix
           Metrix.logger.error "#{err.backtrace.inspect}"
         ensure
           sleep_for = @interval - (Time.now - started - cnt * interval)
-          Metrix.logger.info "finished run in %.06f, sleeping for %.06f" % [Time.now - now, sleep_for]
-          sleep sleep_for
+          if sleep_for > 0
+            Metrix.logger.info "finished run in %.06f, sleeping for %.06f" % [Time.now - now, sleep_for]
+            sleep sleep_for
+          else
+            Metrix.logger.info "not sleeping because %.06f is negative" % [sleep_for]
+          end
         end
       end
     end
@@ -72,6 +78,10 @@ module Metrix
       !!@mongodb
     end
 
+    def nginx?
+      !!@nginx
+    end
+
     def elastic_search_status
       Metrix.logger.info "fetching elasticsearch metrix"
       Net::HTTP.get(URI("http://127.0.0.1:9200/_status"))
@@ -82,6 +92,11 @@ module Metrix
       Net::HTTP.get(URI("http://127.0.0.1:28017/serverStatus"))
     end
 
+    def nginx_status
+      Metrix.logger.info "fetching mongodb metrix"
+      Net::HTTP.get(URI("http://127.0.0.1:8000/"))
+    end
+
     def system?
       !!@system
     end
@@ -94,6 +109,15 @@ module Metrix
     def opts
       require "optparse"
       @opts ||= OptionParser.new do |o|
+        o.on("-v", "--version") do
+          puts "metrix #{Metrix::VERSION}"
+          exit
+        end
+
+        o.on("--nginx") do
+          @nginx = true
+        end
+
         o.on("--mongodb") do
           @mongodb = true
         end

data/lib/metrix/nginx.rb

@@ -0,0 +1,56 @@
+require "metrix/base"
+
+module Metrix
+  class Nginx < Base
+    def initialize(data)
+      @data = data
+      @time = Time.now
+    end
+
+    def active_connections
+      cast_int(@data[/Active connections: (\d+)/, 1])
+    end
+
+    [:accepts, :handled, :requests].each do |name|
+      define_method(name) do
+        numbers[name]
+      end
+    end
+
+    def prefix
+      "nginx"
+    end
+
+    def extract(data = nil)
+      {
+        accepts: accepts,
+        handled: handled,
+        requests: requests,
+        active_connections: active_connections,
+        reading: reading,
+        writing: writing,
+        waiting: waiting,
+      }
+    end
+
+    def reading
+      cast_int(@data[/Reading: (\d+)/, 1])
+    end
+
+    def writing
+      cast_int(@data[/Writing: (\d+)/, 1])
+    end
+
+    def waiting
+      cast_int(@data[/Waiting: (\d+)/, 1])
+    end
+
+    def numbers
+      @numbers ||= if @data.match(/server.*\n\s*(\d+) (\d+) (\d+)/)
+        @numbers = { accepts: cast_int($1), handled: cast_int($2), requests: cast_int($3) }
+      else
+        {}
+      end
+    end
+  end
+end

data/lib/metrix/system.rb

@@ -64,9 +64,5 @@ module Metrix
     def cpu
       Cpu.new(@raw[/^cpu (.*)/, 1].split(" ").map(&:to_i))
     end
-
-    def cast_int(value)
-      value.to_i if value
-    end
   end
 end

data/lib/metrix/version.rb

@@ -1,3 +1,3 @@
 module Metrix
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/fixtures/nginx.status.txt

@@ -0,0 +1,4 @@
+Active connections: 1
+server accepts handled requests
+ 7 8 11
+Reading: 0 Writing: 1 Waiting: 3

data/spec/lib/metrix/nginx_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+require "metrix/nginx"
+
+describe "Metrix::Nginx" do
+  subject(:nginx) { Metrix::Nginx.new(FIXTURES_PATH.join("nginx.status.txt").read) }
+  it { should_not be_nil }
+
+  it { subject.active_connections.should eq(1) }
+  it { subject.accepts.should eq(7) }
+  it { subject.handled.should eq(8) }
+  it { subject.requests.should eq(11) }
+
+  it { subject.reading.should eq(0) }
+  it { subject.writing.should eq(1) }
+  it { subject.waiting.should eq(3) }
+
+  it { subject.prefix.should eq("nginx") }
+
+  describe "#extract" do
+    subject(:extracted) { nginx.extract(nil) }
+    it { should be_kind_of(Hash) }
+    it { subject[:accepts].should eq(7) }
+    it { subject[:active_connections].should eq(1) }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metrix
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: SyslogLogger
@@ -98,6 +98,7 @@ files:
 - lib/metrix/load.rb
 - lib/metrix/metric.rb
 - lib/metrix/mongodb.rb
+- lib/metrix/nginx.rb
 - lib/metrix/opentsdb.rb
 - lib/metrix/process.rb
 - lib/metrix/reporter/stdout.rb
@@ -108,6 +109,7 @@ files:
 - spec/fixtures/es_status.json
 - spec/fixtures/loadavg.txt
 - spec/fixtures/mongo_server_status.json
+- spec/fixtures/nginx.status.txt
 - spec/fixtures/proc.26928.txt
 - spec/fixtures/proc.stat.txt
 - spec/lib/metrix/elastic_search_spec.rb
@@ -115,6 +117,7 @@ files:
 - spec/lib/metrix/load_spec.rb
 - spec/lib/metrix/metric_spec.rb
 - spec/lib/metrix/mongodb_spec.rb
+- spec/lib/metrix/nginx_spec.rb
 - spec/lib/metrix/opentsdb_spec.rb
 - spec/lib/metrix/process_spec.rb
 - spec/lib/metrix/system_spec.rb
@@ -148,6 +151,7 @@ test_files:
 - spec/fixtures/es_status.json
 - spec/fixtures/loadavg.txt
 - spec/fixtures/mongo_server_status.json
+- spec/fixtures/nginx.status.txt
 - spec/fixtures/proc.26928.txt
 - spec/fixtures/proc.stat.txt
 - spec/lib/metrix/elastic_search_spec.rb
@@ -155,6 +159,7 @@ test_files:
 - spec/lib/metrix/load_spec.rb
 - spec/lib/metrix/metric_spec.rb
 - spec/lib/metrix/mongodb_spec.rb
+- spec/lib/metrix/nginx_spec.rb
 - spec/lib/metrix/opentsdb_spec.rb
 - spec/lib/metrix/process_spec.rb
 - spec/lib/metrix/system_spec.rb