Skip to content
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

Jump to bottom

filesystem: surface device errors #2923

Merged
merged 12 commits into from
Feb 18, 2024
Merged

filesystem: surface device errors #2923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5d2f34c
Signed-off-by: Pamela Mei i540369 <pamela.mei@sap.com>
PamelaMei-SAP Feb 11, 2024
3c969c4
MOD: filesystem_linux.go due to go version difference 1.22.0&1.21.7 t…
PamelaMei-SAP Feb 11, 2024
4d72dbd
MOD: update variable naming
PamelaMei-SAP Feb 18, 2024
8d49598
Merge branch 'prometheus:master' into surface_filesystem_device_error…
PamelaMei-SAP Feb 18, 2024
4cdaf46
Signed-off-by: Pamela Mei i540369 <pamela.mei@sap.com>
PamelaMei-SAP Feb 11, 2024
c0cceef
MOD: filesystem_linux.go due to go version difference 1.22.0&1.21.7 t…
PamelaMei-SAP Feb 11, 2024
d2b9ad8
MOD: update variable naming
PamelaMei-SAP Feb 18, 2024
5ac4ad3
MOD: gofmt to pass circleci
PamelaMei-SAP Feb 18, 2024
2acba9e
MOD: gofmt update pass circleci
PamelaMei-SAP Feb 18, 2024
7be6ef2
Merge branch 'surface_filesystem_device_error_#2918' of https://githu…
PamelaMei-SAP Feb 18, 2024
6cd76ed
MOD: update merge error
PamelaMei-SAP Feb 18, 2024
0c7391d
MOD: update merge wrong version
PamelaMei-SAP Feb 18, 2024
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
18 changes: 9 additions & 9 deletions collector/filesystem_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ var (
"Regexp of filesystem types to ignore for filesystem collector.",
).Hidden().String()

filesystemLabelNames = []string{"device", "mountpoint", "fstype"}
filesystemLabelNames = []string{"device", "mountpoint", "fstype", "device_error"}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd just call the label 'error'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have been taking a slightly more verbose approach to label names recently. I would prefer device_error, as it's a little more descriptive.

)

type filesystemCollector struct {
Expand All @@ -73,7 +73,7 @@ type filesystemCollector struct {
}

type filesystemLabels struct {
device, mountPoint, fsType, options string
device, mountPoint, fsType, options, deviceError string
}

type filesystemStats struct {
Expand Down Expand Up @@ -184,11 +184,11 @@ func (c *filesystemCollector) Update(ch chan<- prometheus.Metric) error {

ch <- prometheus.MustNewConstMetric(
c.deviceErrorDesc, prometheus.GaugeValue,
s.deviceError, s.labels.device, s.labels.mountPoint, s.labels.fsType,
s.deviceError, s.labels.device, s.labels.mountPoint, s.labels.fsType, s.labels.deviceError,
)
ch <- prometheus.MustNewConstMetric(
c.roDesc, prometheus.GaugeValue,
s.ro, s.labels.device, s.labels.mountPoint, s.labels.fsType,
s.ro, s.labels.device, s.labels.mountPoint, s.labels.fsType, s.labels.deviceError,
)

if s.deviceError > 0 {
Expand All @@ -197,23 +197,23 @@ func (c *filesystemCollector) Update(ch chan<- prometheus.Metric) error {

ch <- prometheus.MustNewConstMetric(
c.sizeDesc, prometheus.GaugeValue,
s.size, s.labels.device, s.labels.mountPoint, s.labels.fsType,
s.size, s.labels.device, s.labels.mountPoint, s.labels.fsType, s.labels.deviceError,
)
ch <- prometheus.MustNewConstMetric(
c.freeDesc, prometheus.GaugeValue,
s.free, s.labels.device, s.labels.mountPoint, s.labels.fsType,
s.free, s.labels.device, s.labels.mountPoint, s.labels.fsType, s.labels.deviceError,
)
ch <- prometheus.MustNewConstMetric(
c.availDesc, prometheus.GaugeValue,
s.avail, s.labels.device, s.labels.mountPoint, s.labels.fsType,
s.avail, s.labels.device, s.labels.mountPoint, s.labels.fsType, s.labels.deviceError,
)
ch <- prometheus.MustNewConstMetric(
c.filesDesc, prometheus.GaugeValue,
s.files, s.labels.device, s.labels.mountPoint, s.labels.fsType,
s.files, s.labels.device, s.labels.mountPoint, s.labels.fsType, s.labels.deviceError,
)
ch <- prometheus.MustNewConstMetric(
c.filesFreeDesc, prometheus.GaugeValue,
s.filesFree, s.labels.device, s.labels.mountPoint, s.labels.fsType,
s.filesFree, s.labels.device, s.labels.mountPoint, s.labels.fsType, s.labels.deviceError,
)
}
return nil
Expand Down
11 changes: 7 additions & 4 deletions collector/filesystem_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ func (c *filesystemCollector) GetStats() ([]filesystemStats, error) {

stuckMountsMtx.Lock()
if _, ok := stuckMounts[labels.mountPoint]; ok {
labels.deviceError = "mountpoint timeout"
stats = append(stats, filesystemStats{
labels: labels,
deviceError: 1,
Expand Down Expand Up @@ -125,6 +126,7 @@ func (c *filesystemCollector) processStat(labels filesystemLabels) filesystemSta
close(success)

if err != nil {
labels.deviceError = err.Error()
level.Debug(c.logger).Log("msg", "Error on statfs() system call", "rootfs", rootfsFilePath(labels.mountPoint), "err", err)
return filesystemStats{
labels: labels,
Expand Down Expand Up @@ -211,10 +213,11 @@ func parseFilesystemLabels(r io.Reader) ([]filesystemLabels, error) {
parts[1] = strings.Replace(parts[1], "\\011", "\t", -1)

filesystems = append(filesystems, filesystemLabels{
device: parts[0],
mountPoint: rootfsStripPrefix(parts[1]),
fsType: parts[2],
options: parts[3],
device: parts[0],
mountPoint: rootfsStripPrefix(parts[1]),
fsType: parts[2],
options: parts[3],
deviceError: "",
})
}

Expand Down
Loading