metrix 0.0.10 → 0.0.11

data/lib/metrix/cli.rb

@@ -4,6 +4,9 @@ require "metrix/mongodb"
 require "metrix/nginx"
 require "metrix/system"
 require "metrix/load"
+require "metrix/memory"
+require "metrix/diskstats"
+require "metrix/df"
 require "metrix/fpm"
 require "metrix/process_metric"
 require "metrix/load"
@@ -98,12 +101,15 @@ module Metrix
         begin
           cnt += 1
           now = Time.now.utc
-          fetch_metrix(:elasticsearch) { reporter << Metrix::ElasticSearch.new(fetch_resource(:elasticsearch)) }
-          fetch_metrix(:mongodb)       { reporter << Metrix::Mongodb.new(fetch_resource(:mongodb)) }
-          fetch_metrix(:nginx)         { reporter << Metrix::Nginx.new(fetch_resource(:nginx)) }
-          fetch_metrix(:fpm)           { reporter << Metrix::FPM.new(fetch_resource(:fpm)) }
-          fetch_metrix(:system)        { reporter << Metrix::System.new(File.read("/proc/stat")) }
-          fetch_metrix(:load)          { reporter << Metrix::Load.new(File.read("/proc/loadavg")) }
+          fetch_metrix(:elasticsearch)  { reporter << Metrix::ElasticSearch.new(fetch_resource(:elasticsearch)) }
+          fetch_metrix(:mongodb)        { reporter << Metrix::Mongodb.new(fetch_resource(:mongodb)) }
+          fetch_metrix(:nginx)          { reporter << Metrix::Nginx.new(fetch_resource(:nginx)) }
+          fetch_metrix(:fpm)            { reporter << Metrix::FPM.new(fetch_resource(:fpm)) }
+          fetch_metrix(:system)         { reporter << Metrix::System.new(File.read("/proc/stat")) }
+          fetch_metrix(:load)           { reporter << Metrix::Load.new(File.read("/proc/loadavg")) }
+          fetch_metrix(:memory)         { reporter << Metrix::Memory.new(File.read("/proc/meminfo")) }
+          fetch_metrix(:diskstats)      { reporter << Metrix::Diskstats.new(File.read("/proc/diskstats")) }
+          fetch_metrix(:df)             { reporter << Metrix::Df.new(`df -k`) }
 
           fetch_metrix :processes do
             Metrix::ProcessMetric.all.each do |m|

data/lib/metrix/df.rb

@@ -0,0 +1,34 @@
+require "metrix/base"
+
+module Metrix
+  class Df < Base
+    set_prefix "df"
+
+    MAPPING = {
+      total: 1,
+      used: 2,
+      available: 3,
+      used_perc: 4,
+    }
+
+    set_known_metrics MAPPING.keys.map(&:to_s)
+
+    def initialize(data)
+      @data = data
+      @time = Time.now
+    end
+
+    def metrics
+      metrics = []
+      @data.scan(%r(^(/.*)/)).each do |(line)|
+        chunks = line.split(/\s+/)
+        disk = chunks.at(0)
+        MAPPING.each do |key, idx|
+          value = cast_int(chunks.at(idx))
+          metrics << Metric.new("#{prefix}.#{key}", value, time, disk: disk)
+        end
+      end
+      metrics
+    end
+  end
+end

data/lib/metrix/diskstats.rb

@@ -0,0 +1,37 @@
+module Metrix
+  class Diskstats < Base
+    MAPPING = {
+      reads_completed: 0,
+      reads_merged: 1,
+      sectors_read: 2,
+      milliseconds_rea: 3,
+      writes_completed: 4,
+      writes_merged: 5,
+      sectors_written: 6,
+      milliseconds_written: 7,
+      ios_in_progress: 8,
+      milliseconds_io: 9,
+      weighted_milliseconds_io: 10,
+    }
+    set_prefix "diskstats"
+    set_known_metrics MAPPING.keys.map(&:to_s)
+
+    def initialize(data)
+      @data = data
+      @time = Time.now
+    end
+
+    def metrics
+      @data.scan(/^\s*(\d+)\s*(\d+)\s*(.*?) (.*)/).map do |(_, _, disk, rest)|
+        next if disk.start_with?("loop") || disk.start_with?("ram")
+        chunks = rest.split(" ").map(&:to_i)
+        metrics = []
+        MAPPING.keys.each_with_index do |m, i|
+          value = chunks.at(i)
+          metrics << Metric.new("#{prefix}.#{m}", value, @time, disk: disk)
+        end
+        metrics
+      end.flatten.compact
+    end
+  end
+end

data/lib/metrix/memory.rb

