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

_mem should use FB memory used, only

Browse Source 
NVIDIA 6 added differentiation between FB and BAR1 memory - use nvidia_gpu_mem for FB Memory *only* since its definition fits better with the usage prior to BAR1 memory.
This commit is contained in:
leeclemens 2014-05-04 12:46:40 -04:00
parent e4ef822e5c
commit 61f058fce9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/gpu/nvidia_gpu_
View File

@ -127,7 +127,7 @@ if [ "$1" = "config" ]; then
;; ;;
mem) mem)
# First determine total memory of each GPU... # First determine total memory of each GPU...
gpusTotalMemOutput=`echo "$smiOutput" | grep -A 3 "Memory Usage" | grep "Total" | cut -d : -f 2 | tr -d ' '` gpusTotalMemOutput=`echo "$smiOutput" | grep -A 3 "FB Memory Usage" | grep "Total" | cut -d : -f 2 | tr -d ' '`
gpusTotalMem='' gpusTotalMem=''
nGpusCounter=0 nGpusCounter=0
while [ $nGpusCounter -lt $nGpus ] while [ $nGpusCounter -lt $nGpus ]
@ -146,7 +146,7 @@ if [ "$1" = "config" ]; then
echo 'graph_args -l 0 -u 100' echo 'graph_args -l 0 -u 100'
echo 'graph_vlabel Percentage' echo 'graph_vlabel Percentage'
echo 'graph_category gpu' echo 'graph_category gpu'
echo "graph_info Memory usage for NVIDIA GPUs using driver version $driverVersion (total memory is $gpusTotalMem)" echo "graph_info FB Memory usage for NVIDIA GPUs using driver version $driverVersion (total memory is $gpusTotalMem)"
;; ;;
fan) fan)
echo 'graph_title GPU fan speed' echo 'graph_title GPU fan speed'
@ -189,8 +189,8 @@ case $name in
valueGpus=`echo "$smiOutput" | grep -A 1 "Temperature" | grep "Gpu" | cut -d : -f 2 | cut -d ' ' -f 2` valueGpus=`echo "$smiOutput" | grep -A 1 "Temperature" | grep "Gpu" | cut -d : -f 2 | cut -d ' ' -f 2`
;; ;;
mem) mem)
totalMemGpus=`echo "$smiOutput" | grep -A 3 "Memory Usage" | grep "Total" | cut -d : -f 2 | cut -d ' ' -f 2` totalMemGpus=`echo "$smiOutput" | grep -A 3 "FB Memory Usage" | grep "Total" | cut -d : -f 2 | cut -d ' ' -f 2`
usedMemGpus=`echo "$smiOutput" | grep -A 3 "Memory Usage" | grep "Used" | cut -d : -f 2 | cut -d ' ' -f 2` usedMemGpus=`echo "$smiOutput" | grep -A 3 "FB Memory Usage" | grep "Used" | cut -d : -f 2 | cut -d ' ' -f 2`
valueGpus='' valueGpus=''
nGpusCounter=0 nGpusCounter=0
while [ $nGpusCounter -lt $nGpus ] while [ $nGpusCounter -lt $nGpus ]