instrumental_tools 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deeb3bca1cfaecc407a6fed2dd89a65a28d56ab1
-  data.tar.gz: 323ef81462e8919bfc9ffee0868b434da5e209ff
+  metadata.gz: fd1d51988ac3f5044e0f0726cf8055e5dcf74efc
+  data.tar.gz: ed9cd0f582c90e647a1ee7db81f77c664b16324a
 SHA512:
-  metadata.gz: 238ed6bb1d4c9190538c2ba1ff4610860f3ea4a14708e1f681ee4354f6c26037f8704e9dfa8ac7efe04f83d5d9719b0064898b3e99e8220d44bed56f5e1f9cfd
-  data.tar.gz: 7a12fe9e202bb4f8cdae0dc4bbe0099d36c6c292a66fbc06785c17909d4e990b065b8c6db048a253b2c6a469f9c321f4581340288c250d3ef9540fb44a4231bd
+  metadata.gz: 95598f492b489e2ff0869ca2e272e77dc9e147b7f1c714d7b4b456bc3fe8631f5fa9055d9146927e9c3a81b61251b4f8fa84a19a4b03fbe0b66e23a67aea4839
+  data.tar.gz: 0b089d515266b136934ab6bf1cbf29bc40cefb4d58db6a3576d32d1724fae1cbf8b9cf9ca277f57cb14bf1e033c08ced1d0d2da1895916440fea639287de7b0f

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.5.7 [January 31st, 2014]
+* tmpfs tracking actually works now!
+
 ### 0.5.6 [January 31st, 2014]
 * Add tmpfs to disk stats
 

data/bin/instrument_server

@@ -13,6 +13,8 @@ require 'pidly'
 require 'tmpdir'
 require 'optparse'
 require 'socket'
+$: << File.join(File.dirname(__FILE__), "..", "lib")
+require 'instrumental_tools/version'
 
 class SystemInspector
   TYPES = [:gauges, :incrementors]
@@ -134,13 +136,9 @@ class SystemInspector
 
     def self.df
       output = {}
-      `df -ka`.split("\n").grep(%r{^(/dev/|tmpfs)}).each do |line|
+      `df -k`.split("\n").grep(%r{^/dev/}).each do |line|
         device, total, used, available, capacity, mount = line.split(/\s+/)
-        if device == "tmpfs"
-          names = ["tmpfs_#{mount.gsub(/[^[:alnum:]]/, "_")}".gsub(/_+/, "_")]
-        else
-          names = [File.basename(device)]
-        end
+        names = [File.basename(device)]
         names << 'root' if mount == '/'
         names.each do |name|
           output["disk.#{name}.total_mb"] = total.to_f / 1024
@@ -250,9 +248,15 @@ class SystemInspector
 
     def self.disk_storage
       output = {}
-      `df -Pk`.split("\n").grep(%r{^/dev/}).each do |line|
+      `df -Pka`.split("\n").each do |line|
         device, total, used, available, capacity, mount = line.split(/\s+/)
-        names = [File.basename(device)]
+        if device == "tmpfs"
+          names = ["tmpfs_#{mount.gsub(/[^[:alnum:]]/, "_")}".gsub(/_+/, "_")]
+        elsif device =~ %r{/dev/}
+          names = [File.basename(device)]
+        else
+          next
+        end
         names << 'root' if mount == '/'
         names.each do |name|
           output["disk.#{name}.total_mb"] = total.to_f / 1024
@@ -353,6 +357,7 @@ class ServerController < Pidly::Control
 
   def self.run(options)
     agent = Instrumental::Agent.new(options[:api_key], :collector => [options[:collector], options[:port]].compact.join(':'))
+    puts "insrument_server version #{Instrumental::Tools::VERSION} started at #{Time.now.utc}"
     puts "Collecting stats under the hostname: #{options[:hostname]}"
     loop do
       t = Time.now.to_i

data/lib/instrumental_tools/version.rb

@@ -1,5 +1,5 @@
 module Instrumental
   module Tools
-    VERSION = '0.5.6'
+    VERSION = '0.5.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_tools
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Elijah Miller