@@ -0,0 +1,77 @@
+require "metrix/base"
+
+module Metrix
+  class Memory < Base
+    set_prefix "memory"
+
+    def initialize(data)
+      @data = data
+      @time = Time.now
+    end
+
+    MAPPING = {
+      "MemTotal" => :mem_total,
+      "MemFree" => :mem_free,
+      "Buffers" => :buffers,
+      "Cached" => :cached,
+      "SwapCached" => :swap_cached,
+      "Active" => :active,
+      "Inactive" => :inactive,
+      "Active(anon)" => :active_anon,
+      "Inactive(anon)" => :inactive_anon,
+      "Active(file)" => :active_file,
+      "Inactive(file)" => :inactive_file,
+      "Unevictable" => :unevictable,
+      "Mlocked" => :mlocked,
+      "SwapTotal" => :swap_total,
+      "SwapFree" => :swap_free,
+      "Dirty" => :dirty,
+      "Writeback" => :writeback,
+      "AnonPages" => :anon_pages,
+      "Mapped" => :mapped,
+      "Shmem" => :shmem,
+      "Slab" => :slab,
+      "SReclaimable" => :s_reclaimable,
+      "SUnreclaim" => :s_unreclaim,
+      "KernelStack" => :kernel_stack,
+      "PageTables" => :page_tables,
+      "NFS_Unstable" => :nfs_unstable,
+      "Bounce" => :bounce,
+      "WritebackTmp" => :writeback_tmp,
+      "CommitLimit" => :commit_limit,
+      "Committed_AS" => :committed_as,
+      "VmallocTotal" => :vmalloc_total,
+      "VmallocUsed" => :vmalloc_used,
+      "VmallocChunk" => :vmalloc_chunk,
+      "HardwareCorrupted" => :hardware_corrupted,
+      "AnonHugePages" => :anon_huge_pages,
+      "HugePages_Total" => :huge_pages_total,
+      "HugePages_Free" => :huge_pages_free,
+      "HugePages_Rsvd" => :huge_pages_rsvd,
+      "HugePages_Surp" => :huge_pages_surp,
+      "Hugepagesize" => :hugepagesize,
+      "DirectMap4k" => :direct_map4k,
+      "DirectMap2M" => :direct_map2m,
+    }
+
+    set_known_metrics MAPPING.values
+
+    MAPPING.each do |from, to|
+      define_method(to) do
+        cast_int(parsed[from])
+      end
+    end
+
+    def extract(data = nil)
+      MAPPING.values.inject({}) do |hash, method|
+        hash[method] = send(method)
+        hash
+      end
+    end
+
+    def parsed
+      @parsed ||= Hash[@data.scan(/^(.*?):\s*(\d+)/).map { |k, v| [k, cast_int(v)] }]
+    end
+
+  end
+end

data/lib/metrix/process_metric.rb

@@ -10,10 +10,10 @@ module Metrix
 
     class << self
       def all
-        Dir.glob("/proc/*").select do |path|
-          File.directory?(path) && File.basename(path)[/^\d+$/]
-        end.map do |path|
-          Metrix::ProcessMetric.new(File.read(path + "/stat"))
+        IO.popen("find /proc -maxdepth 2 -mindepth 2 -name stat") do |io|
+          io.map do |path|
+            Metrix::ProcessMetric.new(File.read(path.strip))
+          end
         end
       end
     end

data/lib/metrix/version.rb

@@ -1,3 +1,3 @@
 module Metrix
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/fixtures/df.txt

@@ -0,0 +1,2 @@
+/dev/xvda1       8125880 4736276   2970176  62% /
+/dev/xvdb      412814512  804612 391040124   1% /mnt

data/spec/fixtures/diskstats.txt

