Fix unit -u option
Also clean the code
This commit is contained in:
parent
8e657a28b4
commit
e12c362f7b
23
kvmstats
23
kvmstats
|
@ -1,9 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
set -e -u
|
set -e
|
||||||
|
|
||||||
usage () {
|
usage () {
|
||||||
echo 'usage: kvmstats.sh [-a] [-u K|M|G]'
|
echo 'usage: kvmstats [-a] [-u k|m|g]' >&2
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,25 +11,24 @@ for DEP in bc virsh
|
||||||
do
|
do
|
||||||
if [ -z "$(which $DEP)" ]
|
if [ -z "$(which $DEP)" ]
|
||||||
then
|
then
|
||||||
echo "kvmstats.sh: $DEP not found in \$PATH" 1>&2
|
echo "kvmstats: $DEP not found in \$PATH" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
SHOW_AVAIL=''
|
|
||||||
POW=$(echo 1024 ^ 3 | bc)
|
POW=$(echo 1024 ^ 3 | bc)
|
||||||
while [ $# -ne 0 ] && echo "$1" | grep -q '^-[[:alnum:]]'
|
while [ $# -ne 0 ] && echo "$1" | grep -q '^-[[:alnum:]]'
|
||||||
do
|
do
|
||||||
case $1 in
|
case $1 in
|
||||||
'-u')
|
'-u')
|
||||||
case $2 in
|
case $2 in
|
||||||
'K')
|
'k')
|
||||||
POW=$(echo 1024 ^ 1 | bc)
|
POW=$(echo 1024 ^ 1 | bc)
|
||||||
;;
|
;;
|
||||||
'M')
|
'm')
|
||||||
POW=$(echo 1024 ^ 2 | bc)
|
POW=$(echo 1024 ^ 2 | bc)
|
||||||
;;
|
;;
|
||||||
'G')
|
'g')
|
||||||
POW=$(echo 1024 ^ 3 | bc)
|
POW=$(echo 1024 ^ 3 | bc)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -45,17 +44,15 @@ do
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
# since libvirt seems to store memoy in KiB, POW must be lowered by 1
|
|
||||||
POW=$((POW / 1024))
|
|
||||||
|
|
||||||
for VM in $(virsh list --name --all)
|
for VM in $(virsh list --name --all)
|
||||||
do
|
do
|
||||||
CPU=$(virsh vcpucount --maximum --current "$VM")
|
CPU=$(virsh vcpucount --maximum --current "$VM")
|
||||||
RAM=$(virsh domstats --balloon "$VM" | awk 'BEGIN { FS="=" } /balloon.maximum/ { print $2 / 1024 ^ 2 }')
|
# libvirt store memoy in KiB, POW must be lowered by 1
|
||||||
|
RAM=$(virsh domstats --balloon "$VM" | awk 'BEGIN { FS="=" } /balloon.maximum/ { print $2 / '$((POW / 1024))'}')
|
||||||
DSK=$(for BLK in $(virsh domblklist "$VM" | sed '1,2d;/-$/d;/^$/d' | cut -d\ -f1)
|
DSK=$(for BLK in $(virsh domblklist "$VM" | sed '1,2d;/-$/d;/^$/d' | cut -d\ -f1)
|
||||||
do
|
do
|
||||||
virsh domblkinfo "$VM" "$BLK"
|
virsh domblkinfo "$VM" "$BLK"
|
||||||
done | awk '/Physical:/ { size += $2 } END { print int(size / 1024 ^ 3) }')
|
done | awk '/Physical:/ { size += $2 } END { print int(size / '${POW}') }')
|
||||||
RUN=$(virsh domstate "$VM" | grep -q '^running$' && echo yes || echo no)
|
RUN=$(virsh domstate "$VM" | grep -q '^running$' && echo yes || echo no)
|
||||||
echo "$VM" "$CPU" "$RAM" "$DSK" "$RUN"
|
echo "$VM" "$CPU" "$RAM" "$DSK" "$RUN"
|
||||||
done | (
|
done | (
|
||||||
|
@ -64,7 +61,7 @@ done | (
|
||||||
if [ "$SHOW_AVAIL" ]
|
if [ "$SHOW_AVAIL" ]
|
||||||
then
|
then
|
||||||
AV_CPU=$(awk '/^processor/ { cpu++ } END { print cpu }' /proc/cpuinfo)
|
AV_CPU=$(awk '/^processor/ { cpu++ } END { print cpu }' /proc/cpuinfo)
|
||||||
AV_MEM=$(awk '/^MemTotal:/ { print int($2 / 1024 ^ 2) }' /proc/meminfo)
|
AV_MEM=$(awk '/^MemTotal:/ { print int($2 / '$((POW / 1024))' ) }' /proc/meminfo)
|
||||||
echo AVAILABLE "$AV_CPU" "$AV_MEM"
|
echo AVAILABLE "$AV_CPU" "$AV_MEM"
|
||||||
fi
|
fi
|
||||||
) | column -t
|
) | column -t
|
||||||
|
|
Loading…
Reference in a new issue