ohai 6.24.2 → 7.0.0.rc.0
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/ohai.rb +1 -1
- data/lib/ohai/application.rb +5 -12
- data/lib/ohai/common/dmi.rb +126 -0
- data/lib/ohai/config.rb +9 -9
- data/lib/ohai/{plugins/darwin/hostname.rb → dsl.rb} +7 -7
- data/lib/ohai/dsl/plugin.rb +186 -0
- data/lib/ohai/dsl/plugin/versionvi.rb +62 -0
- data/lib/ohai/dsl/plugin/versionvii.rb +106 -0
- data/lib/ohai/exception.rb +11 -2
- data/lib/ohai/hints.rb +48 -0
- data/lib/ohai/loader.rb +205 -0
- data/lib/ohai/mixin/command.rb +14 -18
- data/lib/ohai/mixin/constant_helper.rb +53 -0
- data/lib/ohai/mixin/gce_metadata.rb +0 -2
- data/lib/ohai/{plugins/freebsd/uptime.rb → mixin/network_constants.rb} +15 -13
- data/lib/ohai/mixin/os.rb +59 -0
- data/lib/ohai/mixin/seconds_to_human.rb +48 -0
- data/lib/ohai/plugins/aix/cpu.rb +26 -22
- data/lib/ohai/plugins/aix/filesystem.rb +47 -48
- data/lib/ohai/plugins/aix/kernel.rb +11 -7
- data/lib/ohai/plugins/aix/memory.rb +8 -4
- data/lib/ohai/plugins/aix/network.rb +73 -82
- data/lib/ohai/plugins/aix/platform.rb +9 -6
- data/lib/ohai/plugins/aix/uptime.rb +14 -12
- data/lib/ohai/plugins/azure.rb +33 -11
- data/lib/ohai/plugins/c.rb +103 -78
- data/lib/ohai/plugins/chef.rb +20 -8
- data/lib/ohai/plugins/cloud.rb +234 -230
- data/lib/ohai/plugins/command.rb +6 -2
- data/lib/ohai/plugins/darwin/cpu.rb +10 -4
- data/lib/ohai/plugins/darwin/filesystem.rb +32 -32
- data/lib/ohai/plugins/darwin/network.rb +157 -154
- data/lib/ohai/plugins/darwin/platform.rb +18 -16
- data/lib/ohai/plugins/darwin/system_profiler.rb +49 -46
- data/lib/ohai/plugins/dmi.rb +102 -102
- data/lib/ohai/plugins/ec2.rb +30 -28
- data/lib/ohai/plugins/erlang.rb +19 -16
- data/lib/ohai/plugins/eucalyptus.rb +37 -36
- data/lib/ohai/plugins/freebsd/cpu.rb +34 -29
- data/lib/ohai/plugins/freebsd/filesystem.rb +32 -32
- data/lib/ohai/plugins/freebsd/memory.rb +35 -25
- data/lib/ohai/plugins/freebsd/network.rb +94 -89
- data/lib/ohai/plugins/freebsd/platform.rb +10 -4
- data/lib/ohai/plugins/freebsd/virtualization.rb +62 -61
- data/lib/ohai/plugins/gce.rb +30 -36
- data/lib/ohai/plugins/groovy.rb +14 -11
- data/lib/ohai/plugins/hostname.rb +132 -10
- data/lib/ohai/plugins/ip_scopes.rb +31 -16
- data/lib/ohai/plugins/java.rb +45 -21
- data/lib/ohai/plugins/kernel.rb +186 -19
- data/lib/ohai/plugins/keys.rb +6 -2
- data/lib/ohai/plugins/languages.rb +6 -2
- data/lib/ohai/plugins/linode.rb +38 -30
- data/lib/ohai/plugins/linux/block_device.rb +19 -15
- data/lib/ohai/plugins/linux/cpu.rb +42 -38
- data/lib/ohai/plugins/linux/filesystem.rb +70 -130
- data/lib/ohai/plugins/linux/lsb.rb +35 -35
- data/lib/ohai/plugins/linux/memory.rb +65 -61
- data/lib/ohai/plugins/linux/network.rb +343 -362
- data/lib/ohai/plugins/linux/platform.rb +90 -88
- data/lib/ohai/plugins/linux/virtualization.rb +95 -90
- data/lib/ohai/plugins/lua.rb +14 -10
- data/lib/ohai/plugins/mono.rb +17 -13
- data/lib/ohai/plugins/netbsd/cpu.rb +25 -23
- data/lib/ohai/plugins/netbsd/filesystem.rb +32 -32
- data/lib/ohai/plugins/netbsd/memory.rb +59 -59
- data/lib/ohai/plugins/netbsd/network.rb +92 -88
- data/lib/ohai/plugins/netbsd/platform.rb +10 -3
- data/lib/ohai/plugins/netbsd/virtualization.rb +41 -38
- data/lib/ohai/plugins/network.rb +131 -130
- data/lib/ohai/plugins/network_listeners.rb +26 -22
- data/lib/ohai/plugins/nodejs.rb +14 -10
- data/lib/ohai/plugins/ohai.rb +11 -6
- data/lib/ohai/plugins/ohai_time.rb +6 -2
- data/lib/ohai/plugins/openbsd/cpu.rb +20 -15
- data/lib/ohai/plugins/openbsd/filesystem.rb +32 -32
- data/lib/ohai/plugins/openbsd/memory.rb +59 -59
- data/lib/ohai/plugins/openbsd/network.rb +92 -88
- data/lib/ohai/plugins/openbsd/platform.rb +10 -4
- data/lib/ohai/plugins/openbsd/virtualization.rb +41 -39
- data/lib/ohai/plugins/openstack.rb +23 -21
- data/lib/ohai/plugins/os.rb +8 -32
- data/lib/ohai/plugins/passwd.rb +27 -22
- data/lib/ohai/plugins/perl.rb +21 -16
- data/lib/ohai/plugins/php.rb +15 -12
- data/lib/ohai/plugins/platform.rb +9 -9
- data/lib/ohai/plugins/{linux/kernel.rb → ps.rb} +13 -12
- data/lib/ohai/plugins/python.rb +16 -12
- data/lib/ohai/plugins/rackspace.rb +82 -77
- data/lib/ohai/plugins/root_group.rb +13 -9
- data/lib/ohai/plugins/ruby.rb +50 -48
- data/lib/ohai/plugins/sigar/cpu.rb +21 -17
- data/lib/ohai/plugins/sigar/filesystem.rb +26 -23
- data/lib/ohai/plugins/sigar/memory.rb +17 -14
- data/lib/ohai/plugins/sigar/network.rb +133 -67
- data/lib/ohai/plugins/sigar/network_route.rb +33 -28
- data/lib/ohai/plugins/sigar/platform.rb +10 -6
- data/lib/ohai/plugins/solaris2/cpu.rb +41 -33
- data/lib/ohai/plugins/solaris2/dmi.rb +146 -146
- data/lib/ohai/plugins/solaris2/filesystem.rb +74 -77
- data/lib/ohai/plugins/{aix/hostname.rb → solaris2/memory.rb} +7 -4
- data/lib/ohai/plugins/solaris2/network.rb +91 -86
- data/lib/ohai/plugins/solaris2/platform.rb +40 -36
- data/lib/ohai/plugins/solaris2/virtualization.rb +54 -59
- data/lib/ohai/plugins/solaris2/zpools.rb +38 -38
- data/lib/ohai/plugins/ssh_host_key.rb +49 -45
- data/lib/ohai/plugins/uptime.rb +87 -25
- data/lib/ohai/plugins/virtualization.rb +59 -55
- data/lib/ohai/plugins/windows/cpu.rb +44 -40
- data/lib/ohai/plugins/windows/filesystem.rb +28 -22
- data/lib/ohai/plugins/windows/network.rb +88 -79
- data/lib/ohai/plugins/windows/platform.rb +10 -3
- data/lib/ohai/provides_map.rb +184 -0
- data/lib/ohai/runner.rb +109 -0
- data/lib/ohai/system.rb +103 -184
- data/lib/ohai/version.rb +4 -3
- data/spec/data/plugins/___lib64___libc.so.6.output +135 -0
- data/spec/data/plugins/___lib___libc.so.6.output +135 -0
- data/spec/data/plugins/cc.output +135 -0
- data/spec/data/plugins/cl.output +135 -0
- data/spec/data/plugins/devenv.com.output +135 -0
- data/spec/data/plugins/env.output +71 -0
- data/spec/data/plugins/erl.output +144 -0
- data/spec/data/plugins/gcc.output +135 -0
- data/spec/data/plugins/groovy.output +159 -0
- data/spec/data/plugins/java.output +143 -0
- data/spec/data/plugins/lua.output +143 -0
- data/spec/data/plugins/messages.rb +8 -0
- data/spec/data/plugins/node.output +143 -0
- data/spec/data/plugins/perl.output +143 -0
- data/spec/data/plugins/php.output +143 -0
- data/spec/data/plugins/python.output +143 -0
- data/spec/data/plugins/uname.output +71 -0
- data/spec/data/plugins/v6message.rb +2 -0
- data/spec/data/plugins/v7message.rb +7 -0
- data/spec/data/plugins/what.output +135 -0
- data/spec/data/plugins/xlc.output +135 -0
- data/spec/spec_helper.rb +52 -18
- data/spec/support/integration_helper.rb +44 -0
- data/spec/unit/dsl/plugin_spec.rb +298 -0
- data/spec/unit/hints_spec.rb +65 -0
- data/spec/unit/loader_spec.rb +226 -0
- data/spec/unit/mixin/ec2_metadata_spec.rb +9 -9
- data/spec/unit/plugins/aix/cpu_spec.rb +17 -18
- data/spec/unit/plugins/aix/filesystem_spec.rb +20 -18
- data/spec/unit/plugins/aix/hostname_spec.rb +8 -4
- data/spec/unit/plugins/aix/kernel_spec.rb +13 -12
- data/spec/unit/plugins/aix/network_spec.rb +66 -45
- data/spec/unit/plugins/aix/platform_spec.rb +11 -10
- data/spec/unit/plugins/aix/uptime_spec.rb +7 -8
- data/spec/unit/plugins/azure_spec.rb +20 -21
- data/spec/unit/plugins/c_spec.rb +88 -87
- data/spec/unit/plugins/chef_spec.rb +5 -6
- data/spec/unit/plugins/cloud_spec.rb +81 -82
- data/spec/unit/plugins/darwin/cpu_spec.rb +8 -9
- data/spec/unit/plugins/darwin/hostname_spec.rb +23 -11
- data/spec/unit/plugins/darwin/kernel_spec.rb +39 -16
- data/spec/unit/plugins/darwin/network_spec.rb +375 -378
- data/spec/unit/plugins/darwin/platform_spec.rb +23 -50
- data/spec/unit/plugins/darwin/system_profiler_spec.rb +7 -8
- data/spec/unit/plugins/dmi_spec.rb +7 -12
- data/spec/unit/plugins/ec2_spec.rb +70 -59
- data/spec/unit/plugins/erlang_spec.rb +18 -20
- data/spec/unit/plugins/eucalyptus_spec.rb +37 -33
- data/spec/unit/plugins/fail_spec.rb +276 -23
- data/spec/unit/plugins/freebsd/hostname_spec.rb +11 -9
- data/spec/unit/plugins/freebsd/kernel_spec.rb +8 -8
- data/spec/unit/plugins/freebsd/platform_spec.rb +9 -10
- data/spec/unit/plugins/freebsd/virtualization_spec.rb +32 -32
- data/spec/unit/plugins/gce_spec.rb +19 -25
- data/spec/unit/plugins/groovy_spec.rb +10 -16
- data/spec/unit/plugins/hostname_spec.rb +45 -20
- data/spec/unit/plugins/ip_scopes_spec.rb +97 -0
- data/spec/unit/plugins/java_spec.rb +145 -99
- data/spec/unit/plugins/kernel_spec.rb +51 -15
- data/spec/unit/plugins/linode_spec.rb +31 -29
- data/spec/unit/plugins/linux/cpu_spec.rb +42 -43
- data/spec/unit/plugins/linux/filesystem_spec.rb +143 -324
- data/spec/unit/plugins/linux/hostname_spec.rb +16 -23
- data/spec/unit/plugins/linux/kernel_spec.rb +22 -8
- data/spec/unit/plugins/linux/lsb_spec.rb +54 -56
- data/spec/unit/plugins/linux/network_spec.rb +196 -238
- data/spec/unit/plugins/linux/platform_spec.rb +186 -205
- data/spec/unit/plugins/linux/uptime_spec.rb +13 -25
- data/spec/unit/plugins/linux/virtualization_spec.rb +149 -129
- data/spec/unit/plugins/lua_spec.rb +12 -15
- data/spec/unit/plugins/mono_spec.rb +10 -15
- data/spec/unit/plugins/netbsd/hostname_spec.rb +17 -7
- data/spec/unit/plugins/netbsd/kernel_spec.rb +8 -8
- data/spec/unit/plugins/netbsd/platform_spec.rb +8 -10
- data/spec/unit/plugins/network_spec.rb +358 -235
- data/spec/unit/plugins/nodejs_spec.rb +13 -15
- data/spec/unit/plugins/ohai_spec.rb +3 -4
- data/spec/unit/plugins/ohai_time_spec.rb +8 -9
- data/spec/unit/plugins/openbsd/hostname_spec.rb +21 -11
- data/spec/unit/plugins/openbsd/kernel_spec.rb +8 -8
- data/spec/unit/plugins/openbsd/platform_spec.rb +6 -12
- data/spec/unit/plugins/openstack_spec.rb +214 -0
- data/spec/unit/plugins/os_spec.rb +13 -16
- data/spec/unit/plugins/passwd_spec.rb +12 -13
- data/spec/unit/plugins/perl_spec.rb +20 -44
- data/spec/unit/plugins/php_spec.rb +20 -15
- data/spec/unit/plugins/platform_spec.rb +24 -29
- data/spec/unit/plugins/python_spec.rb +13 -17
- data/spec/unit/plugins/rackspace_spec.rb +90 -57
- data/spec/unit/plugins/root_group_spec.rb +17 -19
- data/spec/unit/plugins/ruby_spec.rb +15 -16
- data/spec/unit/plugins/sigar/network_route_spec.rb +12 -13
- data/spec/unit/plugins/solaris2/cpu_spec.rb +82 -0
- data/spec/unit/plugins/solaris2/hostname_spec.rb +12 -13
- data/spec/unit/plugins/solaris2/kernel_spec.rb +11 -15
- data/{lib/ohai/plugins/openbsd/uptime.rb → spec/unit/plugins/solaris2/memory_spec.rb} +10 -12
- data/spec/unit/plugins/solaris2/network_spec.rb +44 -20
- data/spec/unit/plugins/solaris2/platform_spec.rb +13 -22
- data/spec/unit/plugins/solaris2/virtualization_spec.rb +37 -45
- data/spec/unit/plugins/ssh_host_keys_spec.rb +11 -15
- data/spec/unit/provides_map_spec.rb +208 -0
- data/spec/unit/runner_spec.rb +488 -0
- data/spec/unit/system_spec.rb +639 -104
- metadata +151 -87
- checksums.yaml +0 -7
- data/lib/ohai/mixin/from_file.rb +0 -36
- data/lib/ohai/plugins/aix/ps.rb +0 -23
- data/lib/ohai/plugins/darwin/kernel.rb +0 -37
- data/lib/ohai/plugins/darwin/ps.rb +0 -23
- data/lib/ohai/plugins/darwin/uptime.rb +0 -32
- data/lib/ohai/plugins/dmi_common.rb +0 -121
- data/lib/ohai/plugins/freebsd/hostname.rb +0 -22
- data/lib/ohai/plugins/freebsd/kernel.rb +0 -37
- data/lib/ohai/plugins/freebsd/ps.rb +0 -24
- data/lib/ohai/plugins/hpux/cpu.rb +0 -19
- data/lib/ohai/plugins/hpux/filesystem.rb +0 -19
- data/lib/ohai/plugins/hpux/hostname.rb +0 -19
- data/lib/ohai/plugins/hpux/memory.rb +0 -19
- data/lib/ohai/plugins/hpux/network.rb +0 -19
- data/lib/ohai/plugins/hpux/platform.rb +0 -19
- data/lib/ohai/plugins/hpux/ps.rb +0 -23
- data/lib/ohai/plugins/hpux/uptime.rb +0 -19
- data/lib/ohai/plugins/linux/hostname.rb +0 -40
- data/lib/ohai/plugins/linux/ps.rb +0 -23
- data/lib/ohai/plugins/linux/uptime.rb +0 -28
- data/lib/ohai/plugins/netbsd/hostname.rb +0 -22
- data/lib/ohai/plugins/netbsd/kernel.rb +0 -35
- data/lib/ohai/plugins/netbsd/ps.rb +0 -24
- data/lib/ohai/plugins/netbsd/uptime.rb +0 -31
- data/lib/ohai/plugins/openbsd/hostname.rb +0 -22
- data/lib/ohai/plugins/openbsd/kernel.rb +0 -35
- data/lib/ohai/plugins/openbsd/ps.rb +0 -24
- data/lib/ohai/plugins/sigar/hostname.rb +0 -28
- data/lib/ohai/plugins/sigar/uptime.rb +0 -27
- data/lib/ohai/plugins/solaris2/hostname.rb +0 -34
- data/lib/ohai/plugins/solaris2/kernel.rb +0 -40
- data/lib/ohai/plugins/solaris2/ps.rb +0 -23
- data/lib/ohai/plugins/solaris2/uptime.rb +0 -36
- data/lib/ohai/plugins/windows/hostname.rb +0 -33
- data/lib/ohai/plugins/windows/kernel.rb +0 -58
- data/lib/ohai/plugins/windows/kernel_devices.rb +0 -39
- data/lib/ohai/plugins/windows/uptime.rb +0 -23
- data/spec/unit/mixin/from_file_spec.rb +0 -53
data/lib/ohai/plugins/keys.rb
CHANGED
data/lib/ohai/plugins/linode.rb
CHANGED
@@ -14,40 +14,48 @@
|
|
14
14
|
# See the License for the specific language governing permissions and
|
15
15
|
# limitations under the License.
|
16
16
|
|
17
|
-
|
17
|
+
Ohai.plugin(:Linode) do
|
18
|
+
provides "linode"
|
18
19
|
|
19
|
-
|
20
|
-
|
20
|
+
depends "kernel"
|
21
|
+
depends "network/interfaces"
|
21
22
|
|
22
|
-
# Checks for matching linode kernel name
|
23
|
-
#
|
24
|
-
# Returns true or false
|
25
|
-
def has_linode_kernel?
|
26
|
-
|
27
|
-
|
23
|
+
# Checks for matching linode kernel name
|
24
|
+
#
|
25
|
+
# Returns true or false
|
26
|
+
def has_linode_kernel?
|
27
|
+
if kernel_data = kernel
|
28
|
+
kernel_data[:release].split('-').last =~ /linode/
|
29
|
+
end
|
30
|
+
end
|
28
31
|
|
29
|
-
# Identifies the linode cloud by preferring the hint, then
|
30
|
-
#
|
31
|
-
# Returns true or false
|
32
|
-
def looks_like_linode?
|
33
|
-
|
34
|
-
end
|
32
|
+
# Identifies the linode cloud by preferring the hint, then
|
33
|
+
#
|
34
|
+
# Returns true or false
|
35
|
+
def looks_like_linode?
|
36
|
+
hint?('linode') || has_linode_kernel?
|
37
|
+
end
|
35
38
|
|
36
|
-
# Names linode ip address
|
37
|
-
#
|
38
|
-
# name - symbol of ohai name (e.g. :public_ip)
|
39
|
-
# eth - Interface name (e.g. :eth0)
|
40
|
-
#
|
41
|
-
# Alters linode mash with new interface based on name parameter
|
42
|
-
def get_ip_address(name, eth)
|
43
|
-
|
44
|
-
|
39
|
+
# Names linode ip address
|
40
|
+
#
|
41
|
+
# name - symbol of ohai name (e.g. :public_ip)
|
42
|
+
# eth - Interface name (e.g. :eth0)
|
43
|
+
#
|
44
|
+
# Alters linode mash with new interface based on name parameter
|
45
|
+
def get_ip_address(name, eth)
|
46
|
+
if eth_iface = network[:interfaces][eth]
|
47
|
+
eth_iface[:addresses].each do |key, info|
|
48
|
+
linode[name] = key if info['family'] == 'inet'
|
49
|
+
end
|
50
|
+
end
|
45
51
|
end
|
46
|
-
end
|
47
52
|
|
48
|
-
|
49
|
-
if
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
+
collect_data do
|
54
|
+
# Setup linode mash if it is a linode system
|
55
|
+
if looks_like_linode?
|
56
|
+
linode Mash.new
|
57
|
+
get_ip_address(:public_ip, :eth0)
|
58
|
+
get_ip_address(:private_ip, "eth0:1")
|
59
|
+
end
|
60
|
+
end
|
53
61
|
end
|
@@ -16,23 +16,27 @@
|
|
16
16
|
# limitations under the License.
|
17
17
|
#
|
18
18
|
|
19
|
-
|
19
|
+
Ohai.plugin(:BlockDevice) do
|
20
|
+
provides "block_device"
|
20
21
|
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
22
|
+
collect_data(:linux) do
|
23
|
+
if File.exists?("/sys/block")
|
24
|
+
block = Mash.new
|
25
|
+
Dir["/sys/block/*"].each do |block_device_dir|
|
26
|
+
dir = File.basename(block_device_dir)
|
27
|
+
block[dir] = Mash.new
|
28
|
+
%w{size removable}.each do |check|
|
29
|
+
if File.exists?("/sys/block/#{dir}/#{check}")
|
30
|
+
File.open("/sys/block/#{dir}/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
|
31
|
+
end
|
32
|
+
end
|
33
|
+
%w{model rev state timeout vendor}.each do |check|
|
34
|
+
if File.exists?("/sys/block/#{dir}/device/#{check}")
|
35
|
+
File.open("/sys/block/#{dir}/device/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
|
36
|
+
end
|
37
|
+
end
|
34
38
|
end
|
39
|
+
block_device block
|
35
40
|
end
|
36
41
|
end
|
37
|
-
block_device block
|
38
42
|
end
|
@@ -16,45 +16,49 @@
|
|
16
16
|
# limitations under the License.
|
17
17
|
#
|
18
18
|
|
19
|
-
|
19
|
+
Ohai.plugin(:CPU) do
|
20
|
+
provides "cpu"
|
20
21
|
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
22
|
+
collect_data(:linux) do
|
23
|
+
cpuinfo = Mash.new
|
24
|
+
real_cpu = Mash.new
|
25
|
+
cpu_number = 0
|
26
|
+
current_cpu = nil
|
25
27
|
|
26
|
-
File.open("/proc/cpuinfo").each do |line|
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
28
|
+
File.open("/proc/cpuinfo").each do |line|
|
29
|
+
case line
|
30
|
+
when /processor\s+:\s(.+)/
|
31
|
+
cpuinfo[$1] = Mash.new
|
32
|
+
current_cpu = $1
|
33
|
+
cpu_number += 1
|
34
|
+
when /vendor_id\s+:\s(.+)/
|
35
|
+
cpuinfo[current_cpu]["vendor_id"] = $1
|
36
|
+
when /cpu family\s+:\s(.+)/
|
37
|
+
cpuinfo[current_cpu]["family"] = $1
|
38
|
+
when /model\s+:\s(.+)/
|
39
|
+
cpuinfo[current_cpu]["model"] = $1
|
40
|
+
when /stepping\s+:\s(.+)/
|
41
|
+
cpuinfo[current_cpu]["stepping"] = $1
|
42
|
+
when /physical id\s+:\s(.+)/
|
43
|
+
cpuinfo[current_cpu]["physical_id"] = $1
|
44
|
+
real_cpu[$1] = true
|
45
|
+
when /core id\s+:\s(.+)/
|
46
|
+
cpuinfo[current_cpu]["core_id"] = $1
|
47
|
+
when /cpu cores\s+:\s(.+)/
|
48
|
+
cpuinfo[current_cpu]["cores"] = $1
|
49
|
+
when /model name\s+:\s(.+)/
|
50
|
+
cpuinfo[current_cpu]["model_name"] = $1
|
51
|
+
when /cpu MHz\s+:\s(.+)/
|
52
|
+
cpuinfo[current_cpu]["mhz"] = $1
|
53
|
+
when /cache size\s+:\s(.+)/
|
54
|
+
cpuinfo[current_cpu]["cache_size"] = $1
|
55
|
+
when /flags\s+:\s(.+)/
|
56
|
+
cpuinfo[current_cpu]["flags"] = $1.split(' ')
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
cpu cpuinfo
|
61
|
+
cpu[:total] = cpu_number
|
62
|
+
cpu[:real] = real_cpu.keys.length
|
55
63
|
end
|
56
64
|
end
|
57
|
-
|
58
|
-
cpu cpuinfo
|
59
|
-
cpu[:total] = cpu_number
|
60
|
-
cpu[:real] = real_cpu.keys.length
|
@@ -16,146 +16,86 @@
|
|
16
16
|
# limitations under the License.
|
17
17
|
#
|
18
18
|
|
19
|
-
|
19
|
+
Ohai.plugin(:Filesystem) do
|
20
|
+
provides "filesystem"
|
20
21
|
|
21
|
-
|
22
|
+
collect_data(:linux) do
|
23
|
+
fs = Mash.new
|
22
24
|
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
when /^Filesystem\s+1024-blocks/
|
39
|
-
next
|
40
|
-
when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
|
41
|
-
filesystem = $1
|
42
|
-
fs[filesystem] = Mash.new
|
43
|
-
fs[filesystem][:kb_size] = $2
|
44
|
-
fs[filesystem][:kb_used] = $3
|
45
|
-
fs[filesystem][:kb_available] = $4
|
46
|
-
fs[filesystem][:percent_used] = $5
|
47
|
-
fs[filesystem][:mount] = $6
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
# Grab mount information from /bin/mount
|
52
|
-
status, stdout, stderr = run_command(:command => "mount", :timeout => 120)
|
53
|
-
stdout.each_line do |line|
|
54
|
-
if line =~ /^(.+?) on (.+?) type (.+?) \((.+?)\)$/
|
55
|
-
filesystem = $1
|
56
|
-
fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
|
57
|
-
fs[filesystem][:mount] = $2
|
58
|
-
fs[filesystem][:fs_type] = $3
|
59
|
-
fs[filesystem][:mount_options] = $4.split(",")
|
60
|
-
end
|
61
|
-
end
|
62
|
-
|
63
|
-
have_lsblk = File.exists?('/bin/lsblk')
|
64
|
-
|
65
|
-
# Gather more filesystem types via libuuid/libblkid even devices that
|
66
|
-
# aren't mounted
|
67
|
-
if have_lsblk
|
68
|
-
cmd = 'lsblk -r -o NAME,FSTYPE -n'
|
69
|
-
regex = /^(\S+) (\S+)/
|
70
|
-
else
|
71
|
-
cmd = 'blkid -s TYPE'
|
72
|
-
regex = /^(\S+): TYPE="(\S+)"/
|
73
|
-
end
|
74
|
-
popen4(cmd) do |pid, stdin, stdout, stderr|
|
75
|
-
stdin.close
|
76
|
-
stdout.each do |line|
|
77
|
-
if line =~ regex
|
78
|
-
filesystem = $1
|
79
|
-
type = $2
|
80
|
-
filesystem = find_device(filesystem) unless filesystem.start_with?('/')
|
81
|
-
fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
|
82
|
-
fs[filesystem][:fs_type] = type
|
25
|
+
# Grab filesystem data from df
|
26
|
+
so = shell_out("df -P")
|
27
|
+
so.stdout.lines do |line|
|
28
|
+
case line
|
29
|
+
when /^Filesystem\s+1024-blocks/
|
30
|
+
next
|
31
|
+
when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
|
32
|
+
filesystem = $1
|
33
|
+
fs[filesystem] = Mash.new
|
34
|
+
fs[filesystem][:kb_size] = $2
|
35
|
+
fs[filesystem][:kb_used] = $3
|
36
|
+
fs[filesystem][:kb_available] = $4
|
37
|
+
fs[filesystem][:percent_used] = $5
|
38
|
+
fs[filesystem][:mount] = $6
|
39
|
+
end
|
83
40
|
end
|
84
|
-
end
|
85
|
-
end
|
86
41
|
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
stdout.each do |line|
|
98
|
-
if line =~ regex
|
99
|
-
filesystem = $1
|
100
|
-
uuid = $2
|
101
|
-
filesystem = find_device(filesystem) unless filesystem.start_with?('/')
|
102
|
-
fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
|
103
|
-
fs[filesystem][:uuid] = uuid
|
42
|
+
# Grab mount information from /bin/mount
|
43
|
+
so = shell_out("mount")
|
44
|
+
so.stdout.lines do |line|
|
45
|
+
if line =~ /^(.+?) on (.+?) type (.+?) \((.+?)\)$/
|
46
|
+
filesystem = $1
|
47
|
+
fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
|
48
|
+
fs[filesystem][:mount] = $2
|
49
|
+
fs[filesystem][:fs_type] = $3
|
50
|
+
fs[filesystem][:mount_options] = $4.split(",")
|
51
|
+
end
|
104
52
|
end
|
105
|
-
end
|
106
|
-
end
|
107
53
|
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
54
|
+
# Gather more filesystem types via libuuid, even devices that's aren't mounted
|
55
|
+
so = shell_out("blkid -s TYPE")
|
56
|
+
so.stdout.lines do |line|
|
57
|
+
if line =~ /^(\S+): TYPE="(\S+)"/
|
58
|
+
filesystem = $1
|
59
|
+
fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
|
60
|
+
fs[filesystem][:fs_type] = $2
|
61
|
+
end
|
62
|
+
end
|
115
63
|
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
fs[filesystem][:label] = label
|
64
|
+
# Gather device UUIDs via libuuid
|
65
|
+
so = shell_out("blkid -s UUID")
|
66
|
+
so.stdout.lines do |line|
|
67
|
+
if line =~ /^(\S+): UUID="(\S+)"/
|
68
|
+
filesystem = $1
|
69
|
+
fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
|
70
|
+
fs[filesystem][:uuid] = $2
|
71
|
+
end
|
125
72
|
end
|
126
|
-
end
|
127
|
-
end
|
128
73
|
|
129
|
-
#
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
data = f.read_nonblock(4096)
|
138
|
-
mounts << data
|
139
|
-
# We should just catch EOFError, but the kernel had a period of
|
140
|
-
# bugginess with reading virtual files, so we're being extra
|
141
|
-
# cautious here, catching all exceptions, and then we'll read
|
142
|
-
# whatever data we might have
|
143
|
-
rescue Exception
|
144
|
-
break
|
74
|
+
# Gather device labels via libuuid
|
75
|
+
so = shell_out("blkid -s LABEL")
|
76
|
+
so.stdout.lines do |line|
|
77
|
+
if line =~ /^(\S+): LABEL="(\S+)"/
|
78
|
+
filesystem = $1
|
79
|
+
fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
|
80
|
+
fs[filesystem][:label] = $2
|
81
|
+
end
|
145
82
|
end
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
83
|
+
|
84
|
+
# Grab any missing mount information from /proc/mounts
|
85
|
+
if File.exists?('/proc/mounts')
|
86
|
+
File.open('/proc/mounts').read_nonblock(4096).each_line do |line|
|
87
|
+
if line =~ /^(\S+) (\S+) (\S+) (\S+) \S+ \S+$/
|
88
|
+
filesystem = $1
|
89
|
+
next if fs.has_key?(filesystem)
|
90
|
+
fs[filesystem] = Mash.new
|
91
|
+
fs[filesystem][:mount] = $2
|
92
|
+
fs[filesystem][:fs_type] = $3
|
93
|
+
fs[filesystem][:mount_options] = $4.split(",")
|
94
|
+
end
|
95
|
+
end
|
156
96
|
end
|
97
|
+
|
98
|
+
# Set the filesystem data
|
99
|
+
filesystem fs
|
157
100
|
end
|
158
101
|
end
|
159
|
-
|
160
|
-
# Set the filesystem data
|
161
|
-
filesystem fs
|