Accepting request 922151 from server:monitoring

OBS-URL: https://build.opensuse.org/request/show/922151 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/golang-github-prometheus-node_exporter?expand=0&rev=8
2021-09-29 18:19:11 +00:00
parent 9a966a3d42 0eab55bd8d
commit 2d52de8ec9
3 changed files with 40 additions and 0 deletions
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 23 09:43:19 UTC 2021 - Patrick Seidensal <pseidensal@suse.com>
+
+- 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
+
 -------------------------------------------------------------------
 Tue Mar  9 14:02:29 UTC 2021 - Witek Bedyk <witold.bedyk@suse.com>

@@ -30,6 +30,7 @@ Source:         node_exporter-%{version}.tar.gz
 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 @@ getent passwd prometheus >/dev/null || %{_sbindir}/useradd -r -g prometheus -d %
 %post
 %service_add_post prometheus-node_exporter.service
 %fillup_only -n prometheus-node_exporter
+
 %preun
 %service_del_preun prometheus-node_exporter.service

@@ -0,0 +1,31 @@
+From 502f287c960f910eb4cc019ff6b8a877cfa15f5d Mon Sep 17 00:00:00 2001
+From: Ben Kochie <superq@gmail.com>
+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 <superq@gmail.com>
+---
+ 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)