v0.5.1 - disk-portability

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.5.1
+
+* collectors/disk - solaris portability
+
 # 0.5.0
 
 * collector.rb - make panoptimon available in $RUBYLIB

collectors/disk/disk

@@ -1,24 +1,44 @@
 #!/usr/bin/env ruby
+# Copyright (C) 2012-2014 Cisco, Inc.
 
 require 'json'
-require 'rubygems'
 require 'ostruct'
 
+require 'panoptimon/util'
+
 config = ARGV[0] ? JSON::parse(ARGV[0]) : {'interval' => 60}
 
 $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
+class Array; def to_h; Hash[self]; end; end
+
+get_mounts = ->() {
+  skip = %w[devpts udev sysfs tmpfs none proc cgroup swap lxproc objfs ctfs lofs
+    ].map {|t| [t,true]}.to_h
+  Panoptimon::Util.os(
+    linux: ->() {
+      ->() {
+        mounts = File.open("/etc/mtab", "r").read.split("\n").
+          map{|l| x = l.split(/\s+/); [x[1], x[0]]}.to_h.
+          keep_if {|k,v| not(skip[v])}
+      }
+    },
+    solaris: ->() {
+      ->() {
+        mounts = File.open("/etc/mnttab", "r").read.split("\n").
+          map{|l| x = l.split(/\s+/); [x[1], x[0], x[2]]}.
+          keep_if {|p| not(skip[p[1]]) and not(skip[p[2]])}.
+          map {|p| [p[0], p[1]]}.to_h
+      }
+    },
+  )
+
+}[]
 
 def stat_fs (mounts)
-  s = %x[stat --printf="%n %s %b %f %a %c %d\n" -f #{mounts.keys.join(' ')}].split("\n")
+  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(
@@ -34,7 +54,7 @@ def stat_fs (mounts)
 end
 
 while(true) do
-  mounts = get_mounts
+  mounts = get_mounts[]
   stats = stat_fs(mounts).select{|m| m.blocks > 0}
   info = stats.map{ |s|
     [s.name, {

lib/panoptimon/version.rb

@@ -1,5 +1,5 @@
-# Copyright (C) 2012-2013 Sourcefire, Inc.
+# Copyright (C) 2012-2014 Cisco, Inc.
 
 module Panoptimon
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end