@@ -0,0 +1,26 @@
+   1       0 ram0 0 0 0 0 0 0 0 0 0 0 0
+   1       1 ram1 0 0 0 0 0 0 0 0 0 0 0
+   1       2 ram2 0 0 0 0 0 0 0 0 0 0 0
+   1       3 ram3 0 0 0 0 0 0 0 0 0 0 0
+   1       4 ram4 0 0 0 0 0 0 0 0 0 0 0
+   1       5 ram5 0 0 0 0 0 0 0 0 0 0 0
+   1       6 ram6 0 0 0 0 0 0 0 0 0 0 0
+   1       7 ram7 0 0 0 0 0 0 0 0 0 0 0
+   1       8 ram8 0 0 0 0 0 0 0 0 0 0 0
+   1       9 ram9 0 0 0 0 0 0 0 0 0 0 0
+   1      10 ram10 0 0 0 0 0 0 0 0 0 0 0
+   1      11 ram11 0 0 0 0 0 0 0 0 0 0 0
+   1      12 ram12 0 0 0 0 0 0 0 0 0 0 0
+   1      13 ram13 0 0 0 0 0 0 0 0 0 0 0
+   1      14 ram14 0 0 0 0 0 0 0 0 0 0 0
+   1      15 ram15 0 0 0 0 0 0 0 0 0 0 0
+   7       0 loop0 0 0 0 0 0 0 0 0 0 0 0
+   7       1 loop1 0 0 0 0 0 0 0 0 0 0 0
+   7       2 loop2 0 0 0 0 0 0 0 0 0 0 0
+   7       3 loop3 0 0 0 0 0 0 0 0 0 0 0
+   7       4 loop4 0 0 0 0 0 0 0 0 0 0 0
+   7       5 loop5 0 0 0 0 0 0 0 0 0 0 0
+   7       6 loop6 0 0 0 0 0 0 0 0 0 0 0
+   7       7 loop7 0 0 0 0 0 0 0 0 0 0 0
+   8       0 sda 12732 743 377314 11532 8669 13477 569336 26884 0 10216 37124
+   8       1 sda1 12567 721 375818 11404 7362 13477 569336 26716 0 10076 36868

data/spec/fixtures/memory.txt

@@ -0,0 +1,42 @@
+MemTotal:        4049980 kB
+MemFree:         3614536 kB
+Buffers:           44580 kB
+Cached:           273180 kB
+SwapCached:            0 kB
+Active:           162464 kB
+Inactive:         176392 kB
+Active(anon):      21128 kB
+Inactive(anon):      216 kB
+Active(file):     141336 kB
+Inactive(file):   176176 kB
+Unevictable:           0 kB
+Mlocked:               0 kB
+SwapTotal:             0 kB
+SwapFree:              0 kB
+Dirty:                32 kB
+Writeback:             0 kB
+AnonPages:         21116 kB
+Mapped:            11312 kB
+Shmem:               252 kB
+Slab:              39200 kB
+SReclaimable:      30092 kB
+SUnreclaim:         9108 kB
+KernelStack:         640 kB
+PageTables:         2408 kB
+NFS_Unstable:          0 kB
+Bounce:                0 kB
+WritebackTmp:          0 kB
+CommitLimit:     2024988 kB
+Committed_AS:      78416 kB
+VmallocTotal:   34359738367 kB
+VmallocUsed:       64036 kB
+VmallocChunk:   34359671800 kB
+HardwareCorrupted:     0 kB
+AnonHugePages:         0 kB
+HugePages_Total:       0
+HugePages_Free:        0
+HugePages_Rsvd:        0
+HugePages_Surp:        0
+Hugepagesize:       2048 kB
+DirectMap4k:       44992 kB
+DirectMap2M:     4149248 kB

data/spec/lib/metrix/df_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+require "metrix/df"
+
+describe "Metrix::Df", :wip do
+  let(:data) { FIXTURES_PATH.join("df.txt").read }
+  subject(:df) { Metrix::Df.new(data) }
+
+  it { should_not be_nil }
+
+  it { Metrix::Df.prefix.should eq("df") }
+
+  describe "#known_metrics" do
+    subject(:known) { Metrix::Df.known_metrics }
+    it { should be_kind_of(Array) }
+  end
+
+  describe "#metrics" do
+    subject(:metrics) { df.metrics }
+    it { should be_kind_of(Array) }
+    it { subject.count.should eq(8) }
+
+    describe "#first" do
+      before do
+        df.stub(:time) { Time.at(11) }
+      end
+
+      subject(:first) { metrics.first }
+      it { should_not be_nil }
+      it { subject.key.should eq("df.total") }
+      it { subject.value.should eq(8125880) }
+      it { subject.time.should eq(Time.at(11)) }
+      it { subject.tags.should eq(disk: "/dev/xvda1") }
+    end
+  end
+end
+

data/spec/lib/metrix/diskstats_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+require "metrix/diskstats"
+
+describe "Metrix::Diskstats", :wip do
+  let(:data) { FIXTURES_PATH.join("diskstats.txt").read }
+  subject(:stats) { Metrix::Diskstats.new(data) }
+  it { should_not be_nil }
+
+  it { subject.prefix.should eq("diskstats") }
+
+  it { Metrix::Diskstats.known_metrics.count.should eq(11) }
+
+  describe "#metrics" do
+    subject(:metrics) { stats.metrics }
+    it { subject.count.should eq(22) }
+
+    describe "first metric" do
+      subject(:first) { metrics.first }
+      it { should_not be_nil }
+      it { subject.key.should eq("diskstats.reads_completed") }
+      it { subject.value.should eq(12732) }
+      it { subject.tags.should eq(disk: "sda") }
+      it { subject.to_opentsdb.should include("hostname=") }
+    end
+  end
+end

