Skip to content

Release v1.12.1 #3733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperQ merged 4 commits into from
Jul 14, 2026
Merged

Release v1.12.1 #3733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11a5682
Fix perf profiler flag handling (#3731)
rtreffer Jul 13, 2026
7a28c18
Release v1.12.1 (#3732)
SuperQ Jul 13, 2026
ce24acb
edac: Fix optional csrow ue_count collection (#3734)
hoffie Jul 14, 2026
cb1f1fb
Amend v1.12.1 changelog (#3735)
SuperQ Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## master / unreleased

## 1.12.1 / 2026-07.14

* [BUGFIX] perf: Fix perf profiler flag handling #3731
* [BUGFIX] edac: Fix optional csrow ue_count collection #3734

## 1.12.0 / 2026-07-10

* [FEATURE] mountstats: Add NFS mountpoint info metric #3554
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.12.0
1.12.1
23 changes: 12 additions & 11 deletions collector/edac_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,19 @@ func (c *edacCollector) Update(ch chan<- prometheus.Metric) error {
)

value, err = readUintFromFile(filepath.Join(csrow, "ch"+channelNumber+"_ue_count"))
if err != nil {
return fmt.Errorf("couldn't get ue_count for controller/csrow/channel %s/%s/%s: %w", controllerNumber, csrowNumber, channelNumber, err)
if err == nil {
ch <- prometheus.MustNewConstMetric(
edacChannelUECount,
prometheus.CounterValue,
float64(value),
controllerNumber,
csrowNumber,
channelNumber,
label,
)
} else {
c.logger.Debug("couldn't get ue_count for controller/csrow/channel %s/%s/%s: %w", controllerNumber, csrowNumber, channelNumber, err)
}
ch <- prometheus.MustNewConstMetric(
edacChannelUECount,
prometheus.CounterValue,
float64(value),
controllerNumber,
csrowNumber,
channelNumber,
label,
)
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions collector/fixtures/e2e-64k-page-output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,8 +1367,10 @@ node_drbd_remote_unacknowledged{device="drbd1"} 12347
# TYPE node_edac_channel_correctable_errors_total counter
node_edac_channel_correctable_errors_total{channel="0",controller="0",csrow="0",dimm_label="mc0_csrow0_channel0"} 0
node_edac_channel_correctable_errors_total{channel="0",controller="0",csrow="1",dimm_label="mc0_csrow1_channel0"} 0
node_edac_channel_correctable_errors_total{channel="0",controller="0",csrow="2",dimm_label="mc0_csrow2_channel0"} 0
node_edac_channel_correctable_errors_total{channel="1",controller="0",csrow="0",dimm_label="mc0_csrow0_channel1"} 0
node_edac_channel_correctable_errors_total{channel="1",controller="0",csrow="1",dimm_label="mc0_csrow1_channel1"} 0
node_edac_channel_correctable_errors_total{channel="1",controller="0",csrow="2",dimm_label="mc0_csrow2_channel1"} 0
# HELP node_edac_channel_uncorrectable_errors_total Total uncorrectable memory errors for this channel.
# TYPE node_edac_channel_uncorrectable_errors_total counter
node_edac_channel_uncorrectable_errors_total{channel="0",controller="0",csrow="0",dimm_label="mc0_csrow0_channel0"} 2
Expand All @@ -1382,11 +1384,13 @@ node_edac_correctable_errors_total{controller="0"} 1
# TYPE node_edac_csrow_correctable_errors_total counter
node_edac_csrow_correctable_errors_total{controller="0",csrow="0"} 3
node_edac_csrow_correctable_errors_total{controller="0",csrow="1"} 0
node_edac_csrow_correctable_errors_total{controller="0",csrow="2"} 0
node_edac_csrow_correctable_errors_total{controller="0",csrow="unknown"} 2
# HELP node_edac_csrow_uncorrectable_errors_total Total uncorrectable memory errors for this csrow.
# TYPE node_edac_csrow_uncorrectable_errors_total counter
node_edac_csrow_uncorrectable_errors_total{controller="0",csrow="0"} 4
node_edac_csrow_uncorrectable_errors_total{controller="0",csrow="1"} 4
node_edac_csrow_uncorrectable_errors_total{controller="0",csrow="2"} 5
node_edac_csrow_uncorrectable_errors_total{controller="0",csrow="unknown"} 6
# HELP node_edac_uncorrectable_errors_total Total uncorrectable memory errors.
# TYPE node_edac_uncorrectable_errors_total counter
Expand Down
4 changes: 4 additions & 0 deletions collector/fixtures/e2e-output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,8 +1399,10 @@ node_drbd_remote_unacknowledged{device="drbd1"} 12347
# TYPE node_edac_channel_correctable_errors_total counter
node_edac_channel_correctable_errors_total{channel="0",controller="0",csrow="0",dimm_label="mc0_csrow0_channel0"} 0
node_edac_channel_correctable_errors_total{channel="0",controller="0",csrow="1",dimm_label="mc0_csrow1_channel0"} 0
node_edac_channel_correctable_errors_total{channel="0",controller="0",csrow="2",dimm_label="mc0_csrow2_channel0"} 0
node_edac_channel_correctable_errors_total{channel="1",controller="0",csrow="0",dimm_label="mc0_csrow0_channel1"} 0
node_edac_channel_correctable_errors_total{channel="1",controller="0",csrow="1",dimm_label="mc0_csrow1_channel1"} 0
node_edac_channel_correctable_errors_total{channel="1",controller="0",csrow="2",dimm_label="mc0_csrow2_channel1"} 0
# HELP node_edac_channel_uncorrectable_errors_total Total uncorrectable memory errors for this channel.
# TYPE node_edac_channel_uncorrectable_errors_total counter
node_edac_channel_uncorrectable_errors_total{channel="0",controller="0",csrow="0",dimm_label="mc0_csrow0_channel0"} 2
Expand All @@ -1414,11 +1416,13 @@ node_edac_correctable_errors_total{controller="0"} 1
# TYPE node_edac_csrow_correctable_errors_total counter
node_edac_csrow_correctable_errors_total{controller="0",csrow="0"} 3
node_edac_csrow_correctable_errors_total{controller="0",csrow="1"} 0
node_edac_csrow_correctable_errors_total{controller="0",csrow="2"} 0
node_edac_csrow_correctable_errors_total{controller="0",csrow="unknown"} 2
# HELP node_edac_csrow_uncorrectable_errors_total Total uncorrectable memory errors for this csrow.
# TYPE node_edac_csrow_uncorrectable_errors_total counter
node_edac_csrow_uncorrectable_errors_total{controller="0",csrow="0"} 4
node_edac_csrow_uncorrectable_errors_total{controller="0",csrow="1"} 4
node_edac_csrow_uncorrectable_errors_total{controller="0",csrow="2"} 5
node_edac_csrow_uncorrectable_errors_total{controller="0",csrow="unknown"} 6
# HELP node_edac_uncorrectable_errors_total Total uncorrectable memory errors.
# TYPE node_edac_uncorrectable_errors_total counter
Expand Down
33 changes: 33 additions & 0 deletions collector/fixtures/sys.ttar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9572,6 +9572,14 @@ Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Directory: sys/devices/system/edac/mc/mc0/csrow2
Mode: 755
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/devices/system/edac/mc/mc0/csrow2/ch0_ce_count
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/devices/system/edac/mc/mc0/csrow0/ch1_ce_count
Lines: 1
0
Expand All @@ -9582,6 +9590,11 @@ Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/devices/system/edac/mc/mc0/csrow2/ch1_ce_count
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/devices/system/edac/mc/mc0/csrow0/ce_count
Lines: 1
3
Expand Down Expand Up @@ -9617,6 +9630,16 @@ Lines: 1
4
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/devices/system/edac/mc/mc0/csrow2/ce_count
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/devices/system/edac/mc/mc0/csrow2/ue_count
Lines: 1
5
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/devices/system/edac/mc/mc0/csrow0/ue_count
Lines: 1
4
Expand Down Expand Up @@ -9652,6 +9675,16 @@ Lines: 1
mc0csrow1channel1
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/devices/system/edac/mc/mc0/csrow2/ch0_dimm_label
Lines: 1
mc0csrow2channel0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/devices/system/edac/mc/mc0/csrow2/ch1_dimm_label
Lines: 1
mc0csrow2channel1
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Directory: sys/devices/system/node
Mode: 755
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down
10 changes: 8 additions & 2 deletions collector/perf_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,19 +338,23 @@ func NewPerfCollector(logger *slog.Logger) (Collector, error) {
// Configure perf profilers
hardwareProfilers := perf.AllHardwareProfilers
if len(*perfHwProfilerFlag) > 0 {
// hardwareProfilers = 0
hardwareProfilers = 0
for _, hf := range *perfHwProfilerFlag {
if v, ok := perfHardwareProfilerMap[hf]; ok {
hardwareProfilers |= v
} else {
logger.Error("Unknown hardware profiler: " + hf)
}
}
}
softwareProfilers := perf.AllSoftwareProfilers
if len(*perfSwProfilerFlag) > 0 {
// softwareProfilers = 0
softwareProfilers = 0
for _, sf := range *perfSwProfilerFlag {
if v, ok := perfSoftwareProfilerMap[sf]; ok {
softwareProfilers |= v
} else {
logger.Error("Unknown software profiler: " + sf)
}
}
}
Expand All @@ -360,6 +364,8 @@ func NewPerfCollector(logger *slog.Logger) (Collector, error) {
for _, cf := range *perfCaProfilerFlag {
if v, ok := perfCacheProfilerMap[cf]; ok {
cacheProfilers |= v
} else {
logger.Error("Unknown cache profiler: " + cf)
}
}
}
Expand Down
Loading