feat: Add Disk Metrics #9344

R3hankhan123 · 2025-07-15T15:11:51Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

This PR implements the previously missing disk metrics:

container_fs_inodes_free
container_fs_inodes_total
container_fs_limit_bytes
container_fs_usage_bytes

Which issue(s) this PR fixes:

contributes towards #9125

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

No

Added disk metrics (`container_fs_inodes_free`, `container_fs_inodes_total`, `container_fs_limit_bytes`, `container_fs_usage_bytes`)

openshift-ci · 2025-07-15T15:12:04Z

Hi @R3hankhan123. Thanks for your PR.

I'm waiting for a cri-o 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-sigs/prow repository.

internal/lib/stats/disk_metrics.go

bitoku · 2025-07-15T17:09:46Z

Thanks @R3hankhan123 . Can you add e2e tests in test/cri-metrics.bats?

R3hankhan123 · 2025-07-16T05:09:57Z

Thanks @R3hankhan123 . Can you add e2e tests in test/cri-metrics.bats?

Done @bitoku

codecov · 2025-07-16T08:30:45Z

Codecov Report

❌ Patch coverage is 65.57377% with 42 lines in your changes missing coverage. Please review.
✅ Project coverage is 64.19%. Comparing base (75feb2f) to head (2d66de3).
⚠️ Report is 9 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #9344      +/-   ##
==========================================
- Coverage   64.19%   64.19%   -0.01%     
==========================================
  Files         203      205       +2     
  Lines       28259    28357      +98     
==========================================
+ Hits        18142    18204      +62     
- Misses       8524     8553      +29     
- Partials     1593     1600       +7

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

bitoku · 2025-07-16T10:09:51Z

/ok-to-test

R3hankhan123 · 2025-07-16T14:04:04Z

@bitoku can you help me debug the prow tests, i see that container is being exited but can't find the reason why exactly its exiting

bitoku · 2025-07-16T14:09:41Z

@R3hankhan123
See the path of the URL to know where the log is.
For integration tests
https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/cri-o_cri-o/9344/pull-ci-cri-o-cri-o-main-ci-fedora-integration/1945473469558820864/artifacts/fedora-integration/cri-o-gather/artifacts/testout.txt

I think other e2e tests come from infra issues, not because of this change.

R3hankhan123 · 2025-07-16T14:34:16Z

@bitoku , looks like port 9090 is being used when trying to run disk metrics but its already in use, should i kill the process that is using the port (ie memory metrics crio) wdyt

internal/lib/stats/disk_metrics.go

bitoku · 2025-07-16T14:42:43Z

@R3hankhan123 You can use free_port.

cri-o/test/conmon.bats

Lines 17 to 20 in 7c127d3

    
           port=$(free_port) 
        
           CONTAINER_ENABLE_METRICS=true \ 
        
           	CONTAINER_METRICS_PORT=$port \ 
        
           	start_crio

R3hankhan123 · 2025-11-03T13:09:51Z

/retest

internal/oci/container.go

Signed-off-by: Rehan Khan <[email protected]>

haircommander · 2025-11-03T17:46:43Z

/approve

@cri-o/cri-o-maintainers PTAL

saschagrunert

Code LGTM, but please fix the linting and space-at-eol CI.

openshift-ci · 2025-11-04T08:40:16Z

@R3hankhan123: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/ci-e2e-evented-pleg	`3c601f7`	link	false	`/test ci-e2e-evented-pleg`

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

R3hankhan123 · 2025-11-04T08:40:25Z

Done @saschagrunert , can you re trigger those pipelines, thank you

R3hankhan123 · 2025-11-04T08:40:49Z

/retest

test/cri-metrics.bats

Signed-off-by: Rehan Khan <[email protected]>

R3hankhan123 · 2025-11-04T12:44:32Z

Hi @saschagrunert i see that you have wrote but i cant find it, so writing it here, we cannot re-use wait_for_metric.Then call crictl metricsp | jq '.podMetrics[0].containerMetrics[0].metrics[] | select(.name == "container_fs_inodes_free") | .value.value | tonumber' afterwards as that loop check for change in value of metrics

openshift-ci · 2025-11-04T14:12:20Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, R3hankhan123, saschagrunert

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:

~~OWNERS~~ [haircommander,saschagrunert]

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

R3hankhan123 requested a review from mrunalp as a code owner July 15, 2025 15:11

openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jul 15, 2025

openshift-ci bot requested review from hasan4791 and littlejawa July 15, 2025 15:12

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 15, 2025

haircommander reviewed Jul 15, 2025

View reviewed changes

internal/lib/stats/disk_metrics.go Outdated Show resolved Hide resolved

R3hankhan123 marked this pull request as draft July 15, 2025 16:21

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 15, 2025

