Skip to content

Add metrics for openshift's clusterquota#2779

Merged
joaopgrassi merged 3 commits intoopen-telemetry:mainfrom
ChrsMark:add_openshift_semconv
Oct 13, 2025
Merged

Add metrics for openshift's clusterquota#2779
joaopgrassi merged 3 commits intoopen-telemetry:mainfrom
ChrsMark:add_openshift_semconv

Conversation

@ChrsMark
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark commented Sep 16, 2025 •
edited
Loading

Fixes #2078.
Part of #1032.

Changes

This PR defines openshift's clusterquota metrics that are already in use by the Opentelemetry Collector.

The metrics added are the following similarly to the respective generic ResourceQuota PR:

openshift.clusterquota.cpu.limit.hard
openshift.clusterquota.cpu.limit.used
openshift.clusterquota.cpu.request.hard
openshift.clusterquota.cpu.request.used
openshift.clusterquota.memory.limit.hard
openshift.clusterquota.memory.limit.used
openshift.clusterquota.memory.request.hard
openshift.clusterquota.memory.request.used
openshift.clusterquota.hugepage_count.request.hard
openshift.clusterquota.hugepage_count.request.used
openshift.clusterquota.storage.request.hard
openshift.clusterquota.storage.request.used
openshift.clusterquota.persistentvolumeclaim_count.hard
openshift.clusterquota.persistentvolumeclaim_count.used
openshift.clusterquota.ephemeral_storage.request.hard
openshift.clusterquota.ephemeral_storage.request.used
openshift.clusterquota.ephemeral_storage.limit.hard
openshift.clusterquota.ephemeral_storage.limit.used
openshift.clusterquota.object_count.hard
openshift.clusterquota.object_count.used

refs:

Merge requirement checklist

  • CONTRIBUTING.md guidelines followed.
  • Change log entry added, according to the guidelines in When to add a changelog entry.
    • If your PR does not need a change log, start the PR title with [chore]
  • Links to the prototypes or existing instrumentations (when adding or changing conventions)

@ChrsMark ChrsMark self-assigned this Sep 16, 2025
@ChrsMark ChrsMark requested review from a team as code owners September 16, 2025 09:47
@github-actions github-actions Bot added the enhancement New feature or request label Sep 16, 2025
@ChrsMark ChrsMark force-pushed the add_openshift_semconv branch from e0e170d to a322fb0 Compare September 16, 2025 09:54
@ChrsMark ChrsMark mentioned this pull request Sep 16, 2025
Closed
@ChrsMark ChrsMark moved this from Untriaged to Awaiting codeowners approval in Semantic Conventions Triage Sep 16, 2025
@ChrsMark ChrsMark moved this to In Review in K8s SemConv SIG Sep 16, 2025
@ChrsMark ChrsMark force-pushed the add_openshift_semconv branch from a322fb0 to 2e9acef Compare September 16, 2025 10:06
@ChrsMark ChrsMark requested a review from a team as a code owner September 16, 2025 10:06
@ChrsMark ChrsMark force-pushed the add_openshift_semconv branch 2 times, most recently from 2e8f555 to e82b390 Compare September 16, 2025 10:20
@ChrsMark ChrsMark requested a review from jinja2 September 16, 2025 14:22
@ChrsMark ChrsMark moved this from In Review to Approved by K8s SIG in K8s SemConv SIG Sep 25, 2025
@ChrsMark ChrsMark moved this from Awaiting codeowners approval to Needs More Approval in Semantic Conventions Triage Sep 25, 2025
@ChrsMark
Copy link
Copy Markdown
Member Author

ChrsMark commented Sep 26, 2025

@open-telemetry/specs-semconv-maintainers this one is approved by the K8s SIG, please take a look when you get the chance

joaopgrassi
joaopgrassi reviewed Oct 1, 2025
View reviewed changes
Comment thread model/openshift/entities.yaml
Comment thread docs/resource/k8s.md Outdated
jsuereth
jsuereth reviewed Oct 1, 2025
View reviewed changes
Comment thread docs/registry/entities/openshift.md Outdated
jsuereth
jsuereth reviewed Oct 7, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@jsuereth jsuereth left a comment

Choose a reason for hiding this comment

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

Overall, CL looks good, but I do believe OpenShift should be a sub-directory in k8s, as we would push other k8s providers into.

Comment thread docs/resource/k8s.md Outdated
@ChrsMark ChrsMark force-pushed the add_openshift_semconv branch from 478b80e to 695762d Compare October 7, 2025 13:16
@ChrsMark ChrsMark force-pushed the add_openshift_semconv branch from f9d0b00 to 5b68961 Compare October 7, 2025 13:30
joaopgrassi
joaopgrassi approved these changes Oct 8, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@joaopgrassi joaopgrassi left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Please add a change log entry never mind 😅

@ChrsMark ChrsMark moved this from Needs More Approval to Ready to be Merged in Semantic Conventions Triage Oct 9, 2025
@ChrsMark
Copy link
Copy Markdown
Member Author

ChrsMark commented Oct 9, 2025

@joaopgrassi I'm moving this to ready for merge since it has enough approvals from both the SIG and semconv maintainers. Feel free to remove it if we still miss anything.

@joaopgrassi joaopgrassi added this pull request to the merge queue Oct 13, 2025
Merged via the queue into open-telemetry:main with commit c9d8f14 Oct 13, 2025
16 checks passed
@github-project-automation github-project-automation Bot moved this from Approved by K8s SIG to Done in K8s SemConv SIG Oct 13, 2025
chalin
chalin reviewed Oct 14, 2025
View reviewed changes
Comment thread docs/resource/k8s/k8s.md
Copy link
Copy Markdown
Contributor

@chalin chalin Oct 14, 2025

Choose a reason for hiding this comment

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

Hmm, this is breaking links on OTel.io. Should this rename:

  • have instead been docs/resource/k8s.md‎ to ‎docs/resource/k8s/README.md‎
  • rather than to docs/resource/k8s/k8s.md?

Also, as usual, when a file is moved, there should be an alias or redirect rule added.

Copy link
Copy Markdown
Contributor

@chalin chalin Oct 14, 2025

Choose a reason for hiding this comment

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

Let's move the discussion to:

@chalin chalin mentioned this pull request Oct 15, 2025
Merged
chalin
chalin reviewed Oct 15, 2025
View reviewed changes
Comment thread .github/CODEOWNERS
Comment on lines +82 to +83
/docs/resource/k8s/k8s.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
/docs/resource/k8s/openshift.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
Copy link
Copy Markdown
Contributor

@chalin chalin Oct 15, 2025

Choose a reason for hiding this comment

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

This entry should be to the entire directory /docs/resource/k8s. There is no need to list the files. For a fix, see:

@chalin
Copy link
Copy Markdown
Contributor

chalin commented Oct 15, 2025

For proposed followup changes, see:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dashpole dashpole dashpole approved these changes

@joaopgrassi joaopgrassi joaopgrassi approved these changes

@TylerHelmuth TylerHelmuth TylerHelmuth approved these changes

@jinja2 jinja2 Awaiting requested review from jinja2

@jsuereth jsuereth Awaiting requested review from jsuereth

+1 more reviewer

@chalin chalin chalin left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@ChrsMark ChrsMark

Labels

area:k8s enhancement New feature or request

Projects

K8s SemConv SIG
Status: Done
Semantic Conventions Triage
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[k8s] Define semantic conventions for k8s openshift metrics

6 participants

@ChrsMark @chalin @jsuereth @dashpole @joaopgrassi @TylerHelmuth