Date: Tue, 8 Feb 2011 15:01:33 +0900 (JST) From: Hiroki (REO) Kashiwazaki <reo@iic.hokudai.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Cc: reo@noc.geidai.ac.jp Subject: ports/154584: [PATCH] ports sysutils/munin temperature plugins problem Message-ID: <201102080601.p1861Xra022595@genki01.iic.hokudai.ac.jp> Resent-Message-ID: <201102080640.p186eBKM088674@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154584
>Category: ports
>Synopsis: [PATCH] ports sysutils/munin temperature plugins problem
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 08 06:40:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Hiroki (REO) Kashiwazaki
>Release: FreeBSD 8.1-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD bareares.iic.hokudai.ac.jp 8.1-RELEASE FreeBSD 8.1-RELEASE #0: M
on Jul 19 02:36:49 UTC 2010 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENE
RIC amd64
>Description:
Plugins files which is installed by ports sysutils/munin-node go wrong.
The files are coretemp and dev_cpu_.
Multiple temperature information are outputed in a line on multicore CPU.
By fixing tr command options, this problem will be get fixed.
>How-To-Repeat:
~% cd /usr/local/share/munin/plugins
/usr/local/share/munin/plugins% sudo -u nobody ./coretemp
CPU0.value 55.0CPU1.value 55.0CPU2.value 54.0CPU3.value 54.0CPU4.value 56.0CPU5.
value 56.0CPU6.value 54.0CPU7.value 54.0CPU8.value 55.0CPU9.value 55.0CPU10.valu
e 54.0CPU11.value 54.0CPU12.value 52.0CPU13.value 53.0CPU14.value 54.0CPU15.valu
e 54.0%
/usr/local/share/munin/plugins% sudo patch -p0 < coretemp.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- coretemp 2011-02-08 14:37:15.202635359 +0900
|+++ coretemp.new 2011-02-08 14:37:23.732894373 +0900
--------------------------
Patching file coretemp using Plan A...
Hunk #1 succeeded at 75.
done
/usr/local/share/munin/plugins% cat coretemp.patch
--- coretemp 2011-02-08 14:37:15.202635359 +0900
+++ coretemp.new 2011-02-08 14:37:23.732894373 +0900
@@ -75,7 +75,7 @@
reqcpus
for cpu in $cpus ; do
echo -n "CPU$cpu.value "
- sysctl -n dev.cpu.$cpu.temperature | tr -cd '0-9.'
+ sysctl -n dev.cpu.$cpu.temperature | tr -d C
done
}
/usr/local/share/munin/plugins% sudo -u nobody ./coretemp
CPU0.value 55.0
CPU1.value 55.0
CPU2.value 54.0
CPU3.value 54.0
CPU4.value 56.0
CPU5.value 56.0
CPU6.value 54.0
CPU7.value 54.0
CPU8.value 54.0
CPU9.value 55.0
CPU10.value 54.0
CPU11.value 54.0
CPU12.value 52.0
CPU13.value 52.0
CPU14.value 54.0
CPU15.value 54.0
>Fix:
Patches to the /usr/ports/sysutils/munin-node/files will fix this problems.
/usr/ports/sysutils/munin-node/files% diff -u patch-node-node.d.freebsd-coretemp
.diff.org patch-node-node.d.freebsd-coretemp.diff
--- patch-node-node.d.freebsd-coretemp.diff.org 2011-02-08 14:22:37.205571766 +0
900
+++ patch-node-node.d.freebsd-coretemp.diff 2011-02-08 13:07:07.976016334 +0
900
@@ -5,7 +5,7 @@
for cpu in $cpus ; do
echo -n "CPU$cpu.value "
- sysctl -n dev.cpu.$cpu.temperature
-+ sysctl -n dev.cpu.$cpu.temperature | tr -cd '0-9.'
++ sysctl -n dev.cpu.$cpu.temperature | tr -d C
done
}
/usr/ports/sysutils/munin-node/files% diff -u patch-node-node.d.freebsd-dev_cpu_
.diff.org patch-node-node.d.freebsd-dev_cpu_.diff
--- patch-node-node.d.freebsd-dev_cpu_.diff.org 2011-02-08 14:23:09.910914205 +0
900
+++ patch-node-node.d.freebsd-dev_cpu_.diff 2011-02-08 13:07:25.234272341 +0
900
@@ -5,7 +5,7 @@
for cpu in $cpus ; do
echo -n "CPU$cpu.value "
- sysctl -n "dev.cpu.$cpu.$func"
-+ sysctl -n "dev.cpu.$cpu.$func" | tr -cd '0-9.'
++ sysctl -n "dev.cpu.$cpu.$func" | tr -d C
done
}
EOL
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102080601.p1861Xra022595>