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

prometheus: align relabelling convention with prometheus example #1520

Merged
merged 6 commits into from
Nov 27, 2021

Conversation

paulfantom
Copy link
Member

What this PR does / why we need it:

This PR aligns metric relabelings with the convention used in prometheus (prometheus/prometheus#9832), prometheus-operator, kube-state-metrics, kubernetes instrumentation, and monitoring mixins.

This is a breaking PR as following metric labels changed:

  • kubernetes_namespace -> namespace
  • kubernetes_name -> service
  • kubernetes_pod_name -> pod
  • kubernetes_node -> node

I bumped chart major version to note the breaking change.

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • fixes #

Special notes for your reviewer:

Checklist

  • DCO signed
  • Chart Version bumped
  • Title of the PR starts with chart name (e.g. [prometheus-couchdb-exporter])

Signed-off-by: paulfantom <pawel@krupa.net.pl>
Copy link
Member

@monotek monotek left a comment

Choose a reason for hiding this comment

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

If we create a major version update, i would like to see all docker images be up top date too.
Could you please update all used images?

Signed-off-by: paulfantom <pawel@krupa.net.pl>
@paulfantom
Copy link
Member Author

Could you please update all used images?

Sure, already done. I updated all tags in values.yaml and bumped kube-state-metrics chart to v4

Copy link
Member

@monotek monotek left a comment

Choose a reason for hiding this comment

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

Please also add some info whats changed to the upgrading section of the readme: https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus/README.md#upgrading-chart

monotek and others added 2 commits November 26, 2021 13:20
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
@monotek monotek force-pushed the align-on-convention branch from fe06e8a to 3f968c4 Compare November 27, 2021 00:25
monotek
monotek previously approved these changes Nov 27, 2021
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
@monotek monotek merged commit df8add6 into prometheus-community:main Nov 27, 2021
@paulfantom paulfantom deleted the align-on-convention branch November 28, 2021 11:36
@zerkms
Copy link
Contributor

zerkms commented Dec 1, 2021

@paulfantom I think it causes a regression bug #1548

aslafy-z pushed a commit to aslafy-z/helm-charts-2 that referenced this pull request Jan 24, 2022
…metheus-community#1520)

* charts/prometheus: align relabelling convention with prometheus example

Signed-off-by: paulfantom <pawel@krupa.net.pl>

* charts/prometheus: update component versions to latest available

Signed-off-by: paulfantom <pawel@krupa.net.pl>

* added update info to readme

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* fix whitespace

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* fix cli command

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

Co-authored-by: André Bauer <monotek@users.noreply.github.com>
Co-authored-by: André Bauer <andre.bauer@staffbase.com>
Signed-off-by: GitHub <noreply@github.com>
zanhsieh pushed a commit that referenced this pull request Apr 7, 2022
This PR aims to address both #1548 and #1613.
Changes made in #1520,
which ensure alignment with Prometheus labeling conventions,
have caused issues in cases where a resource is publishing metrics about another resource.
One example is kube-state-metrics,
which publishes metrics about other kubernetes resources with labels respecting the convention,
however prometheus overwrites these with labels that are true about kube-state-metrics.
This PR fixes that.

Signed-off-by: Endre Kadas <ekadas@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants