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
Update metric names to fit metrics naming conventions #9821
Conversation
9669ee1
to
a1770d5
Compare
@machadovilaca @assafad @avlitman Please review |
/retest-required |
/retest-required |
Hi @sradco I'm not sure how it happened since I rebased few times before running the linter but my fork was not up to date so I missed some new metrics that also failing the linter. so needs to update this names as well: |
@avlitman please open the new metrics names that needs update in a separate issue, for an easier review. |
New issue: #9836 |
}, | ||
MType: prometheusv1.MetricTypeGauge, | ||
Description: "Total VM filesystem capacity in bytes. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_memory_domain_bytes_total", | ||
Expr: intstr.FromString("kubevirt_vmi_memory_domain_bytes"), | ||
}, | ||
MType: prometheusv1.MetricTypeGauge, | ||
Description: "The amount of memory in bytes allocated to the domain. The `memory` value in domain xml file. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_memory_pgmajfault", | ||
Expr: intstr.FromString("kubevirt_vmi_memory_pgmajfault_total"), | ||
}, | ||
MType: prometheusv1.MetricTypeCounter, | ||
Description: "The number of page faults when disk IO was required. Page faults occur when a process makes a valid access to virtual memory that is not available. When servicing the page fault, if disk IO is required, it is considered as major fault. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_memory_pgminfault", | ||
Expr: intstr.FromString("kubevirt_vmi_memory_pgminfault_total"), | ||
}, | ||
MType: prometheusv1.MetricTypeCounter, | ||
Description: "The number of other page faults, when disk IO was not required. Page faults occur when a process makes a valid access to virtual memory that is not available. When servicing the page fault, if disk IO is NOT required, it is considered as minor fault. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_memory_swap_in_traffic_bytes_total", | ||
Expr: intstr.FromString("kubevirt_vmi_memory_swap_in_traffic_bytes"), | ||
}, | ||
MType: prometheusv1.MetricTypeGauge, | ||
Description: "The total amount of data read from swap space of the guest in bytes. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_memory_swap_out_traffic_bytes_total", | ||
Expr: intstr.FromString("kubevirt_vmi_memory_swap_out_traffic_bytes"), | ||
}, | ||
MType: prometheusv1.MetricTypeGauge, | ||
Description: "The total amount of memory written out to swap space of the guest in bytes. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_outdated_count", | ||
Expr: intstr.FromString("kubevirt_vmi_number_of_outdated"), | ||
}, | ||
MType: prometheusv1.MetricTypeGauge, | ||
Description: "Indication for the total number of VirtualMachineInstance workloads that are not running within the most up-to-date version of the virt-launcher environment. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_storage_flush_times_ms_total", | ||
Expr: intstr.FromString("kubevirt_vmi_storage_flush_times_seconds_total * 1000"), | ||
}, | ||
MType: prometheusv1.MetricTypeCounter, | ||
Description: "Total time (ms) spent on cache flushing. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_storage_read_times_ms_total", | ||
Expr: intstr.FromString("kubevirt_vmi_storage_read_times_ms_total * 1000"), | ||
}, | ||
MType: prometheusv1.MetricTypeCounter, | ||
Description: "Total time (ms) spent on read operations. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_storage_write_times_ms_total", | ||
Expr: intstr.FromString("kubevirt_vmi_storage_write_times_seconds_total * 1000"), | ||
}, | ||
MType: prometheusv1.MetricTypeCounter, | ||
Description: "Total time (ms) spent on write operations. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_vcpu_seconds", | ||
Expr: intstr.FromString("kubevirt_vmi_vcpu_seconds_total"), | ||
}, | ||
MType: prometheusv1.MetricTypeCounter, | ||
Description: "Total amount of time spent in each state by each vcpu (cpu_time excluding hypervisor time). Where `id` is the vcpu identifier and `state` can be one of the following: [`OFFLINE`, `RUNNING`, `BLOCKED`]. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmi_vcpu_wait_seconds", | ||
Expr: intstr.FromString("kubevirt_vmi_vcpu_wait_seconds_total"), | ||
}, | ||
MType: prometheusv1.MetricTypeCounter, | ||
Description: "Amount of time spent by each vcpu while waiting on I/O. [Deprecated]", | ||
}, | ||
{ | ||
Rule: v1.Rule{ | ||
Record: "kubevirt_vmsnapshot_disks_restored_from_source_total", | ||
Expr: intstr.FromString("kubevirt_vmsnapshot_disks_restored_from_source"), | ||
}, | ||
MType: prometheusv1.MetricTypeGauge, | ||
Description: "Returns the total number of virtual machine disks restored from the source virtual machine. [Deprecated]", | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe can we move these to a separate function, maybe GetDeprecatedRecordingRules
, to have a clear distinction for the deprecated items?
maybe even somehow include the last version they were not deprecated -> GetDeprecatedRecordingRulesAfterRelease59
that would make it easier to track the metrics to completely remove after 2 minor releases or something, and it would be very simple to remove them
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I updated the PR so that the new metric names will be the recording rules and in 2 versions we would replace the metric names and remove the recording rules.
I did this since the help text is not visible for recording rule, only for metrics.
8c5fe6a
to
c335d1a
Compare
/retest-required |
1 similar comment
/retest-required |
/retest-required pull-kubevirt-code-lint isn't failing on something that is related to this PR. |
@machadovilaca @vladikr @lyarwood Please review. |
I don't really have any comments on the new names but I've got a few nits below regarding the PR description and release note:
I think you mean
Can we list the deprecated metrics in the docs somewhere and link to that here? Referencing the PR isn't helpful IMHO. Also as above I'd change this to |
c335d1a
to
1be736d
Compare
1be736d
to
550119b
Compare
550119b
to
7f91ee2
Compare
Updated kubevirt_vmi_vcpu_seconds to kubevirt_vmi_vcpu_seconds_total based on PR kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
/retest-required |
/retest-required |
1 similar comment
/retest-required |
@sradco: The following test failed, say
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. |
@akalenyu @awels @ShellyKa13 Hey! can you please keep me honest about the sig-storage being flaky on this PR? I saw it fail 4 times in a row, each time on a different test. |
Not aware of any particular flaky test in the storage lane. |
/retest-required |
@avlitman Lets wait with the retest, I will either override it or there is a real issue, one way or another we need assistance from the storage folks. |
So analyzing the failing lanes:
The other 3 runs have real flakes: This other flake And last one is this |
/retest-required |
/cherry-pick release-1.0 |
@enp0s3: #9821 failed to apply on top of branch "release-1.0":
In response to this:
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. |
@avlitman @assafad @machadovilaca Hi, please create a manual backport PR. |
Updated kubevirt metrics names: kubevirt_vmi_vcpu_wait_seconds to kubevirt_vmi_vcpu_wait_seconds_total kubevirt_vmsnapshot_disks_restored_from_source_total to kubevirt_vmsnapshot_disks_restored_from_source kubevirt_vmi_memory_swap_in_traffic_bytes_total to kubevirt_vmi_memory_swap_in_traffic_bytes kubevirt_vmi_memory_swap_out_traffic_bytes_total to kubevirt_vmi_memory_swap_out_traffic_bytes Based on PR kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
Updated live migration metrics names kubevirt_migrate_vmi_pending_count to kubevirt_vmi_migrations_pending kubevirt_migrate_vmi_scheduling_count to kubevirt_vmi_migrations_scheduling kubevirt_migrate_vmi_running_count to kubevirt_vmi_migrations_running kubevirt_migrate_vmi_succeeded to kubevirt_vmi_migrations_succeeded kubevirt_migrate_vmi_failed to kubevirt_vmi_migrations_failed Based on PR kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
Updated live migration metrics names kubevirt_migrate_vmi_data_processed_bytes to kubevirt_vmi_migration_data_processed_bytes kubevirt_migrate_vmi_data_remaining_bytes to kubevirt_vmi_migration_data_remaining_bytes kubevirt_migrate_vmi_dirty_memory_rate_bytes to kubevirt_vmi_migration_memory_transfer_rate_bytes kubevirt_migrate_vmi_pending_count to kubevirt_vmi_migrations_in_pending_phase kubevirt_migrate_vmi_scheduling_count to kubevirt_vmi_migrations_in_scheduling_phase kubevirt_migrate_vmi_running_count to kubevirt_vmi_migrations_in_running_phase kubevirt_migrate_vmi_succeeded to kubevirt_vmi_migration_succeeded kubevirt_migrate_vmi_failed to kubevirt_vmi_migration_failed Based on PR kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
Updated kubevirt metrics names: kubevirt_vmi_vcpu_wait_seconds to kubevirt_vmi_vcpu_wait_seconds_total kubevirt_vmsnapshot_disks_restored_from_source_total to kubevirt_vmsnapshot_disks_restored_from_source kubevirt_vmi_memory_swap_in_traffic_bytes_total to kubevirt_vmi_memory_swap_in_traffic_bytes kubevirt_vmi_memory_swap_out_traffic_bytes_total to kubevirt_vmi_memory_swap_out_traffic_bytes kubevirt_migrate_vmi_data_processed_bytes to kubevirt_vmi_migration_data_processed_bytes kubevirt_migrate_vmi_data_remaining_bytes to kubevirt_vmi_migration_data_remaining_bytes kubevirt_migrate_vmi_dirty_memory_rate_bytes to kubevirt_vmi_migration_memory_transfer_rate_bytes kubevirt_migrate_vmi_pending_count to kubevirt_vmi_migrations_in_pending_phase kubevirt_migrate_vmi_scheduling_count to kubevirt_vmi_migrations_in_scheduling_phase kubevirt_migrate_vmi_running_count to kubevirt_vmi_migrations_in_running_phase kubevirt_migrate_vmi_succeeded to kubevirt_vmi_migration_succeeded kubevirt_migrate_vmi_failed to kubevirt_vmi_migration_failed Based on PR kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
Updated kubevirt metrics names: kubevirt_vmi_vcpu_wait_seconds to kubevirt_vmi_vcpu_wait_seconds_total kubevirt_vmsnapshot_disks_restored_from_source_total to kubevirt_vmsnapshot_disks_restored_from_source kubevirt_vmi_memory_swap_in_traffic_bytes_total to kubevirt_vmi_memory_swap_in_traffic_bytes kubevirt_vmi_memory_swap_out_traffic_bytes_total to kubevirt_vmi_memory_swap_out_traffic_bytes kubevirt_migrate_vmi_data_processed_bytes to kubevirt_vmi_migration_data_processed_bytes kubevirt_migrate_vmi_data_remaining_bytes to kubevirt_vmi_migration_data_remaining_bytes kubevirt_migrate_vmi_dirty_memory_rate_bytes to kubevirt_vmi_migration_memory_transfer_rate_bytes kubevirt_migrate_vmi_pending_count to kubevirt_vmi_migrations_in_pending_phase kubevirt_migrate_vmi_scheduling_count to kubevirt_vmi_migrations_in_scheduling_phase kubevirt_migrate_vmi_running_count to kubevirt_vmi_migrations_in_running_phase kubevirt_migrate_vmi_succeeded to kubevirt_vmi_migration_succeeded kubevirt_migrate_vmi_failed to kubevirt_vmi_migration_failed Based on PR kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
Updated kubevirt metrics names: kubevirt_vmi_vcpu_wait_seconds to kubevirt_vmi_vcpu_wait_seconds_total kubevirt_vmsnapshot_disks_restored_from_source_total to kubevirt_vmsnapshot_disks_restored_from_source kubevirt_vmi_memory_swap_in_traffic_bytes_total to kubevirt_vmi_memory_swap_in_traffic_bytes kubevirt_vmi_memory_swap_out_traffic_bytes_total to kubevirt_vmi_memory_swap_out_traffic_bytes kubevirt_migrate_vmi_data_processed_bytes to kubevirt_vmi_migration_data_processed_bytes kubevirt_migrate_vmi_data_remaining_bytes to kubevirt_vmi_migration_data_remaining_bytes kubevirt_migrate_vmi_dirty_memory_rate_bytes to kubevirt_vmi_migration_memory_transfer_rate_bytes kubevirt_migrate_vmi_pending_count to kubevirt_vmi_migrations_in_pending_phase kubevirt_migrate_vmi_scheduling_count to kubevirt_vmi_migrations_in_scheduling_phase kubevirt_migrate_vmi_running_count to kubevirt_vmi_migrations_in_running_phase kubevirt_migrate_vmi_succeeded to kubevirt_vmi_migration_succeeded kubevirt_migrate_vmi_failed to kubevirt_vmi_migration_failed Based on PR kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
Updated kubevirt_vmi_vcpu_seconds to kubevirt_vmi_vcpu_seconds_total based on PR kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
Updated kubevirt metrics names: kubevirt_vmi_vcpu_wait_seconds to kubevirt_vmi_vcpu_wait_seconds_total kubevirt_vmsnapshot_disks_restored_from_source_total to kubevirt_vmsnapshot_disks_restored_from_source kubevirt_vmi_memory_swap_in_traffic_bytes_total to kubevirt_vmi_memory_swap_in_traffic_bytes kubevirt_vmi_memory_swap_out_traffic_bytes_total to kubevirt_vmi_memory_swap_out_traffic_bytes kubevirt_migrate_vmi_data_processed_bytes to kubevirt_vmi_migration_data_processed_bytes kubevirt_migrate_vmi_data_remaining_bytes to kubevirt_vmi_migration_data_remaining_bytes kubevirt_migrate_vmi_dirty_memory_rate_bytes to kubevirt_vmi_migration_memory_transfer_rate_bytes kubevirt_migrate_vmi_pending_count to kubevirt_vmi_migrations_in_pending_phase kubevirt_migrate_vmi_scheduling_count to kubevirt_vmi_migrations_in_scheduling_phase kubevirt_migrate_vmi_running_count to kubevirt_vmi_migrations_in_running_phase kubevirt_migrate_vmi_succeeded to kubevirt_vmi_migration_succeeded kubevirt_migrate_vmi_failed to kubevirt_vmi_migration_failed Based on PR kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
Updated kubevirt metrics names: kubevirt_vmi_vcpu_wait_seconds to kubevirt_vmi_vcpu_wait_seconds_total kubevirt_vmsnapshot_disks_restored_from_source_total to kubevirt_vmsnapshot_disks_restored_from_source kubevirt_vmi_memory_swap_in_traffic_bytes_total to kubevirt_vmi_memory_swap_in_traffic_bytes kubevirt_vmi_memory_swap_out_traffic_bytes_total to kubevirt_vmi_memory_swap_out_traffic_bytes kubevirt_migrate_vmi_data_processed_bytes to kubevirt_vmi_migration_data_processed_bytes kubevirt_migrate_vmi_data_remaining_bytes to kubevirt_vmi_migration_data_remaining_bytes kubevirt_migrate_vmi_dirty_memory_rate_bytes to kubevirt_vmi_migration_memory_transfer_rate_bytes kubevirt_migrate_vmi_pending_count to kubevirt_vmi_migrations_in_pending_phase kubevirt_migrate_vmi_scheduling_count to kubevirt_vmi_migrations_in_scheduling_phase kubevirt_migrate_vmi_running_count to kubevirt_vmi_migrations_in_running_phase kubevirt_migrate_vmi_succeeded to kubevirt_vmi_migration_succeeded kubevirt_migrate_vmi_failed to kubevirt_vmi_migration_failed Based on PR kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
Update kubevirt-top-consumers dashboard. Replace: kubevirt_vmi_vcpu_wait_seconds -> kubevirt_vmi_vcpu_wait_seconds_total kubevirt_vmi_memory_swap_in_traffic_bytes_total -> kubevirt_vmi_memory_swap_in_traffic_bytes Since the vCPU Wait by Virtual Machines and Memory Swap Traffic by Virtual Machines graphs are also empty on CNV engineering due to the changes in: kubevirt/kubevirt#9821 Signed-off-by: Shirly Radco <sradco@redhat.com>
Signed-off-by: Shirly Radco sradco@redhat.com
What this PR does / why we need it:
This PR updated metrics names to meet the metrics naming conventions.
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close the issue(s) when PR gets merged):Fixes #9714
Special notes for your reviewer:
Release note: