genesis_collector 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21ead25ac6cc319b247aa53a88abb0ec04b6fc39
-  data.tar.gz: d251b0cb394a62bede230d5b3fac74e3e7affbf2
+  metadata.gz: c2bb30d9515a361f4aec90dd5c6bf0d465922f27
+  data.tar.gz: d584beab5eb80665a21ef0dc3a320344f2ec10ed
 SHA512:
-  metadata.gz: b8ed744245ce82df96027047c968074f2f55307a8c5705431e467e40ad897c9b3b04cc7ff00f6584ce164b08b96254e9b945996961b6057baba7bceb19f1e286
-  data.tar.gz: 8c1523c068654eaef0d0ed4c485974df0bf7a390b90b7854ecc478ccb1e610abf632b858563d2d5ff99ff0b64f0054bc5999a37e1e7d108a951dc1334e262a84
+  metadata.gz: cb836871b98784841ae912473bf2c42ebc650281609f216ecfa7250bb33cd2956f566951b990d6b2c91db443119ec13ab701c506f7e6e92921f776b02065d363
+  data.tar.gz: 1beeabf418033ed3b671d4d2656f2a42a0ebe7a95fd8f171f7998dca7707642092a55934ea60563fbd6d661be39d109c63556a55d28db934b249edcaf6b74381

data/lib/genesis_collector/collector.rb

@@ -68,6 +68,13 @@ module GenesisCollector
           'CHASSIS_SERIAL_NUMBER' => read_dmi('chassis-serial-number')
         }
       }
+      if read_dmi('system-serial-number') == nil
+        @payload[:product] = read_ipmi_fru('Product Part Number')
+        @payload[:properties]['SYSTEM_SERIAL_NUMBER'] = read_ipmi_fru('Product Serial')
+        @payload[:properties]['BASEBOARD_PRODUCT_NAME'] = read_ipmi_fru('Board Part Number')
+        @payload[:properties]['BASEBOARD_SERIAL_NUMBER'] = read_ipmi_fru('Board Serial')
+        @payload[:properties]['CHASSIS_SERIAL_NUMBER'] = read_ipmi_fru('Chassis Serial')
+      end
     end
 
     def collect_cpus
@@ -138,11 +145,9 @@ module GenesisCollector
       serial = nil
       vendor ||= read_dmi 'baseboard-manufacturer'
       serial ||= read_dmi 'baseboard-serial-number'
-      serial = nil if serial == '0123456789'
 
       vendor ||= read_dmi 'system-manufacturer'
       serial ||= read_dmi 'system-serial-number'
-      serial = nil if serial == '0123456789'
 
       serial ||= read_ipmi_fru('Board Serial')
 
@@ -159,7 +164,8 @@ module GenesisCollector
     end
 
     def read_dmi(key)
-      value = shellout_with_timeout("dmidecode -s #{key}").gsub(/^#.+$/, '').gsub(/\s+|\./, '')
+      value = shellout_with_timeout("dmidecode -s #{key}").gsub(/^#.+$/, '').strip
+      value = '' if '0123456789' == value # sometimes the firmware is broken
       value.empty? ? nil : value
     end
   end

data/lib/genesis_collector/ipmi.rb

@@ -18,8 +18,8 @@ module GenesisCollector
     end
 
     def read_ipmi_fru(key)
-      data = shellout_with_timeout('ipmitool fru')
-      data.match(/#{key}\s*:\s*(\S+)$/)[1] || 'unknown'
+      @ipmi_fru_output ||= shellout_with_timeout('ipmitool fru')
+      @ipmi_fru_output.match(/#{key}\s*:\s*(\S+)$/)[1] || 'unknown'
     end
 
   end

data/lib/genesis_collector/version.rb

@@ -1,3 +1,3 @@
 module GenesisCollector
-  VERSION = '0.1.17'
+  VERSION = '0.1.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genesis_collector
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - David Radcliffe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler