Skip to content

Commit 7da1321

Browse files
SuperQSuperQ
authored
Release 1.4.0 (#2478)
* [CHANGE] Merge metrics descriptions in textfile collector #2475 * [FEATURE] [node-mixin] Add darwin dashboard to mixin #2351 * [FEATURE] Add "isolated" metric on cpu collector on linux #2251 * [FEATURE] Add cgroup summary collector #2408 * [FEATURE] Add selinux collector #2205 * [FEATURE] Add slab info collector #2376 * [FEATURE] Add sysctl collector #2425 * [FEATURE] Also track the CPU Spin time for OpenBSD systems #1971 * [FEATURE] Add support for MacOS version #2471 * [ENHANCEMENT] [node-mixin] Add missing selectors #2426 * [ENHANCEMENT] [node-mixin] Change current datasource to grafana's default #2281 * [ENHANCEMENT] [node-mixin] Change disk graph to disk table #2364 * [ENHANCEMENT] [node-mixin] Change io time units to %util #2375 * [ENHANCEMENT] Ad user_wired_bytes and laundry_bytes on *bsd #2266 * [ENHANCEMENT] Add additional vm_stat memory metrics for darwin #2240 * [ENHANCEMENT] Add device filter flags to arp collector #2254 * [ENHANCEMENT] Add diskstats include and exclude device flags #2417 * [ENHANCEMENT] Add node_softirqs_total metric #2221 * [ENHANCEMENT] Add rapl zone name label option #2401 * [ENHANCEMENT] Add slabinfo collector #1799 * [ENHANCEMENT] Allow user to select port on NTP server to query #2270 * [ENHANCEMENT] collector/diskstats: Add labels and metrics from udev #2404 * [ENHANCEMENT] Enable builds against older macOS SDK #2327 * [ENHANCEMENT] qdisk-linux: Add exclude and include flags for interface name #2432 * [ENHANCEMENT] systemd: Expose systemd minor version #2282 * [ENHANCEMENT] Use netlink for tcpstat collector #2322 * [ENHANCEMENT] Use netlink to get netdev stats #2074 * [ENHANCEMENT] Add additional perf counters for stalled frontend/backend cycles #2191 * [ENHANCEMENT] Add btrfs device error stats #2193 * [BUGFIX] [node-mixin] Fix fsSpaceAvailableCriticalThreshold and fsSpaceAvailableWarning #2352 * [BUGFIX] Fix concurrency issue in ethtool collector #2289 * [BUGFIX] Fix concurrency issue in netdev collector #2267 * [BUGFIX] Fix diskstat reads and write metrics for disks with different sector sizes #2311 * [BUGFIX] Fix iostat on macos broken by deprecation warning #2292 * [BUGFIX] Fix NodeFileDescriptorLimit alerts #2340 * [BUGFIX] Sanitize rapl zone names #2299 * [BUGFIX] Add file descriptor close safely in test #2447 * [BUGFIX] Fix race condition in os_release.go #2454 * [BUGFIX] Skip ZFS IO metrics if their paths are missing #2451 Signed-off-by: Ben Kochie <[email protected]> Signed-off-by: Ben Kochie <[email protected]>
1 parent e0845a8 commit 7da1321

File tree

7 files changed

+51
-43
lines changed

7 files changed

+51
-43
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ executors:
77
# should also be updated.
88
golang:
99
docker:
10-
- image: cimg/go:1.18
10+
- image: cimg/go:1.19
1111
arm:
1212
machine:
1313
image: ubuntu-2004:current

‎.promu-cgo.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
go:
22
# Whenever the Go version is updated here, .circle/config.yml and
33
# .promu.yml should also be updated.
4-
version: 1.17
4+
version: 1.19
55
cgo: true
66
repository:
77
path: github.com/prometheus/node_exporter

‎.promu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
go:
22
# Whenever the Go version is updated here, .circle/config.yml and
33
# .promu-cgo.yml should also be updated.
4-
version: 1.18
4+
version: 1.19
55
repository:
66
path: github.com/prometheus/node_exporter
77
build:

‎CHANGELOG.md

+39-32
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,47 @@
55
* [ENHANCEMENT]
66
* [BUGFIX]
77

8-
## 1.4.0-rc.0 / 2022-07-27
9-
10-
* [BUGFIX] [node-mixin] Fix fsSpaceAvailableCriticalThreshold and fsSpaceAvailableWarning (#2352)
11-
* [BUGFIX] Fix concurrency issue in ethtool collector (#2289)
12-
* [BUGFIX] Fix concurrency issue in netdev collector (#2267)
13-
* [BUGFIX] Fix diskstat reads and write metrics for disks with different sector sizes (#2311)
14-
* [BUGFIX] Fix iostat on macos broken by deprecation warning (#2292)
15-
* [BUGFIX] Fix NodeFileDescriptorLimit alerts (#2340)
16-
* [BUGFIX] Sanitize rapl zone names (#2299)
17-
* [ENHANCEMENT] [node-mixin] Add missing selectors (#2426)
18-
* [ENHANCEMENT] [node-mixin] Change current datasource to grafana's default (#2281)
8+
## 1.4.0 / 2022-09-24
9+
10+
* [CHANGE] Merge metrics descriptions in textfile collector #2475
11+
* [FEATURE] [node-mixin] Add darwin dashboard to mixin #2351
12+
* [FEATURE] Add "isolated" metric on cpu collector on linux #2251
13+
* [FEATURE] Add cgroup summary collector #2408
14+
* [FEATURE] Add selinux collector #2205
15+
* [FEATURE] Add slab info collector #2376
16+
* [FEATURE] Add sysctl collector #2425
17+
* [FEATURE] Also track the CPU Spin time for OpenBSD systems #1971
18+
* [FEATURE] Add support for MacOS version #2471
19+
* [ENHANCEMENT] [node-mixin] Add missing selectors #2426
20+
* [ENHANCEMENT] [node-mixin] Change current datasource to grafana's default #2281
1921
* [ENHANCEMENT] [node-mixin] Change disk graph to disk table #2364
20-
* [ENHANCEMENT] [node-mixin] Change io time units to %util (#2375))
21-
* [ENHANCEMENT] Ad user_wired_bytes and laundry_bytes on *bsd (#2266)
22-
* [ENHANCEMENT] Add additional vm_stat memory metrics for darwin (#2240)
23-
* [ENHANCEMENT] Add device filter flags to arp collector (#2254)
24-
* [ENHANCEMENT] Add diskstats include and exclude device flags (#2417)
25-
* [ENHANCEMENT] Add node_softirqs_total metric (#2221)
26-
* [ENHANCEMENT] Add rapl zone name label option (#2401)
27-
* [ENHANCEMENT] Add slabinfo collector (#1799)
28-
* [ENHANCEMENT] Allow user to select port on NTP server to query (#2270)
29-
* [ENHANCEMENT] collector/diskstats: Add labels and metrics from udev (#2404)
30-
* [ENHANCEMENT] Enable builds against older macOS SDK (#2327)
22+
* [ENHANCEMENT] [node-mixin] Change io time units to %util #2375
23+
* [ENHANCEMENT] Ad user_wired_bytes and laundry_bytes on *bsd #2266
24+
* [ENHANCEMENT] Add additional vm_stat memory metrics for darwin #2240
25+
* [ENHANCEMENT] Add device filter flags to arp collector #2254
26+
* [ENHANCEMENT] Add diskstats include and exclude device flags #2417
27+
* [ENHANCEMENT] Add node_softirqs_total metric #2221
28+
* [ENHANCEMENT] Add rapl zone name label option #2401
29+
* [ENHANCEMENT] Add slabinfo collector #1799
30+
* [ENHANCEMENT] Allow user to select port on NTP server to query #2270
31+
* [ENHANCEMENT] collector/diskstats: Add labels and metrics from udev #2404
32+
* [ENHANCEMENT] Enable builds against older macOS SDK #2327
3133
* [ENHANCEMENT] qdisk-linux: Add exclude and include flags for interface name #2432
32-
* [ENHANCEMENT] systemd: Expose systemd minor version (#2282)
33-
* [ENHANCEMENT] Use netlink for tcpstat collector (#2322)
34-
* [ENHANCEMENT] Use netlink to get netdev stats (#2074)
35-
* [FEATURE] [node-mixin] Add darwin dashboard to mixin (#2351)
36-
* [FEATURE] Add "isolated" metric on cpu collector on linux (#2251)
37-
* [FEATURE] Add cgroup summary collector (#2408)
38-
* [FEATURE] Add selinux collector (#2205)
39-
* [FEATURE] Add slab info collector (#2376)
40-
* [FEATURE] Add sysctl collector (#2425)
41-
* [FEATURE] Also track the CPU Spin time for OpenBSD systems (#1971)
34+
* [ENHANCEMENT] systemd: Expose systemd minor version #2282
35+
* [ENHANCEMENT] Use netlink for tcpstat collector #2322
36+
* [ENHANCEMENT] Use netlink to get netdev stats #2074
37+
* [ENHANCEMENT] Add additional perf counters for stalled frontend/backend cycles #2191
38+
* [ENHANCEMENT] Add btrfs device error stats #2193
39+
* [BUGFIX] [node-mixin] Fix fsSpaceAvailableCriticalThreshold and fsSpaceAvailableWarning #2352
40+
* [BUGFIX] Fix concurrency issue in ethtool collector #2289
41+
* [BUGFIX] Fix concurrency issue in netdev collector #2267
42+
* [BUGFIX] Fix diskstat reads and write metrics for disks with different sector sizes #2311
43+
* [BUGFIX] Fix iostat on macos broken by deprecation warning #2292
44+
* [BUGFIX] Fix NodeFileDescriptorLimit alerts #2340
45+
* [BUGFIX] Sanitize rapl zone names #2299
46+
* [BUGFIX] Add file descriptor close safely in test #2447
47+
* [BUGFIX] Fix race condition in os_release.go #2454
48+
* [BUGFIX] Skip ZFS IO metrics if their paths are missing #2451
4249

4350
## 1.3.1 / 2021-12-01
4451

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.0-rc.0
1+
1.4.0

‎collector/btrfs_linux.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ type btrfsIoctlFsStats struct {
102102

103103
func (c *btrfsCollector) getIoctlStats() (map[string]*btrfsIoctlFsStats, error) {
104104
// Instead of introducing more ioctl calls to scan for all btrfs
105-
// filesytems re-use our mount point utils to find known mounts
105+
// filesystems re-use our mount point utils to find known mounts
106106
mountsList, err := mountPointDetails(c.logger)
107107
if err != nil {
108108
return nil, err
109109
}
110110

111-
// track devices we have successfully scanned, by device path
111+
// Track devices we have successfully scanned, by device path.
112112
devicesDone := make(map[string]struct{})
113-
// filesystems scann results by UUID
113+
// Filesystems scann results by UUID.
114114
fsStats := make(map[string]*btrfsIoctlFsStats)
115115

116116
for _, mount := range mountsList {
@@ -119,14 +119,14 @@ func (c *btrfsCollector) getIoctlStats() (map[string]*btrfsIoctlFsStats, error)
119119
}
120120

121121
if _, found := devicesDone[mount.device]; found {
122-
// We already found this filesystem by another mount point
122+
// We already found this filesystem by another mount point.
123123
continue
124124
}
125125

126126
fs, err := dennwc.Open(mount.mountPoint, true)
127127
if err != nil {
128-
// failed to open this mount point, maybe we didn't have permission
129-
// maybe we'll find another mount point for this FS later
128+
// Failed to open this mount point, maybe we didn't have permission
129+
// maybe we'll find another mount point for this FS later.
130130
level.Debug(c.logger).Log(
131131
"msg", "Error inspecting btrfs mountpoint",
132132
"mountPoint", mount.mountPoint,
@@ -178,7 +178,7 @@ func (c *btrfsCollector) getIoctlDeviceStats(fs *dennwc.FS, fsInfo *dennwc.Info)
178178

179179
if err != nil {
180180
if errno, ok := err.(syscall.Errno); ok && errno == syscall.ENODEV {
181-
// device IDs do not consistently start at 0, nor are ranges contiguous, so we expect this
181+
// Device IDs do not consistently start at 0, nor are ranges contiguous, so we expect this.
182182
continue
183183
}
184184
return nil, err

‎go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ require (
3535
github.com/beorn7/perks v1.0.1 // indirect
3636
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3737
github.com/davecgh/go-spew v1.1.1 // indirect
38+
github.com/dennwc/ioctl v1.0.0 // indirect
3839
github.com/go-logfmt/logfmt v0.5.1 // indirect
3940
github.com/golang/protobuf v1.5.2 // indirect
4041
github.com/google/go-cmp v0.5.8 // indirect

0 commit comments

Comments
 (0)