starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-11 21:10:29 +01:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

[PR #17956] [MERGED] 12596 Add Allocated Resources to Cluster API #15236

New Issue
Closed
opened 2025-12-30 00:20:47 +01:00 by adam · 0 comments
adam commented 2025-12-30 00:20:47 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/17956
Author: @arthanson
Created: 11/7/2024
Status: ✅ Merged
Merged: 11/15/2024
Merged by: @jeremystretch

Base: feature ← Head: 12596-cluster-api

📝 Commits (8)

  • 2ac38e3 12596 Add Allocated Resources to Cluster API
  • 855ca7b 12596 Add Allocated Resources to Cluster API
  • 46c294b Merge branch 'feature' into 12596-cluster-api
  • e0a9c57 Merge branch 'feature' into 12596-cluster-api
  • 711daa1 12596 Add Allocated Resources to Cluster API
  • 3398112 12596 Add Allocated Resources to Cluster API
  • 17f13f9 12596 review changes
  • d2d0087 12596 review changes

📊 Changes

2 files changed (+15 additions, -2 deletions)

View changed files

📝 netbox/virtualization/api/serializers_/clusters.py (+9 -1)
📝 netbox/virtualization/api/views.py (+6 -1)

📄 Description

Fixes: #12596

Note: There is a caveat in the Django docs about using multiple aggregates with annotation - but from testing this looks like it works correctly with multiple virtual_machines on different clusters.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netbox-community/netbox/pull/17956 **Author:** [@arthanson](https://github.com/arthanson) **Created:** 11/7/2024 **Status:** ✅ Merged **Merged:** 11/15/2024 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `feature` ← **Head:** `12596-cluster-api` --- ### 📝 Commits (8) - [`2ac38e3`](https://github.com/netbox-community/netbox/commit/2ac38e3d326b5a82b10ea3dca1b28c24d6297c6a) 12596 Add Allocated Resources to Cluster API - [`855ca7b`](https://github.com/netbox-community/netbox/commit/855ca7b1ff1385e247ca2f566ab33db5f3fbc3f5) 12596 Add Allocated Resources to Cluster API - [`46c294b`](https://github.com/netbox-community/netbox/commit/46c294beb24ba321a84171c3f4ec38e1a1994917) Merge branch 'feature' into 12596-cluster-api - [`e0a9c57`](https://github.com/netbox-community/netbox/commit/e0a9c578e812001ea447fb8b808f065ea1522d90) Merge branch 'feature' into 12596-cluster-api - [`711daa1`](https://github.com/netbox-community/netbox/commit/711daa1d9a7c6c62dbeacfe083a345f610dac8a7) 12596 Add Allocated Resources to Cluster API - [`3398112`](https://github.com/netbox-community/netbox/commit/3398112786f73349b9794a3cdca4bc943f0befca) 12596 Add Allocated Resources to Cluster API - [`17f13f9`](https://github.com/netbox-community/netbox/commit/17f13f9a549d6ef965c45dcc56915c1ccf63d162) 12596 review changes - [`d2d0087`](https://github.com/netbox-community/netbox/commit/d2d00873a968483e0cafbc58c17c27dc6f7f8d87) 12596 review changes ### 📊 Changes **2 files changed** (+15 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `netbox/virtualization/api/serializers_/clusters.py` (+9 -1) 📝 `netbox/virtualization/api/views.py` (+6 -1) </details> ### 📄 Description ### Fixes: #12596 **Note:** There is a caveat in the Django docs about using multiple aggregates with annotation - but from testing this looks like it works correctly with multiple virtual_machines on different clusters. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-30 00:20:47 +01:00
adam closed this issue 2025-12-30 00:20:47 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
beta
breaking change
complexity: high
complexity: low
complexity: medium
needs milestone
netbox
pending closure
plugin candidate
pull-request
Mirrored from GitHub Pull Request
 severity: high
severity: low
severity: medium
status: accepted
status: backlog
status: blocked
status: duplicate
status: needs owner
status: needs triage
status: revisions needed
status: under review
topic: GraphQL
topic: Internationalization
topic: OpenAPI
topic: UI/UX
topic: cabling
topic: event rules
topic: htmx navigation
topic: industrialization
topic: migrations
topic: plugins
topic: scripts
topic: templating
topic: testing
type: bug
type: deprecation
type: documentation
type: feature
type: housekeeping
type: translation
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
adam
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/netbox#15236
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?