onering-report-plugins 0.0.54 → 0.0.55

data/lib/reporter/default/properties_facter.rb

@@ -38,8 +38,8 @@ report do
           val = cleanup_dirty_values(key, Facter.value(line.first))
 
           property key.to_sym, val
-        rescue Exception
-          STDERR.puts e.message
+        rescue Exception => e
+          Onering::Logger.debug(e.message, "onering-report-plugins/properties_facter/#{e.class.name}")
           next
         end
       end

data/lib/reporter/default/properties_ipmi.rb

@@ -0,0 +1,10 @@
+# Onering Collector - IPMI plugin
+#   provides collection of IPMI data using vendor tools
+#
+
+report do
+  property :ipmi_ip,         Facter.value('ipmi_ip')
+  property :ipmi_netmask,    Facter.value('ipmi_netmask')
+  property :ipmi_gateway,    Facter.value('ipmi_gateway')
+  property :ipmi_macaddress, Facter.value('ipmi_macaddress')
+end

data/lib/reporter/default/properties_physical.rb

@@ -7,8 +7,4 @@ report do
   property :environment,     Facter.value('environment')
   property :slot,            Facter.value('slot')
   property :virtual,         (Facter.value('is_virtual').to_s == 'true' ? true : false)
-  property :ipmi_ip,         Facter.value('ipmi_ip')
-  property :ipmi_netmask,    Facter.value('ipmi_netmask')
-  property :ipmi_gateway,    Facter.value('ipmi_gateway')
-  property :ipmi_macaddress, Facter.value('ipmi_macaddress')
 end

data/lib/reporter/default/properties_system_cpu.rb

@@ -0,0 +1,30 @@
+report do
+# ------------------------------------------------------------------------------
+# cpu
+#
+  stats_cpu = {
+    :count => 0,
+    :processors => []
+  }
+
+  current_cpu = nil
+
+  File.open("/proc/cpuinfo").each do |line|
+    case line
+    when /processor\s+:\s(.+)/
+      current_cpu = $1.to_i
+      stats_cpu[:count] += 1
+      stats_cpu[:processors][current_cpu] = {
+        :number => current_cpu
+      }
+    when /cpu MHz\s+:\s(.+)/
+      stats_cpu[:processors][current_cpu][:speed] = $1.to_f
+    end
+  end
+
+  stat :cpu, ({
+    'count'    => Facter.value('processorcount').to_i,
+    'physical' => Facter.value('physicalprocessorcount').to_i,
+    'speed'    => stats_cpu[:processors].collect{|i| i[:speed] }.compact.uniq.sort{|a,b| a.to_f <=> b.to_f }.last.to_f
+  } rescue nil)
+end

data/lib/reporter/default/properties_system_disk_block.rb

@@ -0,0 +1,35 @@
+report do
+# ------------------------------------------------------------------------------
+# block devices
+#
+  blocks = []
+
+  Facter.value('blockdevices').split(/\W+/).each do |dev|
+
+    block = {
+      :name   => dev,
+      :device => (File.exists?("/dev/#{dev}") ? "/dev/#{dev}" : nil),
+      :vendor => Facter.value("blockdevice_#{dev}_vendor"),
+      :model  => Facter.value("blockdevice_#{dev}_model"),
+      :size   => (Integer(Facter.value("blockdevice_#{dev}_size")) rescue nil)
+    }
+
+    if File.directory?("/sys/block/#{dev}")
+      block[:removable]  = (File.read("/sys/block/#{dev}/removable").to_s.chomp.strip == '1' rescue nil)
+      block[:readonly]   = (File.read("/sys/block/#{dev}/ro").to_s.chomp.strip == '1' rescue nil)
+      block[:solidstate] = (File.read("/sys/block/#{dev}/queue/rotational").to_s.chomp.strip == '0' rescue nil)
+      block[:sectorsize] = {}
+
+      %w{
+        logical
+        physical
+      }.each do |s|
+        block[:sectorsize][s.to_sym] = (Integer(File.read("/sys/block/#{dev}/queue/#{s}_block_size").chomp.strip) rescue nil)
+      end
+    end
+
+    blocks << block.compact
+  end
+
+  stat 'disk.@block', blocks unless blocks.empty?
+end

data/lib/reporter/default/{stats_disk.rb → properties_system_disk_lvm.rb}

@@ -1,52 +1,4 @@
-# Onering Collector - Disk Statistics plugin
-#   provides data on disks, mounts, and RAID configuration
-#
-
 report do
-# ------------------------------------------------------------------------------
-# mounts
-#
-  mounts = {}
-  current_dev = nil
-
-  uuids = Hash[Dir["/dev/disk/by-uuid/*"].collect{|i|
-    [File.expand_path(File.readlink(i), File.dirname(i)), File.basename(i)]
-  }]
-
-  File.read("/etc/mtab").lines.each do |line|
-    dev,mount,fstype,flags,dump,pass = line.split(/\s+/)
-
-    mounts[dev] = {
-      :mount      => mount,
-      :device     => dev,
-      :filesystem => fstype,
-      :flags      => flags.split(/\s*,\s*/),
-      :uuid       => uuids[dev]
-    }.compact
-  end
-
-# logical space utilization
-  Facter::Util::Resolution.exec("df 2> /dev/null").to_s.lines.each do |line|
-    next if line =~ /^Filesystem/
-    parts = line.split(/\s+/)
-
-    if parts.length == 1
-      current_dev = parts.first
-      next
-
-    else
-      dev,kblk,used,free,percent,mount = parts
-      dev = current_dev if dev.empty?
-      next unless mounts[dev] and mounts[dev].is_a?(Hash)
-
-      mounts[dev][:used] = (used.to_i * 1024)
-      mounts[dev][:available] = (free.to_i * 1024)
-      mounts[dev][:total] = (mounts[dev][:available] + mounts[dev][:used])
-      mounts[dev][:percent_used] = percent.delete('%').to_i
-    end
-  end
-
-
 # ------------------------------------------------------------------------------
 # LVM
 #
