mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-12-30 07:59:53 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1938 from prometheus/superq/timex_error

Browse source 
Handle EPERM for syscall in timex collector
This commit is contained in:
Ben Kochie 2021-01-23 18:20:07 +01:00 committed by GitHub
parent cfdd9dd0c9 1d03daf616
commit 87993cdd7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -6,6 +6,7 @@
* [ENHANCEMENT] Include TCP OutRsts in netstat metrics * [ENHANCEMENT] Include TCP OutRsts in netstat metrics
* [ENHANCEMENT] Added XFS inode operations to XFS metrics * [ENHANCEMENT] Added XFS inode operations to XFS metrics
* [ENHANCEMENT] Remove CGO dependencies for OpenBSD amd64 * [ENHANCEMENT] Remove CGO dependencies for OpenBSD amd64
* [BUGFIX] Handle EPERM for syscall in timex collector
* [BUGFIX] * [BUGFIX]
## 1.0.1 / 2020-06-15 ## 1.0.1 / 2020-06-15

7
collector/timex.go
View file

@ -17,9 +17,12 @@
package collector package collector
import ( import (
"errors"
"fmt" "fmt"
"os"
"github.com/go-kit/kit/log" "github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
@ -163,6 +166,10 @@ func (c *timexCollector) Update(ch chan<- prometheus.Metric) error {
status, err := unix.Adjtimex(timex) status, err := unix.Adjtimex(timex)
if err != nil { if err != nil {
if errors.Is(err, os.ErrPermission) {
level.Debug(c.logger).Log("msg", "Not collecting timex metrics", "err", err)
return ErrNoData
}
return fmt.Errorf("failed to retrieve adjtimex stats: %w", err) return fmt.Errorf("failed to retrieve adjtimex stats: %w", err)
} }