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

Use working set bytes if usage bytes is zero #25428

Merged
merged 10 commits into from
Apr 30, 2021
Merged

Use working set bytes if usage bytes is zero #25428

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0e8ce05
Use working set bytes if usage bytes is zero
brianharwell Apr 29, 2021
94dea08
Update CHANGELOG.asciidoc
brianharwell Apr 29, 2021
f54606c
Add comment to CHANGELOG.next.asciidoc
brianharwell Apr 30, 2021
e713226
Moved comment to bug fixes
brianharwell Apr 30, 2021
dc4b6ab
Calculate pod memory pct based on field existence
brianharwell Apr 30, 2021
8f65818
Updated description of change
brianharwell Apr 30, 2021
5da426f
Remove unneeded lines
brianharwell Apr 30, 2021
0112df2
I removed too many lines
brianharwell Apr 30, 2021
cf07d3d
More removals
brianharwell Apr 30, 2021
f5bad30
Merge branch 'master' of https://github.com/elastic/beats into window…
brianharwell Apr 30, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ https://github.com/elastic/beats/compare/v7.12.0...v7.12.1[View commits]
*Metricbeat*

- Ignore unsupported derive types for filesystem metricset. {issue}22501[22501] {pull}24502[24502]
- Use working set bytes when memory usage is not reported. {pull}25428[25428]
Copy link
Member

Choose a reason for hiding this comment

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

This line should be added in CHANGELOG.next.asciidoc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Whoops! Sorry!



==== Added
Expand Down
4 changes: 4 additions & 0 deletions metricbeat/module/kubernetes/pod/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common.

coresLimit += perfMetrics.ContainerCoresLimit.GetWithDefault(cuid, nodeCores)
memLimit += perfMetrics.ContainerMemLimit.GetWithDefault(cuid, nodeMem)

if usageMem == 0 && workingSet > 0 {
usageMem = workingSet
}
}

podEvent := common.MapStr{
Expand Down