Merge branch 'master' into master

Author: ShashwatHiregoudar

.github/workflows/bsd.yml

@@ -16,7 +16,7 @@ env:
   GO_VERSION_DRAGONFLY: "1.25.1"
   GO_VERSION_FREEBSD: "125"
   GO_VERSION_NETBSD: "1.25.1"
-  GO_VERSION_OPENBSD: "1.24.1"
+  GO_VERSION_OPENBSD: "1.25.1"
   GO_VERSION_SOLARIS: "1.25.1"
 
 # To spin up one of the VMs below, see the "Debug Shell" section here: https://github.com/vmactions
@@ -30,7 +30,7 @@ jobs:
       - name: test-e2e
         uses: vmactions/freebsd-vm@487ce35b96fae3e60d45b521735f5aa436ecfade  # v1.2.4
         with:
-          release: "15.0"
+          release: "14.3"
           copyback: false
           envs: 'GO_VERSION_FREEBSD GNU_TAR_VERSION'
           usesh: true
@@ -76,7 +76,7 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
       - name: test-e2e
-        uses: vmactions/openbsd-vm@1e7cc4fa7727646d3cf5921289b1f5c9d1a88f3c  # v1.2.0
+        uses: vmactions/openbsd-vm@a254d784d6fad46e22ef73c6ecbb1dc310b04777  # v1.2.3
         with:
           copyback: false
           envs: 'GO_VERSION_OPENBSD GNU_TAR_VERSION'
@@ -90,7 +90,7 @@ jobs:
               gmake \
               go-${GO_VERSION_OPENBSD} \
               gsed \
-              gtar-${GNU_TAR_VERSION}p0-static \
+              gtar-${GNU_TAR_VERSION}p1-static \
               python \
               wget
           run: |
@@ -122,7 +122,7 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
       - name: test-e2e
-        uses: vmactions/netbsd-vm@d0228be27fbaba19418cc1b332609a895cf16561  # v1.1.9
+        uses: vmactions/netbsd-vm@7aea50f9eb16df034be5d71eb81fea9804505c28  # v1.2.0
         with:
           copyback: false
           envs: 'GO_VERSION_NETBSD GNU_TAR_VERSION'
@@ -271,7 +271,7 @@ jobs:
             echo "::endgroup::"
 
   test_macos:
-    name: Run end-to-end tests on macOS
+    name: Run end-to-end tests on Darwin/MacOS
     runs-on: macos-latest
     steps:
       - name: Checkout the repository
@@ -308,5 +308,5 @@ jobs:
 
           echo "::group::Run End-to-End Tests"
           git config --global --add safe.directory $(pwd)
-          make test-e2e
+          make test-e2e E2E_EXTRA_FLAGS='--collector.diskstats.device-include=disk[04]'
           echo "::endgroup::"

.github/workflows/golangci-lint.yml

@@ -28,14 +28,17 @@ jobs:
         with:
           persist-credentials: false
       - name: Install Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: 1.25.x
       - name: Install snmp_exporter/generator dependencies
         run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
         if: github.repository == 'prometheus/snmp_exporter'
+      - name: Get golangci-lint version
+        id: golangci-lint-version
+        run: echo "version=$(make print-golangci-lint-version)" >> $GITHUB_OUTPUT
       - name: Lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           args: --verbose
-          version: v2.2.1
+          version: ${{ steps.golangci-lint-version.outputs.version }}

.golangci.yml

@@ -33,16 +33,12 @@ linters:
       - linters:
           - errcheck
         path: _test.go
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
 formatters:
   enable:
     - goimports
   exclusions:
     generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/prometheus/node_exporter

CHANGELOG.md

@@ -5,6 +5,44 @@
 * [ENHANCEMENT]
 * [BUGFIX]
 
+## 1.10.2 / 2025-10-25
+
+* [BUGFIX] meminfo: Fix typo in Zswap metric name #3455
+
+## 1.10.1 / 2025-10-25
+
+* [BUGFIX] filesystem: Fix mount points being collected multiple times #3376
+* [BUGFIX] filesystem: Refactor mountinfo parsing #3452
+* [BUGFIX] meminfo: Add Zswap/Zswapped metrics #3453
+
+## 1.10.0 / 2025-10-24
+
+* [CHANGE] mdadm: Use sysfs for RAID metrics #3031
+* [CHANGE] filesystem: Add erofs in default excluded fs #3313
+* [CHANGE] tcpstat: Use std lib binary.NativeEndian #3386
+* [FEATURE] pcidevice: Add new collector for PCIe devices #3339
+* [FEATURE] AIX: Add more metrics #3338
+* [FEATURE] systemd: Add Virtualization metrics #3254
+* [FEATURE] swaps: Add new collector #3428
+* [ENHANCEMENT] wifi: Add packet received and transmitted metrics #3382
+* [ENHANCEMENT] filesystem: Take super options into account for read-only #3387
+* [ENHANCEMENT] pcidevice: Add additional metrics #3425
+* [ENHANCEMENT] perf: Add `tlb_data` metrics #3436
+* [BUGFIX] interrupts: Fix OpenBSD interrupt device parsing #3288
+* [BUGFIX] diskstats: Simplify condition #3290
+* [BUGFIX] thermal: Sanitize darwin thermal strings #3294
+* [BUGFIX] filesystem: Fix Darwin collector cgo memory leak #3315
+* [BUGFIX] cpufreq: Fix: collector enable #3318
+* [BUGFIX] ethtool: Fix returning 0 for sanitized metrics #3335
+* [BUGFIX] netdev: Fix Darwin netdev i/o bytes metric #3336
+* [BUGFIX] systemd: Fix logging race #3364
+* [BUGFIX] filesystem: Fix duplicate Darwin CGO import #3391
+
+## 1.9.1 / 2025-04-01
+
+* [BUGFIX] pressure: Fix missing IRQ on older kernels #3263
+* [BUGFIX] Fix Darwin memory leak #3277
+
 ## 1.9.0 / 2025-02-17
 
 * [CHANGE] meminfo: Convert linux implementation to use procfs lib #3049

