diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ohai.rb | 2 | ||||
| -rw-r--r-- | lib/ohai/plugins/darwin/filesystem.rb | 55 | ||||
| -rw-r--r-- | lib/ohai/plugins/freebsd/filesystem.rb | 16 | ||||
| -rw-r--r-- | lib/ohai/plugins/linux/filesystem.rb | 20 |
4 files changed, 74 insertions, 19 deletions
diff --git a/lib/ohai.rb b/lib/ohai.rb index 10417009..d62491b4 100644 --- a/lib/ohai.rb +++ b/lib/ohai.rb @@ -23,5 +23,5 @@ require 'ohai/config' require 'ohai/system' module Ohai - VERSION = '0.1.5' + VERSION = '0.2.1' end diff --git a/lib/ohai/plugins/darwin/filesystem.rb b/lib/ohai/plugins/darwin/filesystem.rb new file mode 100644 index 00000000..6eae138a --- /dev/null +++ b/lib/ohai/plugins/darwin/filesystem.rb @@ -0,0 +1,55 @@ +# +# Author:: Benjamin Black (<bb@opscode.com>) +# Copyright:: Copyright (c) 2009 Opscode, Inc. +# License:: Apache License, Version 2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +fs = Mash.new + +block_size = 0 +popen4("df") do |pid, stdin, stdout, stderr| + stdin.close + stdout.each do |line| + case line + when /^Filesystem\s+(\d+)-/ + block_size = $1.to_i + next + when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/ + filesystem = $1 + fs[filesystem] = Mash.new + fs[filesystem][:block_size] = block_size + fs[filesystem][:kb_size] = $2.to_i / (1024 / block_size) + fs[filesystem][:kb_used] = $3.to_i / (1024 / block_size) + fs[filesystem][:kb_available] = $4.to_i / (1024 / block_size) + fs[filesystem][:percent_used] = $5 + fs[filesystem][:mount] = $6 + end + end +end + +popen4("mount") do |pid, stdin, stdout, stderr| + stdin.close + stdout.each do |line| + if line =~ /^(.+?) on (.+?) \((.+?), (.+?)\)$/ + filesystem = $1 + fs[filesystem] = Mash.new unless fs.has_key?(filesystem) + fs[filesystem][:mount] = $2 + fs[filesystem][:fs_type] = $3 + fs[filesystem][:mount_options] = $4.split(/,\s*/) + end + end +end + +filesystem fs
\ No newline at end of file diff --git a/lib/ohai/plugins/freebsd/filesystem.rb b/lib/ohai/plugins/freebsd/filesystem.rb index 32419757..4207efd1 100644 --- a/lib/ohai/plugins/freebsd/filesystem.rb +++ b/lib/ohai/plugins/freebsd/filesystem.rb @@ -28,11 +28,11 @@ popen4("df") do |pid, stdin, stdout, stderr| when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/ filesystem = $1 fs[filesystem] = Mash.new - fs[filesystem]['kb_size'] = $2 - fs[filesystem]['kb_used'] = $3 - fs[filesystem]['kb_available'] = $4 - fs[filesystem]['percent_used'] = $5 - fs[filesystem]['mount'] = $6 + fs[filesystem][:kb_size] = $2 + fs[filesystem][:kb_used] = $3 + fs[filesystem][:kb_available] = $4 + fs[filesystem][:percent_used] = $5 + fs[filesystem][:mount] = $6 end end end @@ -44,9 +44,9 @@ popen4("mount -l") do |pid, stdin, stdout, stderr| if line =~ /^(.+?) on (.+?) \((.+?), (.+?)\)$/ filesystem = $1 fs[filesystem] = Mash.new unless fs.has_key?(filesystem) - fs[filesystem]['mount'] = $2 - fs[filesystem]['fs_type'] = $3 - fs[filesystem]['mount-options'] = $4.split(/,\s*/) + fs[filesystem][:mount] = $2 + fs[filesystem][:fs_type] = $3 + fs[filesystem][:mount_options] = $4.split(/,\s*/) end end end diff --git a/lib/ohai/plugins/linux/filesystem.rb b/lib/ohai/plugins/linux/filesystem.rb index b5418251..1fd5a152 100644 --- a/lib/ohai/plugins/linux/filesystem.rb +++ b/lib/ohai/plugins/linux/filesystem.rb @@ -19,7 +19,7 @@ fs = Mash.new # Grab filesystem data from df -popen4("/bin/df -P") do |pid, stdin, stdout, stderr| +popen4("df -P") do |pid, stdin, stdout, stderr| stdin.close stdout.each do |line| case line @@ -28,25 +28,25 @@ popen4("/bin/df -P") do |pid, stdin, stdout, stderr| when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/ filesystem = $1 fs[filesystem] = Mash.new - fs[filesystem]['kb_size'] = $2 - fs[filesystem]['kb_used'] = $3 - fs[filesystem]['kb_available'] = $4 - fs[filesystem]['percent_used'] = $5 - fs[filesystem]['mount'] = $6 + fs[filesystem][:kb_size] = $2 + fs[filesystem][:kb_used] = $3 + fs[filesystem][:kb_available] = $4 + fs[filesystem][:percent_used] = $5 + fs[filesystem][:mount] = $6 end end end # Grab mount information from /bin/mount -popen4("/bin/mount -l") do |pid, stdin, stdout, stderr| +popen4("mount -l") do |pid, stdin, stdout, stderr| stdin.close stdout.each do |line| if line =~ /^(.+?) on (.+?) type (.+?) \((.+?)\)$/ filesystem = $1 fs[filesystem] = Mash.new unless fs.has_key?(filesystem) - fs[filesystem]['mount'] = $2 - fs[filesystem]['fs_type'] = $3 - fs[filesystem]['mount-options'] = $4.split(",") + fs[filesystem][:mount] = $2 + fs[filesystem][:fs_type] = $3 + fs[filesystem][:mount_options] = $4.split(",") end end end |