genesis_collector 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 786f6dd29cd14a5639c1e4eec5fe7982080437b9
-  data.tar.gz: 8190331cde2e80f19bf1a28441fa9ae7f7bc341c
+  metadata.gz: d084e72924bc0a833ce5989ecae28f9df02c7830
+  data.tar.gz: 9ca1ba65742ee1eed751f897ebfc53ee7047de7f
 SHA512:
-  metadata.gz: 149431d6981a13bae50971fd274e232769cbcfc2576a7cf3aab5a3b711624490086c4d2f99432177b952ff4e84aaa2efd8cce0e798ff9d668182ec15b3f5d661
-  data.tar.gz: 79a1611e350c4922e583e99b133e0a0151403be9a70c321c3617399a6d6c8f22be53badf0dc8801cf827b35a636aef1f5b5f74929b058a75d95f7c5bb085cbf2
+  metadata.gz: 86c46b8a7393642168b512564507dd5faee75970eddd57b1ed7dbf53e8d87dd153e76e56c1c422c49176ead47070becdea4905430f62e3b71407f1617637ee85
+  data.tar.gz: fe467b952c545511b34b32a1c8fe6fc9851ea8ccb01046e1c97d6b391df6c106bf70f464de9d402f120ad0bf8569d8ee94ac73255397cf48f39467be0fa93015

data/lib/genesis_collector/collector.rb

@@ -195,7 +195,7 @@ module GenesisCollector
     end
 
     def read_dmi(key)
-      value = shellout_with_timeout("dmidecode -s #{key}").gsub(/^#.+$/, '').strip
+      value = shellout_with_timeout("dmidecode -s #{key}").gsub(/^#.+$/, '').gsub(/^Invalid entry length.*$/,'').strip
       value = '' if '0123456789' == value # sometimes the firmware is broken
       value.empty? ? nil : value
     end

data/lib/genesis_collector/ipmi.rb

@@ -3,23 +3,27 @@ module GenesisCollector
 
     def collect_ipmi
       @payload[:ipmi] = {
-        address: read_ipmi_attribute('IP Address'),
-        netmask: read_ipmi_attribute('Subnet Mask'),
-        mac: read_ipmi_attribute('MAC Address'),
-        gateway: read_ipmi_attribute('Default Gateway IP')
+        address: read_ipmi_lan_attribute('IP Address'),
+        netmask: read_ipmi_lan_attribute('Subnet Mask'),
+        mac: read_ipmi_lan_attribute('MAC Address'),
+        gateway: read_ipmi_lan_attribute('Default Gateway IP')
       }
     end
 
     private
 
-    def read_ipmi_attribute(key)
+    def read_ipmi_lan_attribute(key)
       @ipmi_lan_output ||= shellout_with_timeout('ipmitool lan print', 10)
-      @ipmi_lan_output.match(/#{key}\s*:\s*(\S+)$/)[1] || 'unknown'
+      match = @ipmi_lan_output.match(/#{key}\s*:\s*(\S+)$/)
+      raise "IPMI lan print output missing key: #{key}" if match.nil?
+      match[1]
     end
 
     def read_ipmi_fru(key)
       @ipmi_fru_output ||= shellout_with_timeout('ipmitool fru')
-      @ipmi_fru_output.match(/#{key}\s*:\s*(\S+)$/)[1] || 'unknown'
+      match = @ipmi_fru_output.match(/#{key}\s*:\s*(\S+)$/)
+      raise "IPMI fru output missing key: #{key}" if match.nil?
+      match[1]
     end
 
   end

data/lib/genesis_collector/version.rb

@@ -1,3 +1,3 @@
 module GenesisCollector
-  VERSION = '0.1.39'
+  VERSION = '0.1.40'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genesis_collector
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.40
 platform: ruby
 authors:
 - David Radcliffe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler