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

Add ingress class label to all prometheus metrics #827

Merged
merged 4 commits into from
Jan 24, 2020
Merged

Add ingress class label to all prometheus metrics #827

merged 4 commits into from
Jan 24, 2020

Conversation

Dean-Coakley
Copy link
Contributor

Proposed changes

  • Adds a label of the ingress class to all metrics to inform the user of the ingress that is being used.

Example:

  • nginx_ingress_controller_ingress_resources_total{type="regular"} 1
    Will become:
  • nginx_ingress_controller_ingress_resources_total{class="nginx",type="regular"} 1

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto master
  • I will ensure my PR is targeting the master branch and pulling from my branch from my own fork

@Dean-Coakley Dean-Coakley added the enhancement Pull requests for new features/feature enhancements label Jan 20, 2020
@Dean-Coakley Dean-Coakley self-assigned this Jan 20, 2020
pleshakov
pleshakov suggested changes Jan 22, 2020
View reviewed changes
Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

Thanks @Dean-Coakley
Please see my suggestions.

docs-web/logging-and-monitoring/prometheus.md Outdated Show resolved Hide resolved
cmd/nginx-ingress/main.go Outdated Show resolved Hide resolved
internal/metrics/collectors/controller.go Outdated Show resolved Hide resolved
pleshakov
pleshakov approved these changes Jan 23, 2020
View reviewed changes
Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

👍

@Dean-Coakley Dean-Coakley merged commit 6cd7cc4 into master Jan 24, 2020
@Dean-Coakley Dean-Coakley deleted the ingress-class-prom-label branch January 24, 2020 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pleshakov pleshakov pleshakov approved these changes

@Rulox Rulox Rulox approved these changes

@lucacome lucacome Awaiting requested review from lucacome

Assignees

@Dean-Coakley Dean-Coakley

Labels
enhancement Pull requests for new features/feature enhancements
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Dean-Coakley @pleshakov @Rulox