Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package
golang-github-prometheus-node_exporter for openSUSE:Factory checked in at
2021-09-29 20:19:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/golang-github-prometheus-node_exporter
(Old)
and
/work/SRC/openSUSE:Factory/.golang-github-prometheus-node_exporter.new.1899
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-github-prometheus-node_exporter"
Wed Sep 29 20:19:11 2021 rev:8 rq:922151 version:1.1.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/golang-github-prometheus-node_exporter/golang-github-prometheus-node_exporter.changes
2021-03-28 11:56:50.168249128 +0200
+++
/work/SRC/openSUSE:Factory/.golang-github-prometheus-node_exporter.new.1899/golang-github-prometheus-node_exporter.changes
2021-09-29 20:20:41.923143713 +0200
@@ -1,0 +2,7 @@
+Thu Sep 23 09:43:19 UTC 2021 - Patrick Seidensal <[email protected]>
+
+- Apply patch to capture permission denied error for "energy_uj" file
(bsc#1190535)
+ * Adds patch capture-permission-denied-error-energy_uj.patch
+ from https://github.com/prometheus/node_exporter/pull/2092
+
+-------------------------------------------------------------------
New:
----
capture-permission-denied-error-energy_uj.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ golang-github-prometheus-node_exporter.spec ++++++
--- /var/tmp/diff_new_pack.wzZiWc/_old 2021-09-29 20:20:42.607144705 +0200
+++ /var/tmp/diff_new_pack.wzZiWc/_new 2021-09-29 20:20:42.611144711 +0200
@@ -30,6 +30,7 @@
Source1: vendor.tar.gz
Source2: prometheus-node_exporter.service
Source4: prometheus-node_exporter.sysconfig
+Patch0: capture-permission-denied-error-energy_uj.patch
BuildRequires: fdupes
BuildRequires: golang-packaging
BuildRequires: golang(API) = 1.14
@@ -71,6 +72,7 @@
%post
%service_add_post prometheus-node_exporter.service
%fillup_only -n prometheus-node_exporter
+
%preun
%service_del_preun prometheus-node_exporter.service
++++++ capture-permission-denied-error-energy_uj.patch ++++++
>From 502f287c960f910eb4cc019ff6b8a877cfa15f5d Mon Sep 17 00:00:00 2001
From: Ben Kochie <[email protected]>
Date: Wed, 21 Jul 2021 19:28:54 +0200
Subject: [PATCH] Fix rapl collector log noise
References: https://github.com/prometheus/node_exporter/pull/2092 (bsc#1190535)
Upstream: submitted
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 a0f90119b..b73c0dd83 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)
