lib/ohai/plugins/sigar/filesystem.rb in ohai-6.24.2 vs lib/ohai/plugins/sigar/filesystem.rb in ohai-7.0.0.rc.0

- old
+ new

@@ -14,34 +14,37 @@ # 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. # -provides "filesystem" +Ohai.plugin(:Filesystem) do + provides "filesystem" -require "sigar" + collect_data(:hpux, :default) do + require "sigar" + sigar = Sigar.new -fs = Mash.new + fs = Mash.new -sigar = Sigar.new + sigar.file_system_list.each do |fsys| + filesystem = fsys.dev_name + fs[filesystem] = Mash.new + fs[filesystem][:mount] = fsys.dir_name + fs[filesystem][:fs_type] = fsys.sys_type_name + fs[filesystem][:mount_options] = fsys.options + begin + usage = sigar.file_system_usage(fsys.dir_name) + fs[filesystem][:kb_size] = (usage.total / 1024).to_s + fs[filesystem][:kb_used] = ((usage.total - usage.free) / 1024).to_s + fs[filesystem][:kb_available] = (usage.free / 1024).to_s + fs[filesystem][:percent_used] = (usage.use_percent * 100).to_s + '%' + rescue SystemExit => e + raise + rescue Exception => e + #e.g. floppy or cdrom drive + end + end -sigar.file_system_list.each do |fsys| - filesystem = fsys.dev_name - fs[filesystem] = Mash.new - fs[filesystem][:mount] = fsys.dir_name - fs[filesystem][:fs_type] = fsys.sys_type_name - fs[filesystem][:mount_options] = fsys.options - begin - usage = sigar.file_system_usage(fsys.dir_name) - fs[filesystem][:kb_size] = (usage.total / 1024).to_s - fs[filesystem][:kb_used] = ((usage.total - usage.free) / 1024).to_s - fs[filesystem][:kb_available] = (usage.free / 1024).to_s - fs[filesystem][:percent_used] = (usage.use_percent * 100).to_s + '%' - rescue SystemExit => e - raise - rescue Exception => e - #e.g. floppy or cdrom drive + # Set the filesystem data + filesystem fs end end - -# Set the filesystem data -filesystem fs