smartos-manager 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ffb2500bd4989756261d509d4ea65897efd59f
-  data.tar.gz: d4f446084930370ef72c3430bf81c2e0d6718ceb
+  metadata.gz: 137ad132fca39b6b0324020fa234dfe5f6ce27e0
+  data.tar.gz: 14abd66feaf04836cae4d34446776b82b8e0a399
 SHA512:
-  metadata.gz: 65170d224da12a1465b92aa5a2fd881c0ee660898622e4e56b927a45af462ba53e4b6a743df469070757f82ea76e095b3f2d9e06f0fddac7d3394cd2c975fdbc
-  data.tar.gz: 34737678da03694f3137b68293ab779810ffe5568496009f4211db989ff1e4eea2c6a9ba9a003f450b5c3e2e7d0f58bad67bd6ae96d146dc61ca864f116b836e
+  metadata.gz: c8276fb6b3155b61d3f5776a4a97a4500c261e5954668ad57db7ad0539130949d31501e3200dfd731255a03d0a369b7a12e5f285a7d5d43fb2f60da48e99d7ea
+  data.tar.gz: 21dc78194fe6fa6334016ce4dbb5ff798e4d543aeec808fe91a2697939af0c72afe0a2137fcb6a5f9d1802ba39fabdb4f28a39aba9362fdda84450538b7441df

data/README.md

@@ -36,7 +36,10 @@ first you need to create a config file to define your environment:
 
 ```
 
-All options except address (which makes no sense) can be defined in a global section, if present a host section this one will be used, otherwise the global one will be used.
+All options except address (which makes no sense) can be defined in a global section, if present in a host section the later will be used, otherwise the global one is used.
+
+Save te config file as "smartos_hosts.toml" and run the followings commands
+in the same folder.
 
 Once you have your file you can use the smanager command:
 

data/lib/smartos-manager/cli.rb

@@ -30,7 +30,7 @@ class AppCLI < Thor
     
     user_columns = registry.user_columns.keys.map{|s| humanize(s) }
     
-    p_vm_list("Memory", "Name", "Type", "UUID", "State", "Admin IP", *user_columns)
+    p_vm_list("Memory", "Name (gray = online)", "Type", "UUID", "State", "Admin IP", "DD(GB)", *user_columns)
     
     ret.each do |host, vms|
       mem = sysinfos[host][:memory]
@@ -47,7 +47,16 @@ class AppCLI < Thor
       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)
+        
+        if vm.type == "KVM"
+          vm_disk = sysinfos[host][:zfs_volumes]["zones/#{vm.uuid}-disk0"]
+          vm_disk_label = "#{vm_disk[:size]}"
+        else
+          vm_disk = sysinfos[host][:zfs_volumes]["zones/#{vm.uuid}"]
+          vm_disk_label = "#{vm_disk[:quota]}"
+        end
+        
+        p_vm_list(vm.memory.human_size(1), vm.name, vm.type, vm.uuid, vm.state, vm.admin_ip, vm_disk_label, *user_columns)
       end
       
       if vms.empty?
@@ -75,9 +84,22 @@ class AppCLI < Thor
       str
     end
     
-    def p_vm_list(size, name, type, uuid, state, admin_ip, *user_columns)
+    def p_vm_list(size, name, type, uuid, state, admin_ip, disk_label, *user_columns)
       tmp = user_columns.map{|val| "[ #{format_generic(val).to_s.ljust(15).cyan} ]" }.join('')
-      puts "  [ #{size.rjust(6)}  #{name.ljust(30)} - #{uuid.ljust(37)}][ #{format_generic(admin_ip).ljust(15).cyan} ]#{tmp}[ #{state} ]"
+      
+      if name.start_with?('Name')
+        name = name.white()
+      else
+        state_color =  case state
+          when 'running' then :white
+          else
+            :red
+        end
+        
+        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}"
     end
     
     def printable_state(state)

data/lib/smartos-manager/core.rb

@@ -171,6 +171,16 @@ 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
+    
+    # disk size
+    run_on_all("zfs list -Ho name,quota,volsize").each do |host, data|
+      
+      data.split("\n").each do |line|
+        name, quota, size = line.split("\t")
+        ret[host][:zfs_volumes][name] = {size: size[0...-1].split(',').first, quota: quota[0...-1].split(',').first}
+      end
     end
     
     # ARC Max Size

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartos-manager
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb