2
0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00

Merge pull request #714 from inbaz/master

fixed naming for multiple GPUs in amd_gpu_; adjusted lower limit for …
This commit is contained in:
sumpfralle 2018-03-09 02:46:10 +01:00 committed by GitHub
commit 99040569e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -109,14 +109,14 @@ if [ "$1" = "config" ]; then
case $name in case $name in
temp) temp)
echo 'graph_title GPU temperature' echo 'graph_title GPU temperature'
echo 'graph_args -l 0 -u 120' echo 'graph_args -l 20 -u 120'
echo 'graph_vlabel Degrees (C)' echo 'graph_vlabel Degrees (C)'
echo 'graph_category sensors' echo 'graph_category sensors'
echo "graph_info Temperature information for AMD GPUs" echo "graph_info Temperature information for AMD GPUs"
nGpusCounter=0 nGpusCounter=0
while [ $nGpusCounter -lt $nGpus ] while [ $nGpusCounter -lt $nGpus ]
do do
gpuName=`echo "$nGpusOutput" | grep "* 0" | cut -f 1,3 --complement -d " "` gpuName=`echo "$nGpusOutput" | grep "\ $nGpusCounter\.\ " | cut -f 3 -d "." | sed -r 's/^[0-9]+\ //'`
echo "temp${nGpusCounter}.warning ${warning:-75}" echo "temp${nGpusCounter}.warning ${warning:-75}"
echo "temp${nGpusCounter}.critical ${critical:-95}" echo "temp${nGpusCounter}.critical ${critical:-95}"
echo "temp${nGpusCounter}.info Temperature information for $gpuName" echo "temp${nGpusCounter}.info Temperature information for $gpuName"
@ -143,7 +143,7 @@ if [ "$1" = "config" ]; then
nGpusCounter=0 nGpusCounter=0
while [ $nGpusCounter -lt $nGpus ] while [ $nGpusCounter -lt $nGpus ]
do do
gpuName=`echo "$nGpusOutput" | grep "* 0" | cut -f 1,3 --complement -d " "` gpuName=`echo "$nGpusOutput" | grep "\ $nGpusCounter\.\ " | cut -f 3 -d "." | sed -r 's/^[0-9]+\ //'`
echo "memclock${nGpusCounter}.info Memory clock information for $gpuName" echo "memclock${nGpusCounter}.info Memory clock information for $gpuName"
echo "memclock${nGpusCounter}.label Memory clock ($gpuName)" echo "memclock${nGpusCounter}.label Memory clock ($gpuName)"
echo "coreclock${nGpusCounter}.info Core clock information for $gpuName" echo "coreclock${nGpusCounter}.info Core clock information for $gpuName"
@ -160,7 +160,7 @@ if [ "$1" = "config" ]; then
nGpusCounter=0 nGpusCounter=0
while [ $nGpusCounter -lt $nGpus ] while [ $nGpusCounter -lt $nGpus ]
do do
gpuName=`echo "$nGpusOutput" | grep "* 0" | cut -f 1,3 --complement -d " "` gpuName=`echo "$nGpusOutput" | grep "\ $nGpusCounter\.\ " | cut -f 3 -d "." | sed -r 's/^[0-9]+\ //'`
echo "fan${nGpusCounter}.info Fan speed information for $gpuName" echo "fan${nGpusCounter}.info Fan speed information for $gpuName"
echo "fan${nGpusCounter}.label Fan speed ($gpuName)" echo "fan${nGpusCounter}.label Fan speed ($gpuName)"
: $(( nGpusCounter = $nGpusCounter + 1 )) : $(( nGpusCounter = $nGpusCounter + 1 ))
@ -175,7 +175,7 @@ if [ "$1" = "config" ]; then
nGpusCounter=0 nGpusCounter=0
while [ $nGpusCounter -lt $nGpus ] while [ $nGpusCounter -lt $nGpus ]
do do
gpuName=`echo "$nGpusOutput" | grep "* 0" | cut -f 1,3 --complement -d " "` gpuName=`echo "$nGpusOutput" | grep "\ $nGpusCounter\.\ " | cut -f 3 -d "." | sed -r 's/^[0-9]+\ //'`
echo "load${nGpusCounter}.info Load information for $gpuName" echo "load${nGpusCounter}.info Load information for $gpuName"
echo "load${nGpusCounter}.label Load ($gpuName)" echo "load${nGpusCounter}.label Load ($gpuName)"
: $(( nGpusCounter = $nGpusCounter + 1 )) : $(( nGpusCounter = $nGpusCounter + 1 ))
@ -189,7 +189,7 @@ if [ "$1" = "config" ]; then
nGpusCounter=0 nGpusCounter=0
while [ $nGpusCounter -lt $nGpus ] while [ $nGpusCounter -lt $nGpus ]
do do
gpuName=`echo "$nGpusOutput" | grep "* 0" | cut -f 1,3 --complement -d " "` gpuName=`echo "$nGpusOutput" | grep "\ $nGpusCounter\.\ " | cut -f 3 -d "." | sed -r 's/^[0-9]+\ //'`
echo "vcore${nGpusCounter}.info Vcore information for $gpuName" echo "vcore${nGpusCounter}.info Vcore information for $gpuName"
echo "vcore${nGpusCounter}.label Core voltage ($gpuName)" echo "vcore${nGpusCounter}.label Core voltage ($gpuName)"
: $(( nGpusCounter = $nGpusCounter + 1 )) : $(( nGpusCounter = $nGpusCounter + 1 ))