Your message dated Sat, 31 Jul 2021 15:45:15 +0000
with message-id <[email protected]>
and subject line unblock prometheus-node-exporter
has caused the Debian Bug report #991601,
regarding unblock: prometheus-node-exporter/1.1.2+ds-2.1
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.)
--
991601: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=991601
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package prometheus-node-exporter
* Add upstream fix for rapl collector log noise with the bullseye kernel.
(Closes: #991160)
autopkgtest for prometheus-node-exporter/1.1.2+ds-2.1: amd64: Pass, arm64:
Pass, armhf: Pass, i386: Pass, ppc64el: Pass
unblock prometheus-node-exporter/1.1.2+ds-2.1
diff -Nru prometheus-node-exporter-1.1.2+ds/debian/changelog
prometheus-node-exporter-1.1.2+ds/debian/changelog
--- prometheus-node-exporter-1.1.2+ds/debian/changelog 2021-05-28
01:59:42.000000000 +0300
+++ prometheus-node-exporter-1.1.2+ds/debian/changelog 2021-07-26
00:22:06.000000000 +0300
@@ -1,3 +1,11 @@
+prometheus-node-exporter (1.1.2+ds-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for rapl collector log noise with the bullseye kernel.
+ (Closes: #991160)
+
+ -- Adrian Bunk <[email protected]> Mon, 26 Jul 2021 00:22:06 +0300
+
prometheus-node-exporter (1.1.2+ds-2) unstable; urgency=medium
* Move README.textfile from /var/lib to /usr/share/doc
diff -Nru
prometheus-node-exporter-1.1.2+ds/debian/patches/0001-Fix-rapl-collector-log-noise.patch
prometheus-node-exporter-1.1.2+ds/debian/patches/0001-Fix-rapl-collector-log-noise.patch
---
prometheus-node-exporter-1.1.2+ds/debian/patches/0001-Fix-rapl-collector-log-noise.patch
1970-01-01 02:00:00.000000000 +0200
+++
prometheus-node-exporter-1.1.2+ds/debian/patches/0001-Fix-rapl-collector-log-noise.patch
2021-07-26 00:21:43.000000000 +0300
@@ -0,0 +1,32 @@
+From 2c351d13bd834e387b875d972cf9aedc1fd89274 Mon Sep 17 00:00:00 2001
+From: Ben Kochie <[email protected]>
+Date: Wed, 21 Jul 2021 19:28:54 +0200
+Subject: Fix rapl collector log noise
+
+Capture permission denied error for "energy_uj" file.
+
+Fixes: https://github.com/prometheus/node_exporter/issues/1892
+
+Signed-off-by: Ben Kochie <[email protected]>
+---
+ collector/rapl_linux.go | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/collector/rapl_linux.go b/collector/rapl_linux.go
+index a0f9011..b73c0dd 100644
+--- a/collector/rapl_linux.go
++++ b/collector/rapl_linux.go
+@@ -70,6 +70,10 @@ func (c *raplCollector) Update(ch chan<- prometheus.Metric)
error {
+ for _, rz := range zones {
+ newMicrojoules, err := rz.GetEnergyMicrojoules()
+ if err != nil {
++ if errors.Is(err, os.ErrPermission) {
++ level.Debug(c.logger).Log("msg", "Can't access
energy_uj file", "zone", rz, "err", err)
++ return ErrNoData
++ }
+ return err
+ }
+ index := strconv.Itoa(rz.Index)
+--
+2.20.1
+
diff -Nru prometheus-node-exporter-1.1.2+ds/debian/patches/series
prometheus-node-exporter-1.1.2+ds/debian/patches/series
--- prometheus-node-exporter-1.1.2+ds/debian/patches/series 2021-02-26
00:49:19.000000000 +0200
+++ prometheus-node-exporter-1.1.2+ds/debian/patches/series 2021-07-26
00:22:06.000000000 +0300
@@ -1,2 +1,3 @@
02-Properly_disable_zfs.patch
03-Default_settings.patch
+0001-Fix-rapl-collector-log-noise.patch
--- End Message ---
--- Begin Message ---
Unblocked.
--- End Message ---
