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.

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

install: Support configuring metricsRelabelings on ServiceMonitors #21051

Merged
merged 1 commit into from
Sep 2, 2022

Conversation

chancez
Copy link
Contributor

@chancez chancez commented Aug 23, 2022

This allows adding or removing or changing labels in metrics collected by
Prometheus.

Additionally, I removed the node relabeling in the hubble ServiceMonitor
because this is automatically added by prometheus-operator already, so
it was redundant and unecessary for our ServiceMonitor to configure
itself.

Support configuring metricsRelabelings on ServiceMonitors

@chancez chancez requested review from a team as code owners August 23, 2022 19:16
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 23, 2022
@chancez chancez force-pushed the pr/chancez/servicemonitor_relabelings branch from 1f14255 to 1ef5cb4 Compare August 23, 2022 19:31
@chancez
Copy link
Contributor Author

chancez commented Aug 23, 2022

Not sure why BPF checks failed, I didn't touch anything that should be effected.

@chancez
Copy link
Contributor Author

chancez commented Aug 23, 2022

Ah it's check patch disliking a misspelt word in my commit message.

@chancez chancez force-pushed the pr/chancez/servicemonitor_relabelings branch from 1ef5cb4 to ad751ee Compare August 23, 2022 19:40
@michi-covalent michi-covalent added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Aug 23, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 23, 2022
@gandro
Copy link
Member

gandro commented Aug 24, 2022

The Travis failure is legitimate: HINT: to fix this, run 'make -C Documentation update-helm-values': https://app.travis-ci.com/github/cilium/cilium/jobs/580663369

Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Thanks! Looks good to me! (assuming the Travis failure is fixed)

@chancez chancez force-pushed the pr/chancez/servicemonitor_relabelings branch from ad751ee to 581d72a Compare August 24, 2022 13:44
@chancez
Copy link
Contributor Author

chancez commented Aug 24, 2022

Ah good catch. Missed that. Updated commit to update docs values.

This allows adding or removing labels in metrics collected by
Prometheus.

Additionally, I removed the node relabeling in the hubble ServiceMonitor
because this is automatically added by prometheus-operator already, so
it was redundant and unnecessary for our ServiceMonitor to configure
itself.

Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com>
@chancez chancez force-pushed the pr/chancez/servicemonitor_relabelings branch from 581d72a to 318a8b0 Compare August 24, 2022 13:48
@chancez chancez requested a review from a team as a code owner August 24, 2022 13:48
@chancez chancez requested a review from qmonnet August 24, 2022 13:48
@tommyp1ckles
Copy link
Contributor

looks good

@aanm
Copy link
Member

aanm commented Sep 1, 2022

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Sep 1, 2022
@joamaki
Copy link
Contributor

joamaki commented Sep 2, 2022

Neither of the test failures seem relevant to these changes, merging.

@joamaki joamaki merged commit 3687585 into master Sep 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/minor This PR changes functionality that users may find relevant to operating Cilium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants