genesis_collector 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ffc8ee73f6ae6d2beac4c5c6f417f32d207a024
-  data.tar.gz: 0e79ae2099fe2f375bedf35dec2234df95c8b6e1
+  metadata.gz: 8b494c48f416ed6e6fa60d4fe2b0961b32b77218
+  data.tar.gz: 84944c09bfba7871176099a323aadf05058215b4
 SHA512:
-  metadata.gz: 7d2193f9169116497316ee6003d53f62adb3fe4e83ac145d08ca7b895f7953794b9587b8ce2502cfd36d409738c16f695f664cbf398d7032c9ffc229a4b19d09
-  data.tar.gz: 8088eaf3bf5db073d62af310df11775894415747fee328283bb1aa0c9daba1f67668415377aad33f846f7126161d4dc6bec25a005d6e9cefd1cb1d018e5ac729
+  metadata.gz: 9e8b72a5a28c6d2256775c626f075f13a3c465fe6e701672b42d7eb1426594d7ae2cf1f7a02fd5c2b3bbd5c898a063de0576545321dbd470b16f908dcc233996
+  data.tar.gz: f751f4b91284aa3d59526a9591befc4afdb1e9a1d1eaf5f912fb5607c6077a38e957b18f42e2ad985b4aa365cd99f15c46e59a5bb178f1c365b895fd6e7a6be6

data/lib/chef/handler/genesis.rb

@@ -14,19 +14,15 @@ class Chef
 
       def initialize(config = {})
         @config = Mash.new(config)
-        if defined?(Bugsnag)
-          Bugsnag.configure do |config|
-            config.api_key = @config.delete('bugsnag_api_key')
-            config.app_version = GenesisCollector::VERSION
-          end
-        end
       end
 
       def report
         if defined?(Bugsnag)
-          Bugsnag.configure do |config|
-            config.release_stage = run_context.node.chef_environment
-          end
+          @bugsnag_config = Bugsnag::Configuration.new
+          @bugsnag_config.api_key = @config.delete('bugsnag_api_key')
+          @bugsnag_config.app_version = GenesisCollector::VERSION
+          @bugsnag_config.project_root = File.expand_path('../../..', File.dirname(__FILE__))
+          @bugsnag_config.release_stage = run_context.node.chef_environment
         end
         prepare_report
         send_report
@@ -38,7 +34,7 @@ class Chef
         @collector = GenesisCollector::Collector.new(@config.merge(chef_node: run_context.node))
         @collector.collect!
       rescue => e
-        Bugsnag.notify(e) if defined?(Bugsnag)
+        Bugsnag::Notification.new(e, @bugsnag_config).deliver if defined?(Bugsnag)
         Chef::Log.error("Error collecting system information for Genesis:\n" + e.message)
         Chef::Log.error(e.backtrace.join("\n"))
       end
@@ -46,7 +42,7 @@ class Chef
       def send_report
         @collector.submit!
       rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
-        Bugsnag.notify(e) if defined?(Bugsnag)
+        Bugsnag::Notification.new(e, @bugsnag_config).deliver if defined?(Bugsnag)
         Chef::Log.error("Could not connect to Genesis. Connection error:\n" + e.message)
         Chef::Log.error(e.backtrace.join("\n"))
       end

data/lib/genesis_collector/collector.rb

@@ -84,7 +84,7 @@ module GenesisCollector
     end
 
     def collect_memories
-      @payload[:memories] = get_dmi_data['memory'].map do |m|
+      @payload[:memories] = get_dmi_data['memory_device'].map do |m|
         empty = m['size'] == 'No Module Installed'
         {
           size: m['size'].to_i * 1000000,

data/lib/genesis_collector/dmidecode.rb

@@ -1,6 +1,52 @@
 module GenesisCollector
   module DmiDecode
 
+    DMI_TYPES = {
+      0 => 'bios',
+      1 => 'system',
+      2 => 'base_board',
+      3 => 'chassis',
+      4 => 'processor',
+      5 => 'memory_controller',
+      6 => 'memory_module',
+      7 => 'cache',
+      8 => 'port_connector',
+      9 => 'system_slots',
+      10 => 'on_board_devices',
+      11 => 'oem_strings',
+      12 => 'system_configuration_options',
+      13 => 'bios_language',
+      14 => 'group_associations',
+      15 => 'system_event_log',
+      16 => 'physical_memory_array',
+      17 => 'memory_device',
+      18 => '32_bit_memory_error',
+      19 => 'memory_array_mapped_address',
+      20 => 'memory_device_mapped_address',
+      21 => 'builtin_pointing_device',
+      22 => 'portable_battery',
+      23 => 'system_reset',
+      24 => 'hardware_security',
+      25 => 'system_power_controls',
+      26 => 'voltage_probe',
+      27 => 'cooling_device',
+      28 => 'temperature_probe',
+      29 => 'electrical_current_probe',
+      30 => 'out_of_band_remote_access',
+      31 => 'boot_integrity_services',
+      32 => 'system_boot',
+      33 => '64_bit_memory_error',
+      34 => 'management_device',
+      35 => 'management_device_component',
+      36 => 'management_device_threshold data',
+      37 => 'memory_channel',
+      38 => 'ipmi_device',
+      39 => 'power_supply',
+      40 => 'additional_information',
+      41 => 'onboard_device',
+      127 => 'end_of_table'
+    }
+
     def get_dmi_data
       @dmi_data ||= parse_dmidecode(shellout_with_timeout('dmidecode --type processor --type memory'))
     end
@@ -14,10 +60,11 @@ module GenesisCollector
         case line
         when /^End Of Table/, /^\s+$/, /^\# dmidecode/, /^SMBIOS/, /structures occupying/, /^Table at/
           next
-        when /^Handle\s+(.*?),\s+/
+        when /^Handle\s+(.*?), DMI type (.*?),\s+/
           handle = $1.to_i(16)
-        when /(.*)\s+Information\n$/, /(.*)\s+Device\n$/, /(.*)\s+Device Mapped Address\n$/, /(.*)\s+Array Mapped Address\n$/
-          title = standardize_dmi_key($1)
+          type_id = $2.to_i
+          title = DMI_TYPES[type_id]
+          next if title == 'end_of_table'
           current_title = title
           dict[title] ||= []
           dict[title] << {'handle' => handle}

data/lib/genesis_collector/version.rb

@@ -1,3 +1,3 @@
 module GenesisCollector
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genesis_collector
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - David Radcliffe