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

Add flag to set custom buckets for prometheus histogram #7171

Merged
merged 1 commit into from
Jan 15, 2022

Conversation

serge-r
Copy link
Contributor

@serge-r serge-r commented May 27, 2021

This PR adding a support for custom sets of prometheus histogram bucket.

What this PR does / why we need it:

It can also resolve issue #3898. Sometimes we needs to compare ingress requests\responses metrics with other applications metrics and need to set up same buckets sets.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

fixes ##3898

How Has This Been Tested?

I have add function to test flags. Also I have tests into default kind environment (make dev-env) and just change nginx-ingress-controller start flags by adding
- --metrics-buckets=[0.05, 0.1, 0.2, 0.3, 0.5, 1.0, 5, 10]

Also I have add test ingress object into dev-env make queries and get this result:

nginx_ingress_controller_response_size_bucket{controller_class="nginx",controller_namespace="ingress-nginx",controller_pod="ingress-nginx-controller-69fbf79577-d5q2t",host="testapp.local",ingress="test-ingress",method="GET",namespace="test",path="/",service="",status="404",le="0.05"} 0
nginx_ingress_controller_response_size_bucket{controller_class="nginx",controller_namespace="ingress-nginx",controller_pod="ingress-nginx-controller-69fbf79577-d5q2t",host="testapp.local",ingress="test-ingress",method="GET",namespace="test",path="/",service="",status="404",le="0.1"} 0
nginx_ingress_controller_response_size_bucket{controller_class="nginx",controller_namespace="ingress-nginx",controller_pod="ingress-nginx-controller-69fbf79577-d5q2t",host="testapp.local",ingress="test-ingress",method="GET",namespace="test",path="/",service="",status="404",le="0.2"} 0
nginx_ingress_controller_response_size_bucket{controller_class="nginx",controller_namespace="ingress-nginx",controller_pod="ingress-nginx-controller-69fbf79577-d5q2t",host="testapp.local",ingress="test-ingress",method="GET",namespace="test",path="/",service="",status="404",le="0.3"} 0
nginx_ingress_controller_response_size_bucket{controller_class="nginx",controller_namespace="ingress-nginx",controller_pod="ingress-nginx-controller-69fbf79577-d5q2t",host="testapp.local",ingress="test-ingress",method="GET",namespace="test",path="/",service="",status="404",le="0.5"} 0
nginx_ingress_controller_response_size_bucket{controller_class="nginx",controller_namespace="ingress-nginx",controller_pod="ingress-nginx-controller-69fbf79577-d5q2t",host="testapp.local",ingress="test-ingress",method="GET",namespace="test",path="/",service="",status="404",le="1"} 0
nginx_ingress_controller_response_size_bucket{controller_class="nginx",controller_namespace="ingress-nginx",controller_pod="ingress-nginx-controller-69fbf79577-d5q2t",host="testapp.local",ingress="test-ingress",method="GET",namespace="test",path="/",service="",status="404",le="5"} 0
nginx_ingress_controller_response_size_bucket{controller_class="nginx",controller_namespace="ingress-nginx",controller_pod="ingress-nginx-controller-69fbf79577-d5q2t",host="testapp.local",ingress="test-ingress",method="GET",namespace="test",path="/",service="",status="404",le="10"} 0
nginx_ingress_controller_response_size_bucket{controller_class="nginx",controller_namespace="ingress-nginx",controller_pod="ingress-nginx-controller-69fbf79577-d5q2t",host="testapp.local",ingress="test-ingress",method="GET",namespace="test",path="/",service="",status="404",le="+Inf"} 5

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
  • If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
  • Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label May 27, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @serge-r!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 27, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @serge-r. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 27, 2021
@serge-r
Copy link
Contributor Author

serge-r commented May 27, 2021

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
  • If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
  • Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

/check-cla

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels May 27, 2021
"flag"
"fmt"
"github.com/spf13/pflag"
Copy link
Contributor

Choose a reason for hiding this comment

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

It would be better to keep 3rd party modules after the standard ones.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you. Fixed

@@ -98,9 +100,11 @@ var (
// updating the library to latest version changed the output of the metrics
var defObjectives = map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001}

