Skip to content

🌱 metrics: use v1beta2 for condition metrics and add metrics for dockercluster devcluster dockermachine devmachine extensionconfig ipaddressclaim and crs #12006

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

Merged

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented Mar 20, 2025

What this PR does / why we need it:

Changes all condition metrics to expose metrics from v1beta2 structs.

Adds new metrics for (only condition metrics for v1beta2):

  • dockercluster
  • devcluster
  • dockermachine
  • devmachine
  • extensionconfig
  • ipaddressclaim
  • clusterresourceset

Generated via #9347

/area devtools

Generated via:

git checkout chrischdi/pr-update-crd-metrics-config
make generate-metrics-config
cp config/metrics/metrics.yaml config/metrics/crd-metrics-config.yaml
cp config/metrics/rbac.yaml config/metrics/crd-clusterrole.yaml

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 #

@k8s-ci-robot k8s-ci-robot added area/devtools Issues or PRs related to devtools cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 20, 2025
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 20, 2025
@sbueringer
Copy link
Member

sbueringer commented Mar 20, 2025

I wonder if we should just only emit v1beta2 conditions without a v1beta2 string in the metric name.

This gives us future proof metrics from now onwards

(we also know that v1beta1 conditions are not exactly perfect)

@chrischdi chrischdi force-pushed the pr-update-crd-metrics-config branch from 7d7a337 to 1fc6261 Compare March 20, 2025 15:46
@chrischdi chrischdi changed the title metrics: update config to include v1beta2 conditions 🌱 metrics: replace v1beta1 by v1beta2 conditions and add metrics for dockercluster devcluster dockermachine devmachine extensionconfig ipaddressclaim and crs Mar 20, 2025
@chrischdi chrischdi changed the title 🌱 metrics: replace v1beta1 by v1beta2 conditions and add metrics for dockercluster devcluster dockermachine devmachine extensionconfig ipaddressclaim and crs 🌱 metrics: use v1beta2 for condition metrics and add metrics for dockercluster devcluster dockermachine devmachine extensionconfig ipaddressclaim and crs Mar 20, 2025
@sbueringer
Copy link
Member

In general seems fine. Obviously did not review the diff of the metrics config. I'll do that eventually on 9347.

Did you check that our Grafana dashboards still work? (specifically the ones using conditions)

@chrischdi chrischdi force-pushed the pr-update-crd-metrics-config branch from 943aea4 to 1006ebf Compare March 24, 2025 14:48
@chrischdi
Copy link
Member Author

In general seems fine. Obviously did not review the diff of the metrics config. I'll do that eventually on 9347.

Did you check that our Grafana dashboards still work? (specifically the ones using conditions)

checked and adjusted dashboards a bit. Hope I catched all cases.

@chrischdi chrischdi added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Mar 24, 2025
@sbueringer
Copy link
Member

Thank you very much!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 28, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 16c2f03c9bc03fef869e3fd61c44cd9af631c3de

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 28, 2025
@chrischdi
Copy link
Member Author

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.10

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.

@k8s-ci-robot k8s-ci-robot merged commit 03cb3b4 into kubernetes-sigs:main Mar 28, 2025
19 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Mar 28, 2025
@k8s-infra-cherrypick-robot

@chrischdi: new pull request created: #12041

In response to this:

/cherry-pick release-1.10

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.

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. area/devtools Issues or PRs related to devtools cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants