Update quota metric #169

sradco · 2026-01-01T09:28:50Z

What this PR does / why we need it:
Updated the
kube_application_aware_resourcequota_creation_timestamp metric name to
kube_application_aware_resourcequota_creation_timestamp_seconds to meet the Prometheus naming conventions
and added a recording rule for backwards compatability.

The PR also adds the prometheus unit tests, the metrics naming linter and the docs generator, like we have the the rest of the kubevirt operators.

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 #

Special notes for your reviewer:

Release note:

Update kube_application_aware_resourcequota_creation_timestamp metric name to
kube_application_aware_resourcequota_creation_timestamp_seconds to meet the Prometheus naming conventions.

sradco · 2026-01-01T09:29:04Z

@Barakmor1 please review this PR

sourcery-ai

Hey - I've reviewed your changes and they look great!

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

Barakmor1 · 2026-01-04T08:00:07Z

Thanks for this work. At first glance, it looks like many different changes are in one commit. It would be much easier to review if this was split into several commits. For example, one commit for docs, one for the linter, one for renaming, and one for the recording rule for backward compatibility. Reviewing everything in one commit is very hard.

Also, we already have a metrics docs generator in AAQ:
https://github.com/kubevirt/application-aware-quota/blob/main/tools/metrics-docs/metricsdocs.go

One more note: AAQ uses Prow for automation, not GitHub Actions. I prefer not to mix these two. If needed, we can add a postsubmit job later using:
https://github.com/kubevirt/project-infra/blob/main/github/ci/prow-deploy/files/jobs/kubevirt/application-aware-quota/application-aware-quota-postsubmits.yaml

We can also do this as follow-up work later.

sradco · 2026-01-05T11:58:19Z

@Barakmor1 Hi, Updated the PR. Please review

tools/doc-generator/doc-generator.go

sradco · 2026-01-07T13:05:31Z

@Barakmor1 Thank you for the review. I updated the PR based on your review. Please review again.

hack/prom-metric-linter/metric_name_linter.sh

Makefile

pkg/monitoring/rules/recordingrules/recordingrules.go

Update the use of github.com/machadovilaca/operator-observabilit to github.com/rhobs/operator-observability-toolkit Signed-off-by: Shirly Radco <[email protected]>

Updated kube_application_aware_resourcequota_creation_timestamp to kube_application_aware_resourcequota_creation_timestamp_seconds to comply with the Prometheus naming conventions. Signed-off-by: Shirly Radco <[email protected]>

Add a backwards compatability recording rule, kube_application_aware_resourcequota_creation_timestamp, since the original metric name was updated to kube_application_aware_resourcequota_creation_timestamp_seconds Signed-off-by: Shirly Radco <[email protected]>

Signed-off-by: Shirly Radco <[email protected]>

sradco · 2026-01-13T13:20:01Z

@Barakmor1 Hi, Updated the PR. Please review

Barakmor1 · 2026-01-14T14:11:51Z

pkg/monitoring/rules/rules.go

+			"prometheus":      "k8s",
+			"role":            "alert-rules",
+			"aaq.kubevirt.io": "",


why do we need these labels?

wouldn't "aaq.kubevirt.io": "", be enough?

Barakmor1 · 2026-01-14T14:18:41Z

pkg/aaq-operator/prometheus.go

+	// Build PrometheusRule from registered rules (recording rules and alerts)
+	// If building rules fails (e.g., none registered), we proceed with the other resources.
+	var prometheusRule *promv1.PrometheusRule
+	if err := aaqrules.SetupRules(); err == nil {
+		if ruleObj, buildErr := aaqrules.BuildPrometheusRule(namespace); buildErr == nil {
+			prometheusRule = ruleObj
+		}
+	}
+


can you move this below

prometheusResources := []client.Object{ namespaced.NewPrometheusServiceMonitor(namespace), namespaced.NewPrometheusRole(namespace), namespaced.NewPrometheusRoleBinding(namespace), namespaced.NewPrometheusService(namespace), }

and include this code on the same block:

prometheusResources = append(prometheusResources, prometheusRule)

something like:

if err := aaqrules.SetupRules(); err == nil { if ruleObj, buildErr := aaqrules.BuildPrometheusRule(namespace); buildErr == nil { prometheusResources = append(prometheusResources, ruleObj) } }

Barakmor1

left some comments

Barakmor1 · 2026-01-14T14:26:27Z

pkg/aaq-operator/prometheus.go

+				// For PrometheusRule, ensure Spec is reconciled as well (labels/annotations handled by MergeObject)
+				if prDesired, ok := desired.(*promv1.PrometheusRule); ok {
+					if prCurrent, ok2 := merged.(*promv1.PrometheusRule); ok2 {
+						// Copy spec if differs
+						if !equality.Semantic.DeepEqual(prCurrent.Spec, prDesired.Spec) {
+							prCurrent.Spec = prDesired.Spec
+						}
+					}
+				}


why do we need this?

