[docker_daemon] Add metadata, tests and fix missing yaml option #2453
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hkaj
force-pushed
the
haissam/disk-metrics-improvement
branch
from
a0f2991 to
798c86f
Compare
| return {} | ||
| if used > 0.0 and total > 0.0: | ||
| percs['docker.{0}.percent'.format(mtype)] = round(100 * float(used) / float(total), 2) | ||
| elif free > 0.0 and total > 0.0: |
There was a problem hiding this comment.
I think free could legitly be 0.0.
hkaj
force-pushed
the
haissam/disk-metrics-improvement
branch
from
798c86f to
3104b2d
Compare
|
Thanks for the feedback @truthbk, updated some things and added some testing. |
| used = stats.get('docker.{0}.used'.format(mtype)) | ||
| total = stats.get('docker.{0}.total'.format(mtype)) | ||
| free = stats.get('docker.{0}.free'.format(mtype)) | ||
| if used and total and free and total < free + used: |
There was a problem hiding this comment.
Should we add a small rounding tolerance factor here ?
|
I'd say that other than @remh consideration, it's looking good. With regards to his point, maybe it makes sense to use the ceiling of "total"? I'll let you decide on that one :) |
hkaj
force-pushed
the
haissam/disk-metrics-improvement
branch
from
3104b2d to
fd73dfd
Compare
|
@truthbk added a ceiling of total as a rounding margin. |
|
👍 looks good... I was unable to run the tests locally. But I trust they're fine after the revamp. Feel free to squash and merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why this PR
This PR is a fix/improvement for #2405
It adds the same metrics for metadata and modify the existing name for consistency (this has not been released so no user will be impacted), setup testing and fix a missing option in
docker_daemon.yaml.