onering-report-plugins 0.0.17 → 0.0.18

data/lib/etc/facter.list

@@ -0,0 +1,16 @@
+serialnumber:serial
+manufacturer:make
+productname:model
+boardmanufacturer:mbmake
+boardproductname:mbmodel
+boardserialnumber:mbserial
+fqdn
+ipaddress:ip
+default_macaddress:mac
+default_gateway:gateway
+kernelrelease:kernel
+architecture:arch
+operatingsystem:distro
+operatingsystemrelease:version
+signature
+boottime:booted_at

data/lib/reporter/default/properties_facter.rb

@@ -15,25 +15,32 @@ report do
 
   if defined?(Facter)
   # get a list of Facter attributes to list
-    if File.exists?("/etc/onering/facter.list")
-      IO.readlines("/etc/onering/facter.list").each do |line|
-      # strip whitespace/kill newline
-        line.strip!
-        line.chomp!
-        next if line.empty?
-        line = line.downcase
+    local_list = File.join(File.dirname(File.dirname(File.dirname(__FILE__))),'etc','facter.list')
 
-        unless line =~ /^#/
-          begin
-            line = line.split(':')
-            key = (line.length == 1 ? line.first : line.last)
-            val = cleanup_dirty_values(key, Facter.value(line.first))
+    facts = [
+      local_list,
+      "/etc/onering/facter.list"
+    ].collect{|file|
+      IO.readlines(file) if File.exists?(file)
+    }.flatten.compact.sort.uniq
 
-            property key.to_sym, val
-          rescue Exception
-            STDERR.puts e.message
-            next
-          end
+    facts.each do |line|
+    # strip whitespace/kill newline
+      line.strip!
+      line.chomp!
+      next if line.empty?
+      line = line.downcase
+
+      unless line =~ /^#/
+        begin
+          line = line.split(':')
+          key = (line.length == 1 ? line.first : line.last)
+          val = cleanup_dirty_values(key, Facter.value(line.first))
+
+          property key.to_sym, val
+        rescue Exception
+          STDERR.puts e.message
+          next
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-report-plugins
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   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: &4626420 !ruby/object:Gem::Requirement
+  requirement: &20451760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4626420
+  version_requirements: *20451760
 description: Base plugins for providing system information via the Onering client
   utility
 email: ghetzel@outbrain.com
@@ -39,6 +39,7 @@ files:
 - lib/facter/onering_properties_id.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