From b390009b6798b2ad63cf9a0dfb098bbda41507f6 Mon Sep 17 00:00:00 2001 From: Lachezar Kemanov Date: Tue, 13 Oct 2026 10:23:50 +0300 Subject: [PATCH 1/5] RED-218668 bump dependencies versions --- .github/workflows/bsd.yml | 2 +- go.mod | 12 ++++++------ go.sum | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index 7ca7ac48d4..836519bd92 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -13,7 +13,7 @@ permissions: env: GNU_TAR_VERSION: "1.35" - GO_VERSION: "1.26.3" + GO_VERSION: "1.26.9" # To spin up one of the VMs below, see the "Debug Shell" section here: https://github.com/vmactions jobs: diff --git a/go.mod b/go.mod index ab002cfa20..5562105ffa 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/prometheus/node_exporter -go 1.26.3 +go 1.26.9 require ( github.com/alecthomas/kingpin/v2 v2.4.0 @@ -27,7 +27,7 @@ require ( github.com/prometheus/exporter-toolkit v0.15.1 github.com/prometheus/procfs v0.20.1 github.com/safchain/ethtool v0.7.0 - golang.org/x/sys v0.45.0 + golang.org/x/sys v0.48.0 howett.net/plist v1.0.1 ) @@ -53,11 +53,11 @@ require ( go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect - golang.org/x/crypto v0.52.0 // indirect - golang.org/x/net v0.55.0 // indirect + golang.org/x/crypto v0.57.0 // indirect + golang.org/x/net v0.60.0 // indirect golang.org/x/oauth2 v0.34.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/text v0.37.0 // indirect + golang.org/x/sync v0.23.0 // indirect + golang.org/x/text v0.42.0 // indirect golang.org/x/time v0.14.0 // indirect google.golang.org/protobuf v1.36.11 // indirect ) diff --git a/go.sum b/go.sum index 3bb7b5b920..814a784441 100644 --- a/go.sum +++ b/go.sum @@ -117,20 +117,20 @@ go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= -golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= -golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= +golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= +golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= +golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU= +golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw= golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= -golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= +golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20211031064116-611d5d643895/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= +golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= +golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= From 986612dbc0325bf0cec24314db206a49ea375e19 Mon Sep 17 00:00:00 2001 From: Lachezar Kemanov Date: Tue, 13 Oct 2026 13:13:57 +0300 Subject: [PATCH 2/5] RED-218668 bring back 1.26.3 as Go version --- .github/workflows/bsd.yml | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index 836519bd92..7ca7ac48d4 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -13,7 +13,7 @@ permissions: env: GNU_TAR_VERSION: "1.35" - GO_VERSION: "1.26.9" + GO_VERSION: "1.26.3" # To spin up one of the VMs below, see the "Debug Shell" section here: https://github.com/vmactions jobs: diff --git a/go.mod b/go.mod index 5562105ffa..9161672671 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/prometheus/node_exporter -go 1.26.9 +go 1.26.3 require ( github.com/alecthomas/kingpin/v2 v2.4.0 From c5e14d59d505f3a20d4830e76f438e956efbf21c Mon Sep 17 00:00:00 2001 From: Lachezar Kemanov Date: Tue, 13 Oct 2026 13:31:33 +0300 Subject: [PATCH 3/5] RED-218668 bump test freebsd vm version to fix failing CI job --- .github/workflows/bsd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index 7ca7ac48d4..5aaa5e3ad6 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -24,9 +24,9 @@ jobs: - name: Checkout the repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: test-e2e - uses: vmactions/freebsd-vm@c9f815bc7aa0d34c9fdd0619b034a32d6ca7b57e # v1.4.2 + uses: vmactions/freebsd-vm@c46abacb49f09938ca4e1702d15d836285d694cc # v1.5.9 with: - release: "15.0" + release: "15.1" copyback: false envs: 'GO_VERSION GNU_TAR_VERSION' usesh: true From 8b7ffc30cdcc27ee1e21ff280f8710eed025af6d Mon Sep 17 00:00:00 2001 From: Lachezar Kemanov Date: Tue, 13 Oct 2026 13:45:19 +0300 Subject: [PATCH 4/5] RED-218668 fix test --- collector/fixtures/e2e-output-freebsd.txt | 3 --- end-to-end-test.sh | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/collector/fixtures/e2e-output-freebsd.txt b/collector/fixtures/e2e-output-freebsd.txt index 84239652ab..cf58db695f 100644 --- a/collector/fixtures/e2e-output-freebsd.txt +++ b/collector/fixtures/e2e-output-freebsd.txt @@ -261,9 +261,6 @@ node_xfrm_out_state_proto_error_packets_total 4542 # HELP node_xfrm_out_state_seq_error_packets_total Sequence error i.e. Sequence number overflow # TYPE node_xfrm_out_state_seq_error_packets_total counter node_xfrm_out_state_seq_error_packets_total 543 -# HELP node_zfs_arcstats_c_min_bytes ZFS ARC minimum size -# TYPE node_zfs_arcstats_c_min_bytes gauge -node_zfs_arcstats_c_min_bytes 1.99743232e+08 # HELP node_zfs_arcstats_mfu_ghost_size ZFS ARC MFU ghost size # TYPE node_zfs_arcstats_mfu_ghost_size gauge node_zfs_arcstats_mfu_ghost_size 0 diff --git a/end-to-end-test.sh b/end-to-end-test.sh index de490bfff8..df79ed38a6 100755 --- a/end-to-end-test.sh +++ b/end-to-end-test.sh @@ -378,6 +378,7 @@ non_deterministic_metrics=$(cat << METRICS node_zfs_arcstats_anon_bytes node_zfs_arcstats_c_bytes node_zfs_arcstats_c_max_bytes + node_zfs_arcstats_c_min_bytes node_zfs_arcstats_data_bytes node_zfs_arcstats_demand_data_hits_total node_zfs_arcstats_demand_data_misses_total From 6eaab5f66bd54e5a17263f8e0fbadc6dae78c8cd Mon Sep 17 00:00:00 2001 From: Lachezar Kemanov Date: Tue, 13 Oct 2026 14:16:10 +0300 Subject: [PATCH 5/5] RED-218668 fix flaky test --- .github/workflows/bsd.yml | 2 +- collector/fixtures/e2e-output-darwin.txt | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index 5aaa5e3ad6..c8b4d5366c 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -324,5 +324,5 @@ jobs: echo "::group::Run End-to-End Tests" git config --global --add safe.directory $(pwd) - make test-e2e E2E_EXTRA_FLAGS='--collector.diskstats.device-include=disk[04]' + make test-e2e E2E_EXTRA_FLAGS='--collector.diskstats.device-include=^disk0$' echo "::endgroup::" diff --git a/collector/fixtures/e2e-output-darwin.txt b/collector/fixtures/e2e-output-darwin.txt index cf29fb473c..61b369977a 100644 --- a/collector/fixtures/e2e-output-darwin.txt +++ b/collector/fixtures/e2e-output-darwin.txt @@ -94,19 +94,15 @@ node_buddyinfo_blocks{node="0",size="9",zone="Normal"} 0 # HELP node_disk_read_errors_total The total number of read errors. # TYPE node_disk_read_errors_total counter node_disk_read_errors_total{device="disk0"} 0 -node_disk_read_errors_total{device="disk4"} 0 # HELP node_disk_read_retries_total The total number of read retries. # TYPE node_disk_read_retries_total counter node_disk_read_retries_total{device="disk0"} 0 -node_disk_read_retries_total{device="disk4"} 0 # HELP node_disk_write_errors_total The total number of write errors. # TYPE node_disk_write_errors_total counter node_disk_write_errors_total{device="disk0"} 0 -node_disk_write_errors_total{device="disk4"} 0 # HELP node_disk_write_retries_total The total number of write retries. # TYPE node_disk_write_retries_total counter node_disk_write_retries_total{device="disk0"} 0 -node_disk_write_retries_total{device="disk4"} 0 # HELP node_exporter_build_info A metric with a constant '1' value labeled by version, revision, branch, goversion from which node_exporter was built, and the goos and goarch for the build. # TYPE node_exporter_build_info gauge # HELP node_memory_swap_total_bytes Memory information field swap_total_bytes.