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

[metricbeat] Add divide by zero check to docker/diskio #15649

Merged
merged 2 commits into from
Jan 21, 2020
Merged

[metricbeat] Add divide by zero check to docker/diskio #15649

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a500f4
add NaN check to docker/diskio
fearful-symmetry Jan 17, 2020
6f27d99
return 0
fearful-symmetry Jan 21, 2020
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
10 changes: 9 additions & 1 deletion metricbeat/module/docker/diskio/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

"github.com/docker/docker/api/types"

"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/module/docker"
)

Expand Down Expand Up @@ -174,5 +175,12 @@ func calculatePerSecond(duration time.Duration, old uint64, new uint64) float64
if value < 0 {
value = 0
}
return value / duration.Seconds()

timeSec := duration.Seconds()
if timeSec == 0 {
logp.Err("duration is zero when calculating per-second values")
fearful-symmetry marked this conversation as resolved.
Show resolved Hide resolved
fearful-symmetry marked this conversation as resolved.
Show resolved Hide resolved
return -1
fearful-symmetry marked this conversation as resolved.
Show resolved Hide resolved
}

return value / timeSec
}