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

KSM add node tag for pods + override hostname #1000

Merged
merged 5 commits into from
Jan 12, 2018
Merged

KSM add node tag for pods + override hostname #1000

merged 5 commits into from
Jan 12, 2018

Conversation

mfpierre
Copy link
Contributor

@mfpierre mfpierre commented Jan 9, 2018 •
edited
Loading

What does this PR do?

  • Add the the node label for every metric containing the pod label 🏷
  • Override the hostname with the value of the node label if present

Versioning

  • Bumped the version check in manifest.json
  • Updated CHANGELOG.md. Please use Unreleased as the date in the title
    for the new section.

@mfpierre mfpierre added this to the 5.22 milestone Jan 9, 2018
@mfpierre mfpierre force-pushed the mfpierre/kubestate-add-node-tag branch from 5b07b46 to 8b91fe4 Compare January 11, 2018 18:34
@mfpierre mfpierre requested a review from a team January 11, 2018 18:36
@hkaj
Copy link
Member

hkaj commented Jan 11, 2018

Cool beans! Mind adding a test against the existing fixtures to see if this works?

@mfpierre mfpierre force-pushed the mfpierre/kubestate-add-node-tag branch from 48ce740 to 8d77cc9 Compare January 11, 2018 19:18
@mfpierre
Copy link
Contributor Author

@hkaj the feature is tested in more details in the agent repo, but you're right I added assertions for tag + hostname presence

hkaj
hkaj previously approved these changes Jan 11, 2018
View reviewed changes
Copy link
Member

@hkaj hkaj left a comment

Choose a reason for hiding this comment

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

👌

@mfpierre mfpierre force-pushed the mfpierre/kubestate-add-node-tag branch from 8d77cc9 to c0d0ba9 Compare January 11, 2018 21:46
@mfpierre mfpierre force-pushed the mfpierre/kubestate-add-node-tag branch from c0d0ba9 to e8de7a3 Compare January 11, 2018 22:21
@mfpierre mfpierre merged commit 36d4cda into master Jan 12, 2018
@mfpierre mfpierre deleted the mfpierre/kubestate-add-node-tag branch January 12, 2018 00:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hkaj hkaj hkaj approved these changes

Assignees
No one assigned
Labels
containers
Projects
None yet
Milestone
5.22
Development

Successfully merging this pull request may close these issues.
2 participants
@mfpierre @hkaj