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

Change metrics names #643

Merged
merged 1 commit into from
Aug 10, 2023
Merged

Change metrics names #643

merged 1 commit into from
Aug 10, 2023

Conversation

assafad
Copy link
Contributor

@assafad assafad commented Aug 8, 2023

What this PR does / why we need it:
This PR changes SSP metrics names, in order to meet the metrics naming conventions, and to successfully pass the metrics names linter.

Which issue(s) this PR fixes:
https://issues.redhat.com/browse/CNV-30668

Release note:

Deprecation notice for the metrics listed in the PR. They will be removed in this release. Please update your systems to use the new metrics names.
ssp_operator_reconciling_properly -> kubevirt_ssp_operator_reconcile_succeeded
kubevirt_ssp_num_of_operator_reconciling_properly -> kubevirt_ssp_operator_reconcile_succeeded_aggregated
total_rejected_vms -> kubevirt_ssp_template_validator_rejected_total
kubevirt_ssp_rejected_vms_total -> kubevirt_ssp_template_validator_rejected_increase
total_restored_common_templates -> kubevirt_ssp_common_templates_restored_total
kubevirt_ssp_common_templates_restored_total -> kubevirt_ssp_common_templates_restored_increase
Kubevirt_ssp_template_validator_up_total -> kubevirt_ssp_template_validator_up
Kubevirt_ssp_operator_up_total -> kubevirt_ssp_operator_up

@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Aug 8, 2023
@assafad
Copy link
Contributor Author

assafad commented Aug 8, 2023

@sradco, @0xFelix can you please review?

docs/metrics.md Show resolved Hide resolved
@assafad
Copy link
Contributor Author

assafad commented Aug 9, 2023

/hold

@kubevirt-bot kubevirt-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 9, 2023
Copy link
Member

@0xFelix 0xFelix left a comment

Choose a reason for hiding this comment

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

/approve

@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 0xFelix

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

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 9, 2023
@assafad assafad force-pushed the metrics-names branch 3 times, most recently from 963fde8 to 0863b40 Compare August 9, 2023 13:28
@sradco
Copy link
Collaborator

sradco commented Aug 9, 2023

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 9, 2023
@assafad
Copy link
Contributor Author

assafad commented Aug 9, 2023

/unhold

@kubevirt-bot kubevirt-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 9, 2023
@kubevirt-bot kubevirt-bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 9, 2023
Signed-off-by: assafad <[email protected]>
@sonarcloud
Copy link

sonarcloud bot commented Aug 9, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
8.2% 8.2% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@sradco
Copy link
Collaborator

sradco commented Aug 9, 2023

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 9, 2023
@assafad
Copy link
Contributor Author

assafad commented Aug 10, 2023

@0xFelix Can we merge this one?

@0xFelix 0xFelix merged commit 7fff3eb into kubevirt:main Aug 10, 2023
4 of 5 checks passed
@0xFelix
Copy link
Member

0xFelix commented Aug 10, 2023

Merged manually to workaround failing reviewers automation

@akrejcir
Copy link
Collaborator

@assafad, The Jira ticket is targeted to 4.14. Do you want to backport this to release-v0.18?

@assafad
Copy link
Contributor Author

assafad commented Aug 15, 2023

/cherry-pick release-v0.18

@kubevirt-bot
Copy link
Contributor

@assafad: #643 failed to apply on top of branch "release-v0.18":

Applying: Change metrics names
Using index info to reconstruct a base tree...
M	controllers/ssp_controller.go
A	tools/prom-metrics-collector/metrics_collector.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tools/prom-metrics-collector/metrics_collector.go deleted in HEAD and modified in Change metrics names. Version Change metrics names of tools/prom-metrics-collector/metrics_collector.go left in tree.
Auto-merging controllers/ssp_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Change metrics names
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.18

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.

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. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants