Fix pod metric filtering for containerd #2283
Merged
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
Codecov Report
@@ Coverage Diff @@
## master #2283 +/- ##
==========================================
+ Coverage 85.83% 86.92% +1.08%
==========================================
Files 189 8 -181
Lines 12646 841 -11805
Branches 1325 130 -1195
==========================================
- Hits 10855 731 -10124
+ Misses 1408 78 -1330
+ Partials 383 32 -351 |
lbernail
reviewed
Sep 21, 2018
| @@ -125,6 +125,10 @@ def _is_pod_metric(labels): | |||
| if 'container_name' in labels: | |||
| if labels['container_name'] == 'POD': | |||
| return True | |||
| # Some runtimes does not report container_name="POD" | |||
| if 'pod_name' in labels: | |||
There was a problem hiding this comment.
For the metric to be a pod-level one, don't you also need container_name=""? (because all container metrics also have a pod_name label)
There was a problem hiding this comment.
Good catch, just fixed it
mfpierre
force-pushed
the
mfpierre/fix-pod-metric-filtering
branch
from
021fab9
to
0626735
Compare
hkaj
reviewed
Sep 24, 2018
| @@ -125,6 +125,9 @@ def _is_pod_metric(labels): | |||
| if 'container_name' in labels: | |||
| if labels['container_name'] == 'POD': | |||
| return True | |||
| # containerd does not report container_name="POD" | |||
| elif labels['container_name'] == '' and 'pod_name' in labels and labels['pod_name']: | |||
There was a problem hiding this comment.
or elif labels['container_name'] == '' and labels.get('pod_name', False):?
mfpierre
force-pushed
the
mfpierre/fix-pod-metric-filtering
branch
from
0626735
to
8bba137
Compare
mfpierre
force-pushed
the
mfpierre/fix-pod-metric-filtering
branch
from
8bba137
to
3ee32b9
Compare
zippolyte
approved these changes
Oct 2, 2018
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.
What does this PR do?
Seems that
container_nameis empty for pod metrics withcontainerdruntime causing them to be filtered out.Motivation
Have pod metrics (like network) correctly submitted for
containerdReview checklist
no-changeloglabel attachedAdditional Notes
See containerd/cri#922