smartos-manager 1.3.0 → 1.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/smartos-manager/cli.rb +1 -1
- data/lib/smartos-manager/core.rb +6 -0
- data/lib/smartos-manager/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 01e8ba9e0c00a493b515ae93522b90367e96a9cc
|
|
4
|
+
data.tar.gz: 572e14a2703148c06e39bc179e1d7f1b4093aca0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8fd64816a5860c18c890e204901061995b3c5f9c50a24c7d9d3dd8c5ca22923a51be3d90bded139cdc804407392fa6bf332b1b96b8bfa2dcb47deb919ea39c34
|
|
7
|
+
data.tar.gz: bde0809b2bcc8103cade34dd786967f46f8c22e28e9aa1881f4419859c0d24018acf491af48ecbce6f6bb4ae196714efc514134b77725433c9baa3d9285c07fa
|
data/lib/smartos-manager/cli.rb
CHANGED
|
@@ -61,7 +61,7 @@ class AppCLI < Thor
|
|
|
61
61
|
avail = [1, (mem - vm_memory) - zfs_arc_current].max
|
|
62
62
|
|
|
63
63
|
rev = sysinfos[host][:smartos_version]
|
|
64
|
-
puts "\nHardware: #{diags[host][:system_id]}"
|
|
64
|
+
puts "\nHardware: #{diags[host][:system_id]} (MAC: #{sysinfos[host][:mac0].upcase.white()} )"
|
|
65
65
|
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})"
|
|
66
66
|
vms.each do |vm|
|
|
67
67
|
user_columns = registry.user_columns.values.map{|key| vm[key] }
|
data/lib/smartos-manager/core.rb
CHANGED
|
@@ -207,6 +207,12 @@ class HostRegistry
|
|
|
207
207
|
ret[host][:zfs_volumes] = {}
|
|
208
208
|
end
|
|
209
209
|
|
|
210
|
+
# main MAC address
|
|
211
|
+
run_on_all("ifconfig e1000g0 | grep ether | cut -d ' ' -f 2").each do |host, data|
|
|
212
|
+
ret[host][:mac0] = data.strip()
|
|
213
|
+
end
|
|
214
|
+
|
|
215
|
+
|
|
210
216
|
# disk size
|
|
211
217
|
run_on_all("zfs list -Ho name,quota,volsize").each do |host, data|
|
|
212
218
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: smartos-manager
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.3.
|
|
4
|
+
version: 1.3.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Julien Ammous
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-09-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: toml-rb
|