smartos-manager 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01e8ba9e0c00a493b515ae93522b90367e96a9cc
-  data.tar.gz: 572e14a2703148c06e39bc179e1d7f1b4093aca0
+  metadata.gz: b0871eeb3678ada4eb8003cbfad9b58e51a99276
+  data.tar.gz: 9a1468c77e3d5e63a0cf68fa8fcf987092c0e019
 SHA512:
-  metadata.gz: 8fd64816a5860c18c890e204901061995b3c5f9c50a24c7d9d3dd8c5ca22923a51be3d90bded139cdc804407392fa6bf332b1b96b8bfa2dcb47deb919ea39c34
-  data.tar.gz: bde0809b2bcc8103cade34dd786967f46f8c22e28e9aa1881f4419859c0d24018acf491af48ecbce6f6bb4ae196714efc514134b77725433c9baa3d9285c07fa
+  metadata.gz: edffed69085bc2892f0ab771aa3c9f5bdd9e758bef82a03fabf5ecbc0e8deeca572ea260ba5feba770414d78e499735951df775dacb316ed2379aec1b32d3833
+  data.tar.gz: be161467db32d7722ce049a709518855a0e87b92be1d072c2d18001b4d77025f94b0428ce37e28d282b5f79944efb470f3437f91ecd58c7f382b8c6bac580a73

data/lib/smartos-manager/cli.rb

@@ -60,9 +60,12 @@ class AppCLI < Thor
       # avail = (mem - vm_memory) - (20 * mem/100.0)
       avail = [1, (mem - vm_memory) - zfs_arc_current].max
       
+      dd = sysinfos[host][:disks].map{|_, d| "#{format_size(d[:size])} GB" }.join(" - ")
+      
       rev = sysinfos[host][:smartos_version]
-      puts "\nHardware: #{diags[host][:system_id]} (MAC: #{sysinfos[host][:mac0].upcase.white()} )"
-      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})"
+      puts "\nHardware: #{diags[host][:system_id]} (MAC: #{sysinfos[host][:mac0].upcase.white()}, IP: #{host.address.white()} )"
+      puts "HDD: #{sysinfos[host][:disks].keys.size} drives - #{dd}"
+      puts "#{host.name} [SmartOS: #{rev.send(rev_colors.get(rev))}] (Free RAM: #{avail.human_size(1).green}/#{mem.human_size(1)} [Free Slots: #{diags[host][:free_memory_banks]}], ZFS: #{format_size(zfs_arc_current)}G/#{format_size(zfs_arc_reserved)}G)"
       vms.each do |vm|
         user_columns = registry.user_columns.values.map{|key| vm[key] }
         
@@ -104,6 +107,9 @@ class AppCLI < Thor
     
     # (uuid name version os)
     def p_img_list(uuid, name, version, os)
+      name ||= '-'
+      version ||= '-'
+      os ||= '-'
       puts "  [ #{uuid.ljust(37)}]  #{name.ljust(30)} #{version.ljust(6)} #{os}"
     end
     
@@ -122,7 +128,21 @@ class AppCLI < Thor
         name = name.send(state_color)
       end
       
-      puts "  [ #{size.rjust(6)}  #{name.ljust(35)} - #{disk_label.rjust(5)} - #{uuid.ljust(37)}][ #{format_generic(admin_ip).ljust(15).cyan} ]#{tmp}"
+      line = build_vm_list_string(
+          size,
+          name,
+          disk_label,
+          uuid,
+          format_generic(admin_ip).cyan,
+          tmp
+        )
+      #line = "  [ #{size.rjust(6)}  #{name.ljust(35)} - #{disk_label.rjust(5)} - #{uuid.ljust(37)}][ #{format_generic(admin_ip).ljust(15).cyan} ]#{tmp}"
+      
+      puts line
+    end
+    
+    def build_vm_list_string(size, name, disk_label, uuid, admin_ip, rest)
+      "  [ #{size.rjust(6)}  #{name.ljust(35)} - #{disk_label.rjust(5)} - #{uuid.ljust(37)}][ #{admin_ip.ljust(15)} ]#{rest}"
     end
     
     def printable_state(state)

data/lib/smartos-manager/core.rb

@@ -204,17 +204,26 @@ class HostRegistry
     run_on_all("prtconf | head -3 | grep Mem").each do |host, data|
       _, _, mem, _ = data.split(" ")
       ret[host] = {memory: mem.to_i.megabytes}
-      ret[host][:zfs_volumes] = {}
     end
     
     # main MAC address
     run_on_all("ifconfig e1000g0 | grep ether | cut -d ' ' -f 2").each do |host, data|
       ret[host][:mac0] = data.strip()
     end
-
+    
+    # disk infos
+    run_on_all("diskinfo -Hp").each do |host, data|
+      ret[host][:disks] = {}
+      
+      data.split("\n").each do |line|
+        type, name, _, _, size_bytes, _, ssd = line.split("\t")
+        ret[host][:disks][name] = {size: size_bytes.to_i}
+      end
+    end
     
     # disk size
     run_on_all("zfs list -Ho name,quota,volsize").each do |host, data|
+      ret[host][:zfs_volumes] = {}
       
       data.split("\n").each do |line|
         name, quota, size = line.split("\t")

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartos-manager
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb