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

mixin: Remove assumed metrics #3854

Merged
merged 5 commits into from
Mar 3, 2021
Merged

mixin: Remove assumed metrics #3854

merged 5 commits into from
Mar 3, 2021

Conversation

kakkoyun
Copy link
Member

@kakkoyun kakkoyun commented Mar 1, 2021 •
edited
Loading

This PR fixes minor inconveniences with mixin. Remove assumed metrics. Use thanos_info instead of kube_pod_info for dashboard selectors.

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end-user.

Changes

  • Unify file-naming conventions
  • Only assume the existence of metrics added by Thanos itself. Remove assumed metrics. Use thanos_info instead of kube_pod_info for dashboard selectors.
  • Remove pod selectors

Verification

  • make examples
  • Manual import and poke around

bwplotka
bwplotka reviewed Mar 1, 2021
View reviewed changes
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

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

Remove pod selectors

Why?

examples/alerts/alerts.md Show resolved Hide resolved
examples/dashboards/compact.json Outdated Show resolved Hide resolved
examples/dashboards/compact.json Show resolved Hide resolved
@brancz
Copy link
Member

brancz commented Mar 1, 2021

It's probably useful to continue to use the instance label instead of pod. You can rely on instance being there and it's up to the user to relabel something useful to their environment in there.

@kakkoyun kakkoyun requested a review from bwplotka March 1, 2021 14:30
@kakkoyun kakkoyun mentioned this pull request Mar 1, 2021
Merged
2 tasks
@kakkoyun kakkoyun enabled auto-merge (squash) March 1, 2021 15:44
bwplotka
bwplotka reviewed Mar 1, 2021
View reviewed changes
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

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

Stil I might be stupid, but why we get rid of pod. Having some random IP address is not helpful on dashboards 🤔

@brancz
Copy link
Member

brancz commented Mar 2, 2021

The best practice is to relabel something sensible into your instance label though, so I think it's a reasonable default to use in mixins. FWIW kube-thanos does abide by that and relabels namespace/pod into the instance label.

@kakkoyun
Copy link
Member Author

kakkoyun commented Mar 2, 2021

I just want to make our mixin kubernetes agnostic (this has been asked a couple of times) and I think these changes will do the work.

@kakkoyun
Fix filenames
955623e 
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
@kakkoyun
Remove assumed metric dependencies
ce1765f 
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
@kakkoyun
Add changelog
64bb2da 
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
@kakkoyun
Rename pod to instance
7ca2007 
Add promdoc in toolchain

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
@kakkoyun
Fix CI issues
3279370 
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
@metalmatze
Copy link
Contributor

I still see a bunch of occasions of the namespace label too. So if we want to get Kubernetes agnostic then that needs to go too.

@kakkoyun
Copy link
Member Author

kakkoyun commented Mar 3, 2021

IMHO namespace is a more generic term. It doesn't necessarily indicate it's a Kubernetes namespace.

@kakkoyun
Copy link
Member Author

kakkoyun commented Mar 3, 2021

Discussed this offline and created an issue for it #3867

metalmatze
metalmatze approved these changes Mar 3, 2021
View reviewed changes
Copy link
Contributor

@metalmatze metalmatze left a comment

Choose a reason for hiding this comment

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

Overall this looks really good! 👍
Happy to continue with namespace in a follow up,

@kakkoyun kakkoyun merged commit 569a4d7 into thanos-io:main Mar 3, 2021
@kakkoyun kakkoyun deleted the mixin_overhaul branch March 4, 2021 06:50
andrejbranch pushed a commit to andrejbranch/thanos that referenced this pull request Mar 11, 2021
@kakkoyun
mixin: Remove assumed metrics (thanos-io#3854)
b1db474 
* Fix filenames

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Remove assumed metric dependencies

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Add changelog

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Rename pod to instance

Add promdoc in toolchain

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Fix test

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
@arajkumar arajkumar mentioned this pull request Oct 11, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bwplotka bwplotka bwplotka left review comments

@metalmatze metalmatze metalmatze approved these changes

@brancz brancz Awaiting requested review from brancz

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kakkoyun @brancz @metalmatze @bwplotka