//var defBuckets = []float64{0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.5, 2.0, 10.0}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can remove this? If we no longer use it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed too

@serge-r
Copy link
Contributor Author

serge-r commented Jun 4, 2021

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: serge-r
To complete the pull request process, please assign elvinefendi after the PR has been reviewed.
You can assign the PR to them by writing /assign @elvinefendi in a comment when ready.

/assign @ElvinEfendi

@serge-r
Copy link
Contributor Author

serge-r commented Jun 22, 2021

@tokers @ElvinEfendi @rikatz Hello guys, any updates?

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2021
@rikatz rikatz changed the base branch from master to main July 16, 2021 13:12
@iamNoah1
Copy link
Contributor

iamNoah1 commented Aug 3, 2021

@serge-r reminder. PR needs a rebase

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 5, 2021
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 1, 2021
@kd7lxl
Copy link
Contributor

kd7lxl commented Oct 12, 2021

/assign @kd7lxl

@@ -157,6 +159,7 @@ Requires the update-status parameter.`)
`Enables the collection of NGINX metrics`)
metricsPerHost = flags.Bool("metrics-per-host", true,
`Export metrics per-host`)
metricsBucketStr = flags.String("metrics-buckets", "[0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5, 10]", "Set of buckets which will be used for prometheus histogram metrics")
Copy link
Contributor

@kd7lxl kd7lxl Oct 12, 2021

Choose a reason for hiding this comment

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

Since this is using pflag, the native type for this would be Float64Slice(). DurationSlice() might also be appropriate. This way the library handles the parsing and you won't need to unmarshal json.

@@ -157,6 +159,7 @@ Requires the update-status parameter.`)
`Enables the collection of NGINX metrics`)
metricsPerHost = flags.Bool("metrics-per-host", true,
`Export metrics per-host`)
metricsBucketStr = flags.String("metrics-buckets", "[0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5, 10]", "Set of buckets which will be used for prometheus histogram metrics")
Copy link
Contributor

Choose a reason for hiding this comment

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

You might consider referencing prometheus.DefBuckets explicitly as the default instead of duplicating it.

@strongjz
Copy link
Member

strongjz commented Nov 9, 2021

@serge-r any update on the comments for this review?

@serge-r
Copy link
Contributor Author

serge-r commented Nov 12, 2021

Hello. Thank you for review and sorry for delay. I will check and fix on next week.

@k8s-ci-robot
Copy link
Contributor

@kd7lxl: changing LGTM is restricted to collaborators

In response to this:

/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Contributor

@iamNoah1 iamNoah1 left a comment

Choose a reason for hiding this comment

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

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 2, 2021
@rikatz
Copy link
Contributor

rikatz commented Dec 17, 2021

/assign

@iamNoah1
Copy link
Contributor

@kd7lxl you will need to rebase in order to get the sec issues fixed :)

@kd7lxl
Copy link
Contributor

kd7lxl commented Jan 12, 2022

@kd7lxl you will need to rebase in order to get the sec issues fixed :)

Sorry, I don't think I have permission to rebase @serge-r's fork.

@iamNoah1
Copy link
Contributor

ups sorry I meant @serge-r

@rikatz
Copy link
Contributor

rikatz commented Jan 12, 2022

Hi,

First of all, sorry for the long delay. It has been busy days, and I completely missed this PR. Next time you need my attention, please feel free to ping me in Slack.

I'll approve this, but you need to rebase over main again (sorry...) so the gosec issue is gone. This was a local bug here :/

/approve
/lgtm
/hold

Thanks!

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 12, 2022
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 14, 2022
@rikatz
Copy link
Contributor

rikatz commented Jan 15, 2022

/lgtm
Thanks

@rikatz
Copy link
Contributor

rikatz commented Jan 15, 2022

/hold cancel

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jan 15, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kd7lxl, rikatz, serge-r

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Crevil
Copy link

Crevil commented Jan 19, 2022

Thank you so much for impementing this @iamNoah1 🙌

@tao12345666333 tao12345666333 mentioned this pull request Feb 27, 2022
rchshld pushed a commit to joomcode/ingress-nginx that referenced this pull request May 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants