onering-report-plugins 0.0.25 → 0.0.26

data/lib/facter/onering_disk_smart.rb

@@ -0,0 +1,38 @@
+if Facter::Util::Resolution.which('smartctl')
+  disks = []
+  letters = (('a'..'z').to_a + ('a'..'z').to_a.collect{|i| ('a'..'z').to_a.collect{|j| i+j }}.flatten)
+
+  letters.each do |i|
+    if File.exists?("/dev/sd#{i}")
+      smart = {}
+
+      Facter::Util::Resolution.exec("smartctl -A /dev/sd#{i}").to_s.lines.each do |line|
+        next unless line =~ /^\s*[0-9]+/
+        id, name, flag, value, worst, threshold, type, updated, failed, raw = line.strip.chomp.split(/\s+/)
+
+        smart[:attributes] ||= []
+        smart[:attributes] << {
+          :id        => id.to_i,
+          :name      => name.downcase.gsub(/[\s\-]+/, '_'),
+          :value     => value.to_i,
+          :worst     => worst.to_i,
+          :threshold => threshold.to_i,
+          :type      => type.downcase,
+          :raw       => raw
+        }
+      end
+
+      smart[:name] = "/dev/sd#{i}"
+      
+      disks << smart
+    end
+  end
+
+  disks = disks.reject{|i| (i[:attributes] || {}).empty? }
+ 
+  unless disks.empty?
+    Facter.add('smart') do
+      setcode { disks }
+    end
+  end
+end

data/lib/reporter/default/stats_disk.rb

@@ -108,10 +108,14 @@ report do
   end
 
 
-  stat :disk, {
-    :mounts => (Hash[mounts.select{|k,v| k =~ /^\/dev\/((h|s|xv|v)d|mapper|vgc)/ }].values rescue nil),
-    :lvm    => {
-      :groups => vg.values
-    }
-  }
-end
+  d = {}
+
+  d[:mounts] = (Hash[mounts.select{|k,v| k =~ /^\/dev\/((h|s|xv|v)d|mapper|vgc)/ }].values rescue nil)
+  d[:lvm] = {
+    :groups => vg.values
+  } unless vg.values.empty?
+
+  d[:smart] = Facter.value('smart')
+
+  stat :disk, d.compact
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-report-plugins
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onering-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7524020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,12 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *7524020
 description: Base plugins for providing system information via the Onering client
   utility
 email: ghetzel@outbrain.com
@@ -34,29 +29,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/reporter/default/properties_facter.rb
-- lib/reporter/default/stats_virident.rb
-- lib/reporter/default/stats_disk.rb
-- lib/reporter/default/properties_xen.rb
-- lib/reporter/default/properties_openvz.rb
-- lib/reporter/default/properties_network.rb
-- lib/reporter/default/properties_physical.rb
-- lib/reporter/default/properties_ohai.rb
-- lib/reporter/default/stats_zfs.rb
-- lib/reporter/default/stats_base.rb
-- lib/reporter/default/properties_services.rb
-- lib/reporter/default/properties_chef.rb
 - lib/facter/onering_properties_openvz.rb
+- lib/facter/onering_properties_network.rb
+- lib/facter/onering_properties_virident.rb
+- lib/facter/onering_properties_services.rb
 - lib/facter/onering_properties_chef.rb
 - lib/facter/onering_properties_physical.rb
-- lib/facter/onering_properties_xen.rb
-- lib/facter/onering_properties_services.rb
-- lib/facter/onering_properties_virident.rb
-- lib/facter/onering_properties_zfs.rb
-- lib/facter/onering_properties_network.rb
 - lib/facter/onering_properties_system.rb
 - lib/facter/onering_properties_id.rb
+- lib/facter/onering_disk_smart.rb
+- lib/facter/onering_properties_zfs.rb
+- lib/facter/onering_properties_xen.rb
 - lib/etc/facter.list
+- lib/reporter/default/properties_physical.rb
+- lib/reporter/default/properties_facter.rb
+- lib/reporter/default/stats_disk.rb
+- lib/reporter/default/stats_zfs.rb
+- lib/reporter/default/properties_openvz.rb
+- lib/reporter/default/properties_xen.rb
+- lib/reporter/default/properties_chef.rb
+- lib/reporter/default/stats_virident.rb
+- lib/reporter/default/properties_ohai.rb
+- lib/reporter/default/properties_network.rb
+- lib/reporter/default/properties_services.rb
+- lib/reporter/default/stats_base.rb
 homepage: https://github.com/outbrain/onering-report-plugins
 licenses: []
 post_install_message: 
@@ -77,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Onering system reporting plugins