Robot/contrib-munin
2
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00
Code Issues Releases Wiki Activity

Merge branch 'fix/pr738' into lxc

Browse source
This commit is contained in:
Ken-ichi Mito 2017-03-05 00:48:52 +09:00
commit 9f7e0614fa
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
plugins/lxc/lxc_ram
View file

@ -78,16 +78,10 @@ if [ "$1" = "config" ]; then
echo 'mem_usage_'$guest'.type GAUGE' echo 'mem_usage_'$guest'.type GAUGE'
echo 'mem_usage_'$guest'.draw AREASTACK' echo 'mem_usage_'$guest'.draw AREASTACK'
done done
fi
for guest_name in $guest_names; for guest_name in $guest_names; do
do
guest="$(clean_fieldname $guest_name)" guest="$(clean_fieldname $guest_name)"
if [ "$areastack" != "true" ]; then
echo 'mem_usage_'$guest'.label '$guest_name': Mem usage'
echo 'mem_usage_'$guest'.type GAUGE'
fi
echo 'mem_cache_'$guest'.label '$guest_name': Cache' echo 'mem_cache_'$guest'.label '$guest_name': Cache'
echo 'mem_cache_'$guest'.type GAUGE' echo 'mem_cache_'$guest'.type GAUGE'
echo 'mem_active_'$guest'.label '$guest_name': Active' echo 'mem_active_'$guest'.label '$guest_name': Active'
@ -96,6 +90,22 @@ if [ "$1" = "config" ]; then
echo 'mem_inactive_'$guest'.type GAUGE' echo 'mem_inactive_'$guest'.type GAUGE'
done done
else
for guest_name in $guest_names;
do
guest="$(clean_fieldname $guest_name)"
echo 'mem_usage_'$guest'.label '$guest_name': Mem usage'
echo 'mem_usage_'$guest'.type GAUGE'
echo 'mem_cache_'$guest'.label '$guest_name': Cache'
echo 'mem_cache_'$guest'.type GAUGE'
echo 'mem_active_'$guest'.label '$guest_name': Active'
echo 'mem_active_'$guest'.type GAUGE'
echo 'mem_inactive_'$guest'.label '$guest_name': Inactive'
echo 'mem_inactive_'$guest'.type GAUGE'
done
fi
exit 0 exit 0
fi fi