@@ -112,15 +64,10 @@ report do
     end
   end
 
-
-  d = {}
-
-  d[:@mounts] = (Hash[mounts.select{|k,v| k =~ /^\/dev\/((h|s|xv|v)d|mapper|vgc)/ }].values rescue nil)
-  d[:lvm] = {
+  lvm = {}
+  lvm = {
     :@groups => vg.values
   } unless vg.values.empty?
 
-  d[:@smart] = Facter.value('smart')
-
-  stat :disk, d.compact
-end
+  stat 'disk.@lvm', lvm unless lvm.empty?
+end

data/lib/reporter/default/properties_system_disk_mounts.rb

@@ -0,0 +1,46 @@
+report do
+# ------------------------------------------------------------------------------
+# mounts
+#
+  mounts = {}
+  current_dev = nil
+
+  uuids = Hash[Dir["/dev/disk/by-uuid/*"].collect{|i|
+    [File.expand_path(File.readlink(i), File.dirname(i)), File.basename(i)]
+  }]
+
+  File.read("/etc/mtab").lines.each do |line|
+    dev,mount,fstype,flags,dump,pass = line.split(/\s+/)
+
+    mounts[dev] = {
+      :mount      => mount,
+      :device     => dev,
+      :filesystem => fstype,
+      :flags      => flags.split(/\s*,\s*/),
+      :uuid       => uuids[dev]
+    }.compact
+  end
+
+# logical space utilization
+  Facter::Util::Resolution.exec("df 2> /dev/null").to_s.lines.each do |line|
+    next if line =~ /^Filesystem/
+    parts = line.split(/\s+/)
+
+    if parts.length == 1
+      current_dev = parts.first
+      next
+
+    else
+      dev,kblk,used,free,percent,mount = parts
+      dev = current_dev if dev.empty?
+      next unless mounts[dev] and mounts[dev].is_a?(Hash)
+
+      mounts[dev][:used] = (used.to_i * 1024)
+      mounts[dev][:available] = (free.to_i * 1024)
+      mounts[dev][:total] = (mounts[dev][:available] + mounts[dev][:used])
+      mounts[dev][:percent_used] = percent.delete('%').to_i
+    end
+  end
+
+  stat 'disk.@mounts', (Hash[mounts.select{|k,v| k =~ /^\/dev\/((h|s|xv|v)d|mapper|vgc)/ }].values rescue nil)
+end

data/lib/reporter/default/properties_system_disk_smart.rb

@@ -0,0 +1,3 @@
+report do
+  stat 'disk.@smart', Facter.value('smart')
+end

data/lib/reporter/default/{stats_base.rb → properties_system_memory.rb}

@@ -1,7 +1,3 @@
-# Onering Collector - Base Statistics plugin
-#   provides basic system statistics and hardware profile to the Onering API
-#
-
 report do
 # ------------------------------------------------------------------------------
 # memory
@@ -111,39 +107,5 @@ report do
     end
   end
 
-
-
-# ------------------------------------------------------------------------------
-# cpu
-#
-  stats_cpu = {
-    :count => 0,
-    :processors => []
-  }
-
-  current_cpu = nil
-
-  File.open("/proc/cpuinfo").each do |line|
-    case line
-    when /processor\s+:\s(.+)/
-      current_cpu = $1.to_i
-      stats_cpu[:count] += 1
-      stats_cpu[:processors][current_cpu] = {
-        :number => current_cpu
-      }
-    when /cpu MHz\s+:\s(.+)/
-      stats_cpu[:processors][current_cpu][:speed] = $1.to_f
-    end
-  end
-
-
-# ------------------------------------------------------------------------------
-# set stat properties
-#
   stat :memory, stats_mem
-  stat :cpu, ({
-    'count'    => Facter.value('processorcount').to_i,
-    'physical' => Facter.value('physicalprocessorcount').to_i,
-    'speed'    => stats_cpu[:processors].collect{|i| i[:speed] }.compact.uniq.sort{|a,b| a.to_f <=> b.to_f }.last.to_f
-  } rescue nil)
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-report-plugins
 version: !ruby/object:Gem::Version
-  version: 0.0.54
+  version: 0.0.55
   prerelease: 
 platform: ruby
 authors:
@@ -34,17 +34,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/reporter/default/properties_system_disk_mounts.rb
 - lib/reporter/default/properties_facter.rb
 - lib/reporter/default/stats_virident.rb
-- lib/reporter/default/stats_disk.rb
+- lib/reporter/default/properties_system_cpu.rb
+- lib/reporter/default/properties_system_disk_lvm.rb
 - lib/reporter/default/properties_xen.rb
 - lib/reporter/default/properties_openvz.rb
+- lib/reporter/default/properties_system_disk_block.rb
 - lib/reporter/default/properties_haproxy.rb
+- lib/reporter/default/properties_system_memory.rb
 - lib/reporter/default/properties_network.rb
 - lib/reporter/default/properties_physical.rb
 - lib/reporter/default/properties_ohai.rb
+- lib/reporter/default/properties_system_disk_smart.rb
 - lib/reporter/default/stats_zfs.rb
-- lib/reporter/default/stats_base.rb
+- lib/reporter/default/properties_ipmi.rb
 - lib/reporter/default/properties_services.rb
 - lib/reporter/default/properties_chef.rb
 - lib/facter/onering_properties_openvz.rb