ganymed 0.4.2 → 0.4.3

data/lib/ganymed/collectors/cpu.rb

@@ -9,13 +9,12 @@ collect do
         x.to_i / 100
       end
 
-      Metriks.derive("os.cpu.user").mark(cpu[0])
-      Metriks.derive("os.cpu.nice").mark(cpu[1])
-      Metriks.derive("os.cpu.system").mark(cpu[2])
-      Metriks.derive("os.cpu.idle").mark(cpu[3])
-      Metriks.derive("os.cpu.iowait").mark(cpu[4])
-      Metriks.derive("os.cpu.irq").mark(cpu[5])
-      Metriks.derive("os.cpu.softirq").mark(cpu[6])
+      Metriks.derive("os.cpu:user").mark(cpu[0])
+      Metriks.derive("os.cpu:nice").mark(cpu[1])
+      Metriks.derive("os.cpu:system").mark(cpu[2])
+      Metriks.derive("os.cpu:iowait").mark(cpu[4])
+      Metriks.derive("os.cpu:irq").mark(cpu[5])
+      Metriks.derive("os.cpu:softirq").mark(cpu[6])
     end
   end
 end

data/lib/ganymed/collectors/disk.rb

@@ -16,10 +16,10 @@ collect do
       next if config.exclude.map {|e| Regexp.new(e).match(name)}.any?
 
       block_pc = 1.0 - (st.blocks_free.to_f / st.blocks.to_f)
-      Metriks.histogram("os.disk.#{name}.blocks").update(block_pc)
+      Metriks.histogram("os.disk:#{name}.blocks").update(block_pc)
 
       files_pc = 1.0 - (st.files_free.to_f / st.files.to_f)
-      Metriks.histogram("os.disk.#{name}.files").update(files_pc)
+      Metriks.histogram("os.disk:#{name}.files").update(files_pc)
     end
   end
 end

data/lib/ganymed/collectors/iostat.rb

@@ -11,8 +11,9 @@ collect do
       ios = Struct::IOStat.new(*line.strip.split(/\s+/))
       next if config.skip_numbered.tap{} and ios.dev =~ /\d+$/
       next if config.exclude.map {|e| Regexp.new(e).match(ios.dev)}.any?
-      Metriks.derive("os.iostat.#{ios.dev}.rsect").mark(ios.rsect.to_i)
-      Metriks.derive("os.iostat.#{ios.dev}.wsect").mark(ios.wsect.to_i)
+      sector_size = File.read("/sys/block/#{ios.dev}/queue/physical_block_size").chomp.to_i rescue 512
+      Metriks.derive("os.iostat:#{ios.dev}.rbytes").mark(ios.rsect.to_i * sector_size)
+      Metriks.derive("os.iostat:#{ios.dev}.wbytes").mark(ios.wsect.to_i * sector_size)
     end
   end
 end

data/lib/ganymed/collectors/memory.rb

@@ -14,28 +14,28 @@ collect do
       when "MemTotal"
         apps = value
       when "MemFree"
-        Metriks.histogram("os.mem.unused").update(value)
+        Metriks.histogram("os.mem:unused").update(value)
         apps -= value
       when "Buffers"
-        Metriks.histogram("os.mem.buffers").update(value)
+        Metriks.histogram("os.mem:buffers").update(value)
         apps -= value
       when "Cached"
-        Metriks.histogram("os.mem.cache").update(value)
+        Metriks.histogram("os.mem:cache").update(value)
         apps -= value
       when "SwapCached"
-        Metriks.histogram("os.mem.swap_cache").update(value)
+        Metriks.histogram("os.mem:swap_cache").update(value)
         apps -= value
       when "Slab"
-        Metriks.histogram("os.mem.slab_cache").update(value)
+        Metriks.histogram("os.mem:slab_cache").update(value)
         apps -= value
       when "PageTables"
-        Metriks.histogram("os.mem.page_tables").update(value)
+        Metriks.histogram("os.mem:page_tables").update(value)
         apps -= value
       when "Mapped"
-        Metriks.histogram("os.mem.mapped").update(value)
+        Metriks.histogram("os.mem:mapped").update(value)
       end
     end
 
-    Metriks.histogram("os.mem.apps").update(apps)
+    Metriks.histogram("os.mem:apps").update(apps)
   end
 end

data/lib/ganymed/collectors/network.rb

@@ -15,12 +15,12 @@ collect do
 
       next if config.exclude.map {|e| Regexp.new(e).match(ns.dev)}.any?
 
-      Metriks.derive("os.net.#{ns.dev}.rbytes").mark(ns.rbytes.to_i)
-      Metriks.derive("os.net.#{ns.dev}.wbytes").mark(ns.wbytes.to_i)
-      Metriks.derive("os.net.#{ns.dev}.rpackets").mark(ns.rpackets.to_i)
-      Metriks.derive("os.net.#{ns.dev}.wpackets").mark(ns.wpackets.to_i)
-      Metriks.derive("os.net.#{ns.dev}.rerrs").mark(ns.rerrs.to_i)
-      Metriks.derive("os.net.#{ns.dev}.werrs").mark(ns.werrs.to_i)
+      Metriks.derive("os.net:#{ns.dev}.rbytes").mark(ns.rbytes.to_i)
+      Metriks.derive("os.net:#{ns.dev}.wbytes").mark(ns.wbytes.to_i)
+      Metriks.derive("os.net:#{ns.dev}.rpackets").mark(ns.rpackets.to_i)
+      Metriks.derive("os.net:#{ns.dev}.wpackets").mark(ns.wpackets.to_i)
+      Metriks.derive("os.net:#{ns.dev}.rerrs").mark(ns.rerrs.to_i)
+      Metriks.derive("os.net:#{ns.dev}.werrs").mark(ns.werrs.to_i)
     end
   end
 end

data/lib/ganymed/collectors/process.rb

@@ -5,13 +5,13 @@ collect do
       key, value = line.chomp.split
       case key
       when "ctxt"
-        Metriks.derive("os.procs.switch").mark(value.to_i)
+        Metriks.derive("os.sched.switch").mark(value.to_i)
       when "processes"
-        Metriks.derive("os.procs.forks").mark(value.to_i)
+        Metriks.derive("os.forks").mark(value.to_i)
       when "procs_running"
-        Metriks.histogram("os.procs.running").update(value.to_i)
+        Metriks.histogram("os.procs:running").update(value.to_i)
       when "procs_blocked"
-        Metriks.histogram("os.procs.blocked").update(value.to_i)
+        Metriks.histogram("os.procs:blocked").update(value.to_i)
       end
     end
   end

data/lib/ganymed/version.rb

@@ -1,4 +1,4 @@
 module Ganymed
   # @private
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ganymed
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4422318891659599055
+      hash: 841601178190202909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4422318891659599055
+      hash: 841601178190202909
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24