Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ledeuns authored Jan 30, 2024
2 parents b726b52 + 34467b1 commit bdf9458
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
machine:
image: ubuntu-2204:current
environment:
DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.18-base
DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.21-base
REPO_PATH: github.com/prometheus/node_exporter
steps:
- prometheus/setup_environment
Expand Down
2 changes: 1 addition & 1 deletion collector/exec_bsd.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ func NewExecCollector(logger log.Logger) (Collector, error) {
name: "exec_system_calls_total",
description: "System calls since system boot. Resets at architecture unsigned integer.",
mib: "vm.stats.sys.v_syscall",
labels: nil,
},
labels: nil,
{
name: "exec_device_interrupts_total",
description: "Device interrupts since system boot. Resets at architecture unsigned integer.",
Expand Down
5 changes: 3 additions & 2 deletions collector/timex.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ const (
// 1 second in
nanoSeconds = 1000000000
microSeconds = 1000000

// See NOTES in adjtimex(2).
ppm16frac = 1000000.0 * 65536.0
)

type timexCollector struct {
Expand Down Expand Up @@ -183,8 +186,6 @@ func (c *timexCollector) Update(ch chan<- prometheus.Metric) error {
} else {
divisor = microSeconds
}
// See NOTES in adjtimex(2).
const ppm16frac = 1000000.0 * 65536.0

ch <- c.syncStatus.mustNewConstMetric(syncStatus)
ch <- c.offset.mustNewConstMetric(float64(timex.Offset) / divisor)
Expand Down

0 comments on commit bdf9458

Please sign in to comment.