data/spec/lib/metrix/memory_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+require "metrix/memory"
+
+describe "Metrix::Memory" do
+  let(:data) { FIXTURES_PATH.join("memory.txt").read }
+  subject(:memory) { Metrix::Memory.new(data) }
+  it { should_not be_nil }
+
+  it { memory.prefix.should eq("memory") }
+
+  it { subject.mem_total.should eq(4049980) }
+  it { subject.mem_free.should eq(3614536) }
+  it { subject.active_anon.should eq(21128) }
+
+  it { Metrix::Memory.known_metrics.should be_kind_of(Array) }
+
+  it { subject.metrics.count.should eq(42) }
+
+  describe "first value" do
+    subject(:first) { memory.metrics.first }
+
+    it { subject.key.should eq("memory.mem_total") }
+    it { subject.value.should eq(4049980) }
+  end
+end

data/spec/lib/metrix_spec.rb

@@ -8,7 +8,7 @@ describe "Metrix" do
     subject(:known_metrics) { Metrix.known_metrics }
     it { should be_kind_of(Array) }
     it { should_not be_empty }
-    it { subject.count.should eq(170) }
+    it { subject.count.should > 170 }
 
     it { should include("mongodb.uptime") }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metrix
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: SyslogLogger
@@ -92,11 +92,14 @@ files:
 - lib/metrix.rb
 - lib/metrix/base.rb
 - lib/metrix/cli.rb
+- lib/metrix/df.rb
+- lib/metrix/diskstats.rb
 - lib/metrix/elastic_search.rb
 - lib/metrix/fpm.rb
 - lib/metrix/graphite.rb
 - lib/metrix/json_metric.rb
 - lib/metrix/load.rb
+- lib/metrix/memory.rb
 - lib/metrix/metric.rb
 - lib/metrix/mongodb.rb
 - lib/metrix/nginx.rb
@@ -106,9 +109,12 @@ files:
 - lib/metrix/system.rb
 - lib/metrix/version.rb
 - metrix.gemspec
+- spec/fixtures/df.txt
+- spec/fixtures/diskstats.txt
 - spec/fixtures/ec2metadata.txt
 - spec/fixtures/es_status.json
 - spec/fixtures/loadavg.txt
+- spec/fixtures/memory.txt
 - spec/fixtures/metrix.yml
 - spec/fixtures/mongo_server_status.json
 - spec/fixtures/nginx.status.txt
@@ -117,10 +123,13 @@ files:
 - spec/fixtures/proc.stat.txt
 - spec/lib/metrix/base_spec.rb
 - spec/lib/metrix/cli_spec.rb
+- spec/lib/metrix/df_spec.rb
+- spec/lib/metrix/diskstats_spec.rb
 - spec/lib/metrix/elastic_search_spec.rb
 - spec/lib/metrix/fpm_spec.rb
 - spec/lib/metrix/graphite_spec.rb
 - spec/lib/metrix/load_spec.rb
+- spec/lib/metrix/memory_spec.rb
 - spec/lib/metrix/metric_spec.rb
 - spec/lib/metrix/mongodb_spec.rb
 - spec/lib/metrix/nginx_spec.rb
@@ -154,9 +163,12 @@ signing_key:
 specification_version: 3
 summary: Ruby Metrics Library
 test_files:
+- spec/fixtures/df.txt
+- spec/fixtures/diskstats.txt
 - spec/fixtures/ec2metadata.txt
 - spec/fixtures/es_status.json
 - spec/fixtures/loadavg.txt
+- spec/fixtures/memory.txt
 - spec/fixtures/metrix.yml
 - spec/fixtures/mongo_server_status.json
 - spec/fixtures/nginx.status.txt
@@ -165,10 +177,13 @@ test_files:
 - spec/fixtures/proc.stat.txt
 - spec/lib/metrix/base_spec.rb
 - spec/lib/metrix/cli_spec.rb
+- spec/lib/metrix/df_spec.rb
+- spec/lib/metrix/diskstats_spec.rb
 - spec/lib/metrix/elastic_search_spec.rb
 - spec/lib/metrix/fpm_spec.rb
 - spec/lib/metrix/graphite_spec.rb
 - spec/lib/metrix/load_spec.rb
+- spec/lib/metrix/memory_spec.rb
 - spec/lib/metrix/metric_spec.rb
 - spec/lib/metrix/mongodb_spec.rb
 - spec/lib/metrix/nginx_spec.rb