github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 04:50:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved memory chart. Now it shows used, free and swap usage

Browse source
This commit is contained in:
Serghey Rodin 2014-04-08 03:03:24 +03:00
commit 1b6d872cf1
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
bin/v-update-sys-rrd-mem
View file

@ -36,11 +36,18 @@ if [ ! -d "$RRD/mem" ]; then
fi fi
# Checking database # Checking database
if [ -e "$RRD/mem/mem.rrd" ]; then
rrd_check=$(rrdtool info $RRD/mem/mem.rrd |grep "FREE")
if [ -z "$rrd_check" ]; then
rm -f $RRD/mem/mem.rrd
fi
fi
if [ ! -e "$RRD/mem/mem.rrd" ]; then if [ ! -e "$RRD/mem/mem.rrd" ]; then
# Adding database # Adding database
rrdtool create $RRD/mem/mem.rrd --step $RRD_STEP \ rrdtool create $RRD/mem/mem.rrd --step $RRD_STEP \
DS:RAM:GAUGE:600:U:U \ DS:RAM:GAUGE:600:U:U \
DS:SWAP:GAUGE:600:U:U \ DS:SWAP:GAUGE:600:U:U \
DS:FREE:GAUGE:600:U:U \
RRA:AVERAGE:0.5:1:600 \ RRA:AVERAGE:0.5:1:600 \
RRA:AVERAGE:0.5:6:700 \ RRA:AVERAGE:0.5:6:700 \
RRA:AVERAGE:0.5:24:775 \ RRA:AVERAGE:0.5:24:775 \
@ -54,15 +61,22 @@ fi
# Parsing data # Parsing data
if [ "$period" = 'daily' ]; then if [ "$period" = 'daily' ]; then
mem=$(free -m) mem=$(free -m)
ram=$(echo "$mem" |awk '{print $3}'|head -n2 |tail -n1) used_ram=$(echo "$mem" |awk '{print $3}'|head -n2 |tail -n1)
used_cache=$(echo "$mem" |awk '{print $3}'|head -n3 |tail -n1)
used=$((used_ram + used_cache))
free_ram=$(echo "$mem" |awk '{print $4}'|head -n2 |tail -n1)
free_cache=$(echo "$mem" |awk '{print $4}'|head -n3 |tail -n1)
free=$((free_ram + free_cache))
swap=$(echo "$mem" |awk '{print $3}'|tail -n1) swap=$(echo "$mem" |awk '{print $3}'|tail -n1)
# Updating rrd # Updating rrd
rrdtool update $RRD/mem/mem.rrd N:$ram:$swap rrdtool update $RRD/mem/mem.rrd N:$used:$swap:$free
fi fi
# Updating rrd graph # Updating rrd graph
rrdtool graph $RRD/mem/$period-mem.png \ rrdtool graph $RRD/mem/$period-mem.png \
--imgformat PNG \ --imgformat PNG \
--height="120" \ --height="120" \
--width="440" \ --width="440" \
@ -81,6 +95,7 @@ rrdtool graph $RRD/mem/$period-mem.png \
-c "ARROW#FFFFFF" \ -c "ARROW#FFFFFF" \
DEF:ram=$RRD/mem/mem.rrd:RAM:AVERAGE \ DEF:ram=$RRD/mem/mem.rrd:RAM:AVERAGE \
DEF:swap=$RRD/mem/mem.rrd:SWAP:AVERAGE \ DEF:swap=$RRD/mem/mem.rrd:SWAP:AVERAGE \
DEF:free=$RRD/mem/mem.rrd:SWAP:AVERAGE \
COMMENT:'\r' \ COMMENT:'\r' \
AREA:ram#867995:"RAM "\ AREA:ram#867995:"RAM "\
GPRINT:ram:'LAST: Current\:''%8.0lf' \ GPRINT:ram:'LAST: Current\:''%8.0lf' \
@ -89,7 +104,11 @@ rrdtool graph $RRD/mem/$period-mem.png \
LINE1:swap#f57900:"SWAP" \ LINE1:swap#f57900:"SWAP" \
GPRINT:swap:'LAST:Current\:''%8.0lf' \ GPRINT:swap:'LAST:Current\:''%8.0lf' \
GPRINT:swap:'MIN:Min\:''%8.0lf' \ GPRINT:swap:'MIN:Min\:''%8.0lf' \
GPRINT:swap:'MAX:Max\:''%8.0lf\j' &>/dev/null; result=$? GPRINT:swap:'MAX:Max\:''%8.0lf\j'\
AREA:free#1c74cd:"FREE" \
GPRINT:free:'LAST: Current\:''%8.0lf' \
GPRINT:free:'MIN: Min\:''%8.0lf' \
GPRINT:free:'MAX: Max\:''%8.0lf\j' &>/dev/null; result=$?
#----------------------------------------------------------# #----------------------------------------------------------#