R3hankhan123 force-pushed the disk-metrics branch from 7ba0ec1 to 9df95df Compare July 15, 2025 16:24

R3hankhan123 marked this pull request as ready for review July 15, 2025 16:24

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 15, 2025

openshift-ci bot requested review from bitoku and klihub July 15, 2025 16:25

R3hankhan123 force-pushed the disk-metrics branch from 9df95df to 2a81e7d Compare July 16, 2025 05:09

R3hankhan123 force-pushed the disk-metrics branch from 2a81e7d to bf0ebff Compare July 16, 2025 08:59

openshift-ci bot 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 Jul 16, 2025

R3hankhan123 force-pushed the disk-metrics branch from bf0ebff to 0bd729d Compare July 16, 2025 13:19

bitoku reviewed Jul 16, 2025

View reviewed changes

internal/lib/stats/disk_metrics.go Outdated Show resolved Hide resolved

haircommander reviewed Nov 3, 2025

View reviewed changes

internal/oci/container.go Outdated Show resolved Hide resolved

R3hankhan123 added 3 commits November 3, 2025 22:19

feat: Added Disk Metrics

8b8028b

Signed-off-by: Rehan Khan <[email protected]>

Extended ContainerStats to include disk metrics

d9694a4

Signed-off-by: Rehan Khan <[email protected]>

Extend Disk Metrics for other filesystems

7fda065

Signed-off-by: Rehan Khan <[email protected]>

R3hankhan123 force-pushed the disk-metrics branch from b61ca1b to b3b229f Compare November 3, 2025 16:50

R3hankhan123 requested a review from haircommander November 3, 2025 16:55

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 3, 2025

R3hankhan123 force-pushed the disk-metrics branch from b3b229f to d9da506 Compare November 4, 2025 04:46

saschagrunert reviewed Nov 4, 2025

View reviewed changes

R3hankhan123 force-pushed the disk-metrics branch from d9da506 to 67a088c Compare November 4, 2025 08:39

R3hankhan123 force-pushed the disk-metrics branch from 67a088c to 33c0d9b Compare November 4, 2025 09:18

R3hankhan123 requested a review from saschagrunert November 4, 2025 10:32

saschagrunert reviewed Nov 4, 2025

View reviewed changes

test/cri-metrics.bats Outdated Show resolved Hide resolved

R3hankhan123 force-pushed the disk-metrics branch from 33c0d9b to 1d8f64b Compare November 4, 2025 11:05

R3hankhan123 commented Nov 4, 2025

View reviewed changes

test/cri-metrics.bats Outdated Show resolved Hide resolved

feat: extend oci runtime to collect and manage disk metrics

2d66de3

Signed-off-by: Rehan Khan <[email protected]>

R3hankhan123 force-pushed the disk-metrics branch from 1d8f64b to 2d66de3 Compare November 4, 2025 11:35

R3hankhan123 requested a review from saschagrunert November 4, 2025 11:35

saschagrunert approved these changes Nov 4, 2025

View reviewed changes

openshift-ci bot assigned saschagrunert Nov 4, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 4, 2025

openshift-merge-bot bot merged commit aa2e4a3 into cri-o:main Nov 4, 2025
75 checks passed

R3hankhan123 deleted the disk-metrics branch November 4, 2025 14:25

feat: Add Disk Metrics #9344

feat: Add Disk Metrics #9344

Uh oh!

Conversation

R3hankhan123 commented Jul 15, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

openshift-ci bot commented Jul 15, 2025

Uh oh!

Uh oh!

bitoku commented Jul 15, 2025

Uh oh!

R3hankhan123 commented Jul 16, 2025

Uh oh!

codecov bot commented Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

bitoku commented Jul 16, 2025

Uh oh!

R3hankhan123 commented Jul 16, 2025

Uh oh!

bitoku commented Jul 16, 2025

Uh oh!

R3hankhan123 commented Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

bitoku commented Jul 16, 2025

Uh oh!

R3hankhan123 commented Nov 3, 2025

Uh oh!

Uh oh!

haircommander commented Nov 3, 2025

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Nov 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

R3hankhan123 commented Nov 4, 2025

Uh oh!

R3hankhan123 commented Nov 4, 2025

Uh oh!

Uh oh!

Uh oh!

R3hankhan123 commented Nov 4, 2025

Uh oh!

openshift-ci bot commented Nov 4, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

R3hankhan123 commented Jul 15, 2025 •

edited by openshift-ci bot

Loading

codecov bot commented Jul 16, 2025 •

edited

Loading

R3hankhan123 commented Jul 16, 2025 •

edited

Loading

openshift-ci bot commented Nov 4, 2025 •

edited

Loading