genesis_collector 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a01bd265984e129de028843fa35ad7fe0a607c32
-  data.tar.gz: 27ac05e727bba69af04dce0ed9d9757aeb492fc3
+  metadata.gz: 056e39e90d51c69d39bc51f8d67299bb4b4bf29e
+  data.tar.gz: 8d4afc75d072cfb204fafc2213c067ec5a8e2b39
 SHA512:
-  metadata.gz: 51bde6dc82474cc8fff9e2afdab7f97268736f8cb60f9aa17d87a90b8e1bff7fec6e987626065009f42901868e36520a1b7aa85a57b3f7766ad812d509a474cf
-  data.tar.gz: ff410708d63d2e7306593878625ad4c1b3c6735e2ff6e437734babbeda2003a7a9a2bbc3de69a94b7d927516e7e0ba55f12a884595684042ecac2df397a1f3cc
+  metadata.gz: 23ae494808a76d61a3edb4fbe6c9d48344d8677ce07719d9bee8549600b3b80fb380f35272c50e7e5922a3ca8fd647d7076fd2390141d3583603dd6ba22d6331
+  data.tar.gz: 20fab1f17879ac8dd4f28c33d31e8b40613fb0d7e40fb3a202b6d529970bd7ff2ddc293bf54917c49f02090e4e4fc0d88d42678bc92e0fd6ae8cbe2354579b3d

data/exe/genesis_collector

@@ -3,8 +3,39 @@
 require 'bundler/setup'
 require 'genesis_collector'
 require 'pp'
+require 'optparse'
+require 'json'
 
-collector = GenesisCollector::Collector.new
+options = {
+  submit: false
+}
+config = {}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: genesis_collector [options]"
+  opts.on('--submit', 'Submit data to Genesis server') do
+    options[:submit] = true
+  end
+  opts.on_tail('-h', '--help', 'Show this message') do
+    puts opts
+    exit
+  end
+  opts.on_tail('--version', 'Show version') do
+    puts "geensis_collector #{GenesisCollector::VERSION}"
+    exit
+  end
+end.parse!
+
+if true == options[:submit]
+  raise ArgumentError, 'Missing config file: ~/.genesis' unless File.exist?("#{ENV['HOME']}/.genesis")
+  raw_config = JSON.parse(File.read("#{ENV['HOME']}/.genesis"))
+  config[:endpoint] = config['endpoint']
+  config[:api_token] = config['api_token']
+end
+
+collector = GenesisCollector::Collector.new(config)
 collector.collect!
 
 pp collector.payload
+
+collector.submit! if true == options[:submit]

data/lib/genesis_collector/collector.rb

@@ -159,7 +159,7 @@ module GenesisCollector
     end
 
     def read_dmi(key)
-      value = shellout_with_timeout("dmidecode -s #{key}").gsub(/\s+|\./, '')
+      value = shellout_with_timeout("dmidecode -s #{key}").gsub(/^#.+$/, '').gsub(/\s+|\./, '')
       value.empty? ? nil : value
     end
   end

data/lib/genesis_collector/disks.rb

@@ -10,6 +10,7 @@ module GenesisCollector
         d[:product] = info.match(/^(?:Device Model|Product):\s+(.*)$/)[1]
         d[:serial_number] = info.match(/^Serial (?:n|N)umber:\s+(.*)$/)[1]
         d[:size] = info.match(/^User Capacity:\s+(.*)$/)[1].split('bytes')[0].strip.gsub(',', '')
+        d[:slot] = get_scsi_slot(d[:dev]) if d[:dev] =~ /^\/dev\/sd/
       end
     end
 
@@ -31,5 +32,9 @@ module GenesisCollector
       shellout_with_timeout("smartctl -i #{cmd_params}", 5)
     end
 
+    # FIXME - we might want to handle raid devices differently by parsing megacli
+    def get_scsi_slot(device)
+      File.basename(File.readlink("/sys/class/block/#{File.basename(device)}/device"))
+    end
   end
 end

data/lib/genesis_collector/version.rb

@@ -1,3 +1,3 @@
 module GenesisCollector
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

metadata

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