Removed. No need for this explicit test.

Update the doc-generator based on the other kubevirt operators and add support for metrics and recording rules. Signed-off-by: Shirly Radco <[email protected]>

kubevirt-bot · 2026-01-14T14:44:10Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from barakmor1. For more information see the Code Review Process.

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

Details

Needs approval from an approver in each of these files:

OWNERS

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

sradco · 2026-01-15T11:37:03Z

/test pull-aaq-generate-verify

sradco · 2026-01-15T14:26:50Z

@Barakmor1 all tests pass. Please review

Barakmor1 · 2026-01-15T14:32:47Z

Hey, there are some comments that weren’t addressed yet:
#169 (comment)

#169 (comment)

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 Jan 1, 2026

kubevirt-bot requested review from Barakmor1 and iholder101 January 1, 2026 09:28

kubevirt-bot added the size/XS label Jan 1, 2026

sourcery-ai bot reviewed Jan 1, 2026

View reviewed changes

sradco force-pushed the update_metric_name branch from 1285076 to 4115dbe Compare January 1, 2026 11:34

kubevirt-bot added size/XL and removed size/XS labels Jan 1, 2026

sradco force-pushed the update_metric_name branch 2 times, most recently from c39ed92 to cff3f10 Compare January 1, 2026 12:37

kubevirt-bot added size/XXL and removed size/XL labels Jan 1, 2026

sradco force-pushed the update_metric_name branch 5 times, most recently from d523c29 to 6dbda3f Compare January 1, 2026 23:52

sradco force-pushed the update_metric_name branch from 6dbda3f to 55e0b0b Compare January 5, 2026 11:55

Barakmor1 reviewed Jan 6, 2026

View reviewed changes

tools/doc-generator/doc-generator.go Show resolved Hide resolved

sradco force-pushed the update_metric_name branch from 55e0b0b to 24c5410 Compare January 6, 2026 15:51

kubevirt-bot added size/XL and removed size/XXL labels Jan 6, 2026

Barakmor1 reviewed Jan 8, 2026

View reviewed changes

hack/prom-metric-linter/metric_name_linter.sh Show resolved Hide resolved

Barakmor1 reviewed Jan 8, 2026

View reviewed changes

Makefile Outdated Show resolved Hide resolved

Barakmor1 reviewed Jan 8, 2026

View reviewed changes

pkg/monitoring/rules/recordingrules/recordingrules.go Show resolved Hide resolved

sradco force-pushed the update_metric_name branch from 24c5410 to 42ecc7a Compare January 13, 2026 11:41

sradco added 5 commits January 13, 2026 15:09

Update machadovilaca to rhobs

e965be9

Update the use of github.com/machadovilaca/operator-observabilit to github.com/rhobs/operator-observability-toolkit Signed-off-by: Shirly Radco <[email protected]>

Update quota creation date metric name

50a550f

Updated kube_application_aware_resourcequota_creation_timestamp to kube_application_aware_resourcequota_creation_timestamp_seconds to comply with the Prometheus naming conventions. Signed-off-by: Shirly Radco <[email protected]>

Add CI tests for prometheus recording rules

eec4bdf

Signed-off-by: Shirly Radco <[email protected]>

Add metrics linter

d6278e7

Signed-off-by: Shirly Radco <[email protected]>

sradco force-pushed the update_metric_name branch from 42ecc7a to 35ba0df Compare January 13, 2026 13:18

Barakmor1 reviewed Jan 14, 2026

View reviewed changes

Barakmor1 requested changes Jan 14, 2026

View reviewed changes

kubevirt-bot assigned Barakmor1 Jan 14, 2026

Barakmor1 reviewed Jan 14, 2026

View reviewed changes

Align doc-generator as other operators

35a4818

Update the doc-generator based on the other kubevirt operators and add support for metrics and recording rules. Signed-off-by: Shirly Radco <[email protected]>

sradco force-pushed the update_metric_name branch from 35ba0df to 35a4818 Compare January 14, 2026 14:44

Update quota metric #169

Are you sure you want to change the base?

Update quota metric #169

Uh oh!

Conversation

sradco commented Jan 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sradco commented Jan 1, 2026

Uh oh!

sourcery-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Barakmor1 commented Jan 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sradco commented Jan 5, 2026

Uh oh!

Uh oh!

sradco commented Jan 7, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sradco commented Jan 13, 2026

Uh oh!

Barakmor1 Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Barakmor1 Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Barakmor1 Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Barakmor1 left a comment

Choose a reason for hiding this comment

Uh oh!

Barakmor1 Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

sradco Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

kubevirt-bot commented Jan 14, 2026

Uh oh!

sradco commented Jan 15, 2026

Uh oh!

sradco commented Jan 15, 2026

Uh oh!

Barakmor1 commented Jan 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

sradco commented Jan 1, 2026 •

edited

Loading

Barakmor1 commented Jan 4, 2026 •

edited

Loading

Barakmor1 Jan 14, 2026 •

edited

Loading