shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

use vmstat instead of /proc/stat for cpu

Browse Source
This commit is contained in:
Cherdancev Evgeni 2015-05-19 17:42:23 +06:00
parent bc3b4a5388
commit df4cbea89b
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/im_mad/remotes/kvm-probes.d/kvm.rb
View File

@ -40,22 +40,15 @@ nodeinfo_text.split(/\n/).each{|line|
}
######
# for everything else, top & proc
#####
NETINTERFACE = "eth|bond|em|enp|p[0-9]+p[0-9]+"
stat = `cat /proc/stat`
stat.each_line do |line|
if /\Acpu (.*)\Z/.match(line)
stat_cpu = Regexp.last_match[1].to_s.split
stat_total_cpu = stat_cpu.inject(0) {|sum,s| sum.to_i+s.to_i}.to_i
$free_cpu = $total_cpu * stat_cpu[3].to_f / stat_total_cpu
$used_cpu = $total_cpu - $free_cpu
end
end
# CPU
######
vmstat = `vmstat 1 2`
$free_cpu = $total_cpu * ((vmstat.split("\n").to_a.last.split)[14].to_i)/100
$used_cpu = $total_cpu - $free_cpu
######
# MEMORY
######
memory = `cat /proc/meminfo`
meminfo = Hash.new()
memory.each_line do |line|
@ -68,6 +61,11 @@ $total_memory = meminfo['MemTotal']
$used_memory = meminfo['MemTotal'] - meminfo['MemFree'] - meminfo['Buffers'] - meminfo['Cached']
$free_memory = $total_memory - $used_memory
######
# INTERFACE
######
NETINTERFACE = "eth|bond|em|enp|p[0-9]+p[0-9]+"
net_text=`cat /proc/net/dev`
exit(-1) if $?.exitstatus != 0