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

Metrics: Fix namespace in nginx_ingress_controller_ssl_expire_time_seconds. #10274

Merged
merged 1 commit into from
Sep 17, 2024
Merged

Metrics: Fix namespace in nginx_ingress_controller_ssl_expire_time_seconds. #10274

merged 1 commit into from
Sep 17, 2024

Conversation

alexey-gavrilov-flant
Copy link
Contributor

@alexey-gavrilov-flant alexey-gavrilov-flant commented Aug 3, 2023 •
edited
Loading

What this PR does / why we need it:

now the metric in the namespace label gives the value of where the controller is located but not the ingress itself, which is misleading for an engineer who studies the NGINXCertificateExpiry alert created on the basis of the nginx_ingress_controller_ssl_expire_time_seconds metric.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • CVE Report (Scanner found CVE and adding report)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

The hotfix will improve the NGINXCertificateExpiry alert. After the fix, it will contain information about the space where the ingress was created and the name of the secret, instead of where the ingress controller is, which is more convenient for understanding where to look for a faulty secret with a certificate.

How Has This Been Tested?

build and manually check the values of labels that are passed to Prometheus.

Checklist:

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

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Aug 3, 2023 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: alexey-gavrilov-flant (7dc34fa)

@k8s-ci-robot k8s-ci-robot requested review from rikatz and strongjz August 3, 2023 12:49
@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Aug 3, 2023
@netlify
Copy link

netlify bot commented Aug 3, 2023 •
edited
Loading

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit 7dc34fa
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/66e9949ff000040009d91cf2

@k8s-ci-robot
Copy link
Contributor

Welcome @alexey-gavrilov-flant!

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
Copy link
Contributor

Hi @alexey-gavrilov-flant. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. 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 Aug 3, 2023
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 31, 2023
@alexey-gavrilov-flant alexey-gavrilov-flant force-pushed the SetSSLExpireTime-fixed-namespace branch from 4153bee to 1a7544e Compare October 2, 2023 09:33
@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 2, 2023
@alexey-gavrilov-flant
Copy link
Contributor Author

@strongjz Could you please see my changes and advance ci to the next step?

@alexey-gavrilov-flant
Copy link
Contributor Author

@rikatz Could you please see my changes and advance ci to the next step?

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 9, 2024
@alexey-gavrilov-flant alexey-gavrilov-flant force-pushed the SetSSLExpireTime-fixed-namespace branch from 1a7544e to a7cbd31 Compare April 9, 2024 09:26
@alexey-gavrilov-flant
Copy link
Contributor Author

/check-required-labels

@alexey-gavrilov-flant
Copy link
Contributor Author

/auto-cc

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 9, 2024
@alexey-gavrilov-flant alexey-gavrilov-flant force-pushed the SetSSLExpireTime-fixed-namespace branch from a7cbd31 to ee332b1 Compare July 29, 2024 13:10
@alexey-gavrilov-flant
Copy link
Contributor Author

/auto-cc

@k8s-ci-robot k8s-ci-robot requested review from Gacko and puerco July 31, 2024 07:55
@longwuyuan
Copy link
Contributor

Hi,

Very few readers can completely understand the current state and the change proposed in this PR.

If you think its worth it, then you can post screenshots of current view and the screenshots of view after changed code. It will help make the PR clear to readers.
thanks

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. priority/backlog Higher priority than priority/awaiting-more-evidence. 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. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority labels Sep 17, 2024
@Gacko Gacko force-pushed the SetSSLExpireTime-fixed-namespace branch from 070b4d9 to 7dc34fa Compare September 17, 2024 14:39
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 17, 2024
@Gacko
Copy link
Member

Gacko commented Sep 17, 2024

Thank you for reviewing @sathieu!

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 17, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexey-gavrilov-flant, Gacko

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

@Gacko Gacko changed the title Metrics: Add namespace to nginx_ingress_controller_ssl_expire_time_seconds. Metrics: Fix namespace in nginx_ingress_controller_ssl_expire_time_seconds. Sep 17, 2024
@Gacko
Copy link
Member

Gacko commented Sep 17, 2024

With this understanding (the namespace was already defined for the metric but never set) we can safely cherry-pick this change to release-1.11 and release-1.10 once it got merged as it's rather a fix than a feature.

@Gacko
Copy link
Member

Gacko commented Sep 17, 2024

/cherry-pick release-1.10

@Gacko
Copy link
Member

Gacko commented Sep 17, 2024

/cherry-pick release-1.11

@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.10

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-sigs/prow repository.

@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.11

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-sigs/prow repository.

@Gacko
Copy link
Member

Gacko commented Sep 17, 2024

/kind bug

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Sep 17, 2024
@Gacko Gacko removed the kind/feature Categorizes issue or PR as related to a new feature. label Sep 17, 2024
@Gacko
Copy link
Member

Gacko commented Sep 17, 2024

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 17, 2024
@k8s-ci-robot k8s-ci-robot merged commit 9e6c406 into kubernetes:main Sep 17, 2024
36 checks passed
@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: new pull request created: #11985

In response to this:

/cherry-pick release-1.10

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-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Sep 17, 2024
Merged
@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: new pull request created: #11986

In response to this:

/cherry-pick release-1.11

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-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Sep 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gacko Gacko Gacko approved these changes

@sathieu sathieu sathieu left review comments

@rikatz rikatz Awaiting requested review from rikatz

@strongjz strongjz Awaiting requested review from strongjz

@tao12345666333 tao12345666333 Awaiting requested review from tao12345666333

@puerco puerco Awaiting requested review from puerco

@cpanato cpanato Awaiting requested review from cpanato

Assignees

@Gacko Gacko

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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alexey-gavrilov-flant @k8s-ci-robot @longwuyuan @Gacko @k8s-infra-cherrypick-robot @sathieu