Your message dated Mon, 31 Oct 2016 21:24:12 +0000
with message-id <[email protected]>
and subject line Bug#825136: fixed in munin 2.0.27-1
has caused the Debian Bug report #825136,
regarding patch to get ACPI thermal zones from /sys
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
825136: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825136
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: munin-plugins-core
Version: 2.0.25-1
Severity: normal
Tags: upstream patch
Hi,
As the subject says; I'm including a patch to get ACPI thermal
zones from /sys, as this is the current interface for modern
kernels (I don't have a single machine where the old one is
supported anymore). Also means non-ACPI machines like ARM
single-board computers are supported.
-- System Information:
Debian Release: 8.4
APT prefers stable
APT policy: (750, 'stable'), (500, 'proposed-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0 (SMP w/40 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages munin-plugins-core depends on:
ii munin-common 2.0.25-1
ii perl 5.20.2-3+deb8u4
Versions of packages munin-plugins-core recommends:
ii libnet-snmp-perl 6.0.1-2
Versions of packages munin-plugins-core suggests:
pn conntrack <none>
pn libcache-cache-perl <none>
ii libdbd-mysql-perl 4.028-2+b1
ii libnet-dns-perl 0.81-2
pn libnet-netmask-perl <none>
ii libnet-telnet-perl 3.04-1
ii libxml-parser-perl 2.41-3
ii python 2.7.9-1
ii ruby 1:2.1.5+deb8u2
ii ruby1.9.1 [ruby-interpreter] 1.9.3.194-8.1+deb7u3
ii ruby2.1 [ruby-interpreter] 2.1.5-2+deb8u2
-- no debconf information
>From 724d90f600bdd5c91736a54b80641a2110c403e4 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <[email protected]>
Date: Tue, 24 May 2016 00:53:10 +0200
Subject: [PATCH 1/1] Update acpi plugin to use the /sys interface.
This is pretty universal now; none of my machines even have
thermal zones in /proc/acpi anymore, but all of them have
them in /sys, which has a much more uniform interface anyway.
As an extra bonus (and the original motivation for the patch),
allows the plugin to understand non-ACPI thermal zones, e.g.
on my ARM SBC, which doesn't have ACPI at all, but has thermal
sensors for both CPU and GPU.
---
plugins/node.d.linux/acpi.in | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/plugins/node.d.linux/acpi.in b/plugins/node.d.linux/acpi.in
index 95ce21c..e64e283 100644
--- a/plugins/node.d.linux/acpi.in
+++ b/plugins/node.d.linux/acpi.in
@@ -13,7 +13,7 @@ Linux systems with ACPI support.
=head1 CONFIGURATION
-Load the 'thermal_zone' kernel module and the plugin gets the thermal zones from /proc/acpi/thermal_zones/*/ automagically.
+Load the 'thermal' kernel module and the plugin gets the thermal zones from /sys/class/thermal/thermal_zone*/ automagically.
=head1 USAGE
@@ -47,33 +47,31 @@ GPLv2
=cut
-ATZ="$(echo /proc/acpi/thermal_zone/*/temperature)"
+ATZ="$(echo /sys/class/thermal/thermal_zone*)"
do_ () { # Fetch
- echo "$ATZ" | tr ' ' '\n' | awk -F'[ /\t]*' '{
- ZONE=$5
- getline < $0
- print ZONE".value "$2
- }'
+ for ZONE in $ATZ; do
+ TEMP=`cat $ZONE/temp`
+ echo `basename $ZONE`.value `echo $TEMP \* 0.001 | bc`
+ done
exit 0
}
do_config () {
echo "graph_title ACPI Thermal zone temperatures"
- echo "graph_vlabel Celcius"
+ echo "graph_vlabel Celsius"
echo "graph_category sensors"
echo "graph_info This graph shows the temperature in different ACPI Thermal zones. If there is only one it will usually be the case temperature."
- echo "$ATZ" |
- awk -F'[ /]' '{
- print $5".label "$5;
- }'
-
+ for ZONE in $ATZ; do
+ TYPE=`cat $ZONE/type`
+ echo `basename $ZONE`.label $TYPE
+ done
}
do_autoconf () {
for f in $ATZ; do
- test -r $f || {
- echo "no (cannot read $f)"
+ test -r $f/temp || {
+ echo "no (cannot read $f/temp)"
exit 0
}
done
--
2.8.0.rc3.226.g39d4020
--- End Message ---
--- Begin Message ---
Source: munin
Source-Version: 2.0.27-1
We believe that the bug you reported is fixed in the latest version of
munin, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Holger Levsen <[email protected]> (supplier of updated munin package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Mon, 31 Oct 2016 21:59:54 +0100
Source: munin
Binary: munin-node munin-plugins-core munin-plugins-extra munin-plugins-java
munin munin-common munin-async munin-doc
Architecture: source
Version: 2.0.27-1
Distribution: unstable
Urgency: medium
Maintainer: Munin Debian Maintainers <[email protected]>
Changed-By: Holger Levsen <[email protected]>
Description:
munin - network-wide graphing framework (grapher/gatherer)
munin-async - network-wide graphing framework (async master/client)
munin-common - network-wide graphing framework (common)
munin-doc - network-wide graphing framework (documentation)
munin-node - network-wide graphing framework (node)
munin-plugins-core - network-wide graphing framework (plugins for node)
munin-plugins-extra - network-wide graphing framework (user contributed
plugins for nod
munin-plugins-java - network-wide graphing framework (java plugins for node)
Closes: 767032 768553 825136 834194
Changes:
munin (2.0.27-1) unstable; urgency=medium
.
* New upstream version, (Closes: #767032, #768553, #825136, #834194), see
upstream ChangeLog for details.
Checksums-Sha1:
b8884b5493620efe611b47a59acc468aeb00da9d 2484 munin_2.0.27-1.dsc
eb4b13a5478cb78f5f250fbc6161e021888f8872 1340502 munin_2.0.27.orig.tar.gz
075f05a7c4a1aaa0a5ebb7f6f6d62ac94d22b0df 61436 munin_2.0.27-1.debian.tar.xz
Checksums-Sha256:
64f83675a720d276c0d2295810952a5b0efa7793bb97a276606dd511c9c17071 2484
munin_2.0.27-1.dsc
78f832bf1494815833459923cbfc8f41d47765cb5667c4e5c33f461aec15417c 1340502
munin_2.0.27.orig.tar.gz
6251d99a690fe5a643b3e1dfe7161c348731dd8d7b9337256d472db70200f12b 61436
munin_2.0.27-1.debian.tar.xz
Files:
df2b44f752d32ac9f112c0d7cc5338b8 2484 net optional munin_2.0.27-1.dsc
bd6a75cb48335c5a7abc6f84dea9d2ca 1340502 net optional munin_2.0.27.orig.tar.gz
0496826738d308b84378c1f395f87c1a 61436 net optional
munin_2.0.27-1.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIVAwUBWBex1gkauFYGmqocAQodVhAAqzsjRFzrAlk3KzpSmz/xCgzXrjT2EN27
MRtKz8EXl9wY7/4hVK8LXkQP8eJuDPZmjar6pJ0Ifh4M3D6ltg0P/2zhhuK+6CHF
2oN/2S9qe+wDBBywZu8FrvYl5rwFn6/QlI60lWJX5Q8+M2TbzUB28IZ5GOndRgnQ
MR5ebxMEuU7Jxo402WF8QyqDUhS4TiFZsb7Kg6+IAzpJhLU6WI/pksfUAu+uhH8Z
6tqe9MgiANn2C5UpjkkYsEdxEEQtMxlPEez4Y0zE5Hz0j1wggwOMAXHjCZ6GNRjD
NQYQgfDxWrg6IfOqoZAkYKy+0LUxuQlTohWdaHo4IfaaJVxOuDVl3o1RqQ5aRAxz
Y9yqhMdn/K46SFAszlGafG8PgP700P2WJJ2SSC0GZ6JT6rc6+K1VHE9FLJtpYVUM
ItA9hEEd/sFcYpvTZm0MPtiGs4gO1/ENGYZJYu/ghujBm8y5E7t/aRAT+b075g+s
dIrjTkbPRHZpQUNwWJ/Mbnq/JITrEhWG5RQqeca+Zl/O/JvXk5OMtVMSZrs9ThnV
zqHVFyq02yhngWBB9RKHd8e6jVflYtIwZp9xg1IEF7AOJERQDnYDnmQf9g2ZR26a
ZVvpIeKsiIvB6rLyblvwh8lecmM0SxpQOaO9vH5SvHXNPlrXCH0fcUP+mKawHlLz
addMham9XTU=
=y/gS
-----END PGP SIGNATURE-----
--- End Message ---
