panoptimon 0.3.0 → 0.4.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.0
+
+* collectors/disk - remove sys-filesystem dependency
+
 # 0.3.0
 
 * plugins/graphite/ - added

data/collectors/disk/disk

@@ -2,7 +2,7 @@
 
 require 'json'
 require 'rubygems'
-require 'sys/filesystem'
+require 'ostruct'
 
 config = JSON::parse(ARGV[0])
 
@@ -10,26 +10,41 @@ $stdout.sync = true
 
 def GB b; (b.to_f / 1024**3).round(6); end # GB significant down to 4kB
 
+def get_mounts
+  mount_hash = {}
+  mounts = File.open("/etc/mtab", "r").read.split("\n").map{|l| l.split(/\s+/)}
+  mounts.each{|m| mount_hash[m[1]] = m[0] unless %w[devpts udev sysfs tmpfs none proc].include?(m[0])}
+  mount_hash
+end
+
+def stat_fs (mounts)
+  s = %x[stat --printf="%n %s %b %f %a %c %d\n" -f #{mounts.keys.join(' ')}].split("\n")
+  s.map!{|l| l.split}
+  s.map{|l|
+    OpenStruct.new(
+      name: mounts[l[0]],
+      block_size: l[1].to_i,
+      blocks: l[2].to_i,
+      blocks_free: l[3].to_i,
+      blocks_available: l[4].to_i,
+      files: l[5].to_i,
+      files_available: l[6].to_i
+    ).freeze
+  }
+end
+
 while(true) do
-  info =
-    Sys::Filesystem.mounts.
-    # map {|m| $stderr.puts m.name; m}.
-    find_all{|m| not(m.name =~ /^(devpts|udev|sysfs|tmpfs|none|proc)$/)}.
-    map {|m|
-      s = Sys::Filesystem.stat(m.mount_point)
-      # $stderr.puts "#{m.name} - #{s.inspect}"
-      [m.name, {
-        # block_size: s.block_size,
-        # blocks: s.blocks,
-        # blocks_available: s.blocks_available,
-        space_used: GB((s.blocks - s.blocks_free) * s.block_size),
-        space_free: GB(s.blocks_available         * s.block_size),
-        space_priv: GB((s.blocks_free - s.blocks_available) * s.block_size),
-        files_used: s.files - s.files_available,
-        files_free: s.files_available,
-        # files_priv: s.files_free - s.files_available, # XXX any use?
-      }]
-    }
+  mounts = get_mounts
+  stats = stat_fs(mounts)
+  info = stats.map{ |s|
+    [s.name, {
+      space_used: GB((s.blocks - s.blocks_free) * s.block_size),
+      space_free: GB(s.blocks_available         * s.block_size),
+      space_priv: GB((s.blocks_free - s.blocks_available) * s.block_size),
+      files_used: s.files - s.files_available,
+      files_free: s.files_available,
+    }]
+  }
   puts JSON::generate(Hash[*info.flatten])
 
   break unless config.include?('interval')

data/lib/panoptimon/version.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2012 Sourcefire, Inc.
 
 module Panoptimon
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/panoptimon.gemspec

@@ -26,7 +26,4 @@ Gem::Specification.new do |gem|
 
   # Plugin gem dependencies
   gem.add_dependency 'riemann-client'
-
-  # Collector gem dependencies
-  gem.add_dependency 'sys-filesystem'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panoptimon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &11208660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,32 +21,47 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11208660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &11208180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11208180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &11207580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11207580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &11206900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,29 +69,28 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *11206900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: riemann-client
-  requirement: &11206020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11206020
-- !ruby/object:Gem::Dependency
-  name: sys-filesystem
-  requirement: &11205560 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *11205560
 description: The All-Seeing System Monitor Daemon
 email: sysops@sourcefire.com
 executables:
@@ -95,7 +109,6 @@ files:
 - collectors/cpu/cpu.json
 - collectors/disk/disk
 - collectors/disk/disk.json
-- collectors/disk/requires
 - collectors/disk_free/disk_free
 - collectors/disk_free/disk_free.json
 - collectors/dns/README.md
@@ -269,18 +282,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Panoptimon collects and routes system metrics.
@@ -291,3 +304,4 @@ test_files:
 - spec/collector/metric_spec.rb
 - spec/passthru_spec.rb
 - spec/util_spec.rb
+has_rdoc: 

data/collectors/disk/requires

@@ -1 +0,0 @@
-gem/sys-filesystem