This repository was archived by the owner on Sep 26, 2025. It is now read-only.
updated emit_cadvisor_metrics #103
Merged
Conversation
This file contains hidden or 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
hvaghani221
commented
Dec 7, 2021
| namespace = grep_using_regex(metric, /namespace="([^"]*)"/).to_s | ||
| metric_labels = { 'pod_name' => pod_name, 'image' => image_name, 'namespace' => namespace, 'value' => metric_val, 'node' => @node_name } | ||
| if metric =~ /^((?!container_name="POD").)*$/ | ||
| if container_name=="POD" |
Contributor
Author
There was a problem hiding this comment.
Regex /^((?!container_name="POD").)*$/ wan't working as expected. So made this change.
hvaghani221
commented
Dec 7, 2021
| end | ||
|
|
||
| # Make sure regex has only one capturing group | ||
| def grep_using_regex(metric, regex) |
Contributor
Author
There was a problem hiding this comment.
Moved field parsing to this function to improve readability
hvaghani221
commented
Dec 7, 2021
| container_name = container_name.split('"')[1] | ||
| container_label = { 'container_name' => container_name } | ||
| metric_labels.merge(container_label) | ||
| metric_labels.merge!(container_label) |
Contributor
Author
There was a problem hiding this comment.
merge method will return a new object. So changed it to merge! which will update the object itself
added 2 commits
December 7, 2021 18:03
hvaghani221
commented
Dec 7, 2021
| setup do | ||
| stub_k8s_requests | ||
|
|
||
| return unless @@hash_map_test.empty? |
Contributor
Author
There was a problem hiding this comment.
Test setup was called on every testcase execution and took too much time executing unit test
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Fixing #87
In kubernetes 1.17+, pod_name and container_name metric labels were renamed to pod and container in cAdvisor api response