Makefile

@@ -22,6 +22,7 @@ include Makefile.common
 PROMTOOL_VERSION ?= 2.30.0
 PROMTOOL_URL     ?= https://github.com/prometheus/prometheus/releases/download/v$(PROMTOOL_VERSION)/prometheus-$(PROMTOOL_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 PROMTOOL         ?= $(FIRST_GOPATH)/bin/promtool
+E2E_EXTRA_FLAGS  ?=
 
 DOCKER_IMAGE_NAME       ?= node-exporter
 MACH                    ?= $(shell uname -m)
@@ -121,7 +122,7 @@ tools:
 .PHONY: test-e2e
 test-e2e: build collector/fixtures/sys/.unpacked collector/fixtures/udev/.unpacked tools
 	@echo ">> running end-to-end tests"
-	./end-to-end-test.sh
+	./end-to-end-test.sh -e "$(E2E_EXTRA_FLAGS)"
 
 .PHONY: skip-test-e2e
 skip-test-e2e:

Makefile.common

@@ -61,7 +61,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v2.2.1
+GOLANGCI_LINT_VERSION ?= v2.6.0
 GOLANGCI_FMT_OPTS ?=
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
 # windows isn't included here because of the path separator being different.
@@ -266,6 +266,10 @@ $(GOLANGCI_LINT):
 		| sh -s -- -b $(FIRST_GOPATH)/bin $(GOLANGCI_LINT_VERSION)
 endif
 
+.PHONY: common-print-golangci-lint-version
+common-print-golangci-lint-version:
+	@echo $(GOLANGCI_LINT_VERSION)
+
 .PHONY: precheck
 precheck::
 

README.md

@@ -195,6 +195,7 @@ drm | Expose GPU metrics using sysfs / DRM, `amdgpu` is the only driver which ex
 drbd | Exposes Distributed Replicated Block Device statistics (to version 8.4) | Linux
 ethtool | Exposes network interface information and network driver statistics equivalent to `ethtool`, `ethtool -S`, and `ethtool -i`. | Linux
 interrupts | Exposes detailed interrupts statistics. | Linux, OpenBSD
+kernel_hung | Exposes number of tasks that have been detected as hung from `/proc/sys/kernel/hung_task_detect_count`. | Linux
 ksmd | Exposes kernel and system statistics from `/sys/kernel/mm/ksm`. | Linux
 lnstat | Exposes stats from `/proc/net/stat/`. | Linux
 logind | Exposes session counts from [logind](http://www.freedesktop.org/wiki/Software/systemd/logind/). | Linux
@@ -208,6 +209,7 @@ qdisc | Exposes [queuing discipline](https://en.wikipedia.org/wiki/Network_sched
 slabinfo | Exposes slab statistics from `/proc/slabinfo`. Note that permission of `/proc/slabinfo` is usually 0400, so set it appropriately. | Linux
 softirqs | Exposes detailed softirq statistics from `/proc/softirqs`. | Linux
 sysctl | Expose sysctl values from `/proc/sys`. Use `--collector.sysctl.include(-info)` to configure. | Linux
+swap | Expose swap information from `/proc/swaps`. | Linux
 systemd | Exposes service and system status from [systemd](http://www.freedesktop.org/wiki/Software/systemd/). | Linux
 tcpstat | Exposes TCP connection status information from `/proc/net/tcp` and `/proc/net/tcp6`. (Warning: the current version has potential performance issues in high load situations.) | Linux
 wifi | Exposes WiFi device and station statistics. | Linux

VERSION

@@ -1 +1 @@
-1.9.0
+1.10.2

collector/arp_linux.go

@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !noarp
-// +build !noarp
 
 package collector
 

collector/bcache_linux.go

@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !nobcache
-// +build !nobcache
 
 package collector