diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py index 397f6cc6b..9b05d8026 100644 --- a/netbox/dcim/models/racks.py +++ b/netbox/dcim/models/racks.py @@ -529,7 +529,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel): powerfeeds = PowerFeed.objects.filter(rack=self) available_power_total = sum(pf.available_power for pf in powerfeeds) if not available_power_total: - return 0 + return (0, 0) pf_powerports = PowerPort.objects.filter( _cable_peer_type=ContentType.objects.get_for_model(PowerFeed), @@ -541,11 +541,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel): _cable_peer_id__in=poweroutlets.values_list('id', flat=True) ).aggregate(Sum('allocated_draw'))['allocated_draw__sum'] or 0 - if power_stats: - allocated_draw_total = sum(x['allocated_draw_total'] or 0 for x in power_stats) - available_power_total = sum(x['available_power'] for x in power_stats) - return (allocated_draw_total, available_power_total) or (0, 0) - return (0, 0) + return (allocated_draw_total, available_power_total) @extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks') diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py index ee1dc091b..8575ee8bf 100644 --- a/netbox/dcim/tables/template_code.py +++ b/netbox/dcim/tables/template_code.py @@ -84,7 +84,7 @@ RACKGROUP_ELEVATIONS = """ UTILIZATION_GRAPH = """ {% load helpers %} -{% utilization_graph value %} +{% utilization_graph value.0 value.1 value %} """ # diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 97f7c8953..70c515f9a 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -225,7 +225,7 @@ {{ utilization.allocated }}VA {% if powerfeed.available_power %} {{ powerfeed.available_power }}VA - {% utilization_graph utilization.allocated|percentage:powerfeed.available_power %} + {% utilization_graph utilization.allocated powerfeed.available_power %} {% else %} — — @@ -238,7 +238,7 @@ {{ leg.allocated }} {{ powerfeed.available_power|divide:3 }}VA {% with phase_available=powerfeed.available_power|divide:3 %} - {% utilization_graph leg.allocated|percentage:phase_available %} + {% utilization_graph leg.allocated phase_available %} {% endwith %} {% endfor %} diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index eded66fec..a225fb796 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -113,7 +113,7 @@ {{ utilization.allocated }}VA / {{ object.available_power }}VA {% if object.available_power > 0 %} - {% utilization_graph utilization.allocated|percentage:object.available_power %} + {% utilization_graph utilization.allocated object.available_power %} {% endif %} {% else %} diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 560a706b1..8c6e8c70e 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -242,7 +242,7 @@ {% with power_port=powerfeed.connected_endpoint %} {% if power_port %} - {% utilization_graph power_port.get_power_draw.allocated|percentage:powerfeed.available_power %} + {% utilization_graph power_port.get_power_draw.allocated powerfeed.available_power %} {% else %} N/A {% endif %} diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 1224b19fc..945863b96 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -180,7 +180,7 @@ Utilization - {% utilization_graph prefix.get_utilization.0 prefix.get_utilization.1 %} + {% utilization_graph object.get_utilization.0 object.get_utilization.1 %}