smartos-manager 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d4d607dfb2d449462a1f839c570233b2055eebf
-  data.tar.gz: 92e92a570db5839078bca8312429df6dd1aa4d79
+  metadata.gz: 0499b9b28184c6d4d3d911c29591da43898219a5
+  data.tar.gz: f1322821f09a0600fc92986c849a65db9029c701
 SHA512:
-  metadata.gz: 32cf2b180e3cab81658df3f99895644d085cc4b0abb2971efac9690a68aeeab494cb116add12b6abf094e7a4b1344148ef99f46c7762457711f966295062c5ed
-  data.tar.gz: ef71c9907c80ee5151bb4b839e20621da612094e36308a91305d28dfc5563de63c07b1d1ef8e0d5e6ba9798694ea1087d02ea08bba817e4a9fa701814bf1bb13
+  metadata.gz: b4de8287fe2a4931b7212397767ce218f3d151642adc3f2734248112f57d5b88c7edbb4bb5da0e30234cf130d0d57395b9059a457c53d86cced1786ad81bcfdd
+  data.tar.gz: 46f9e9a36e913527380c6d4e1bf5c87728a2e0db5b377d97814224da9cdc7baff1e3d7a9c6e2da673f1cf30eb018af3253bbdd4c40794fb9df75280813ceabcd

data/lib/smartos-manager/cli.rb

@@ -8,7 +8,7 @@ class ColorPicker
   
   def initialize
     @colors = {}
-    @available_colors = %w(green yellow red cyan magenta blue)
+    @available_colors = %w(green yellow cyan magenta blue red)
   end
   
   def get(str)
@@ -26,6 +26,7 @@ class AppCLI < Thor
     rev_colors = ColorPicker.new
     
     sysinfos = registry.sysinfo()
+    diags = registry.diag()
     
     user_columns = registry.user_columns.keys.map{|s| humanize(s) }
     
@@ -42,7 +43,8 @@ class AppCLI < Thor
       avail = [1, (mem - vm_memory) - zfs_arc_reserved].max
       
       rev = sysinfos[host][:smartos_version]
-      puts "\n#{host.name} [SmartOS: #{rev.send(rev_colors.get(rev))}] (#{host.address})  (#{vms.size} vms)  (Total RAM: #{mem.human_size(1).green}, ZFS: #{format_size(zfs_arc_current)}G/#{format_size(zfs_arc_reserved)}G, Avail: #{avail.human_size(1).magenta})"
+      puts "\nHardware: #{diags[host][:system_id]}"
+      puts "#{host.name} [SmartOS: #{rev.send(rev_colors.get(rev))}] (#{host.address}) (Total RAM: #{mem.human_size(1).green} [Free Slots: #{diags[host][:free_memory_banks]}], ZFS: #{format_size(zfs_arc_current)}G/#{format_size(zfs_arc_reserved)}G, Avail: #{avail.human_size(1).magenta})"
       vms.each do |vm|
         user_columns = registry.user_columns.values.map{|key| vm[key] }
         p_vm_list(vm.memory.human_size(1), vm.name, vm.type, vm.uuid, printable_state(vm.state), vm.admin_ip, *user_columns)

data/lib/smartos-manager/core.rb

@@ -143,6 +143,25 @@ class HostRegistry
     
   end
   
+  def diag
+    ret = {}
+    
+    run_on_all("prtdiag").each do |host, data|
+      free_memory_banks = 0
+      
+      system_id = data.match(/^System Configuration: (.+)$/)[1]
+      data.scan(/(empty).*DIMM\s+([0-9])/).each do |reg|
+        free_memory_banks+= 1
+      end
+            
+      ret[host] = {
+        system_id: system_id,
+        free_memory_banks: free_memory_banks
+      }
+    end
+    
+    ret
+  end
   
   def sysinfo
     ret = {}

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartos-manager
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: "... ."