15873 - Make Cluster resource counters more readable #15900
Conversation
…e according to unit informed. Changed "get_extra_context" method from "ClusterView" to use the method above and convert all the disks and memories from VMs to normalize the units.
There was a problem hiding this comment.
I really think we just need to make some small adjustments to the existing humanize_megabytes() function to address the goals of #15873.
netbox/virtualization/views.py
Outdated
| @@ -172,7 +173,17 @@ class ClusterView(generic.ObjectView): | |||
| queryset = Cluster.objects.all() | |||
|
|
|||
| def get_extra_context(self, request, instance): | |||
| return instance.virtual_machines.aggregate(vcpus_sum=Sum('vcpus'), memory_sum=Sum('memory'), disk_sum=Sum('disk')) | |||
There was a problem hiding this comment.
We need to keep the aggregation logic at the database layer in the interest of performance.
netbox/virtualization/views.py
Outdated
| @@ -172,7 +173,17 @@ class ClusterView(generic.ObjectView): | |||
| queryset = Cluster.objects.all() | |||
|
|
|||
| def get_extra_context(self, request, instance): | |||
| return instance.virtual_machines.aggregate(vcpus_sum=Sum('vcpus'), memory_sum=Sum('memory'), disk_sum=Sum('disk')) | |||
| vm_memory = [convert_byte_size(item.memory, 'mega') for item in instance.virtual_machines.all() if item.memory] | |||
There was a problem hiding this comment.
It's sufficient to capture and then round the raw aggregate value. Also, we generally want to handle this sort of massaging of numbers in the template (via a template tag) rather than in the view to afford maximum flexibility.
Changed humanize_megabytes in helpers.py
Changed humanize_megabytes in helpers.py
|
I was analyzing it, and there is no point in trying to convert and predict any incorrect input from the customer. I think we should talk about it. I changed "humanize_megabytes" to convert non-divisible values to 1024 in this commit and reverted all previous changes.
|
Fixes: #15873
One method was created to normalize the VM's disk and memory sizes according to their units. That method is applied when the "Allocated Resources" is generated.