{{ settings.HOSTNAME }} (v{{ settings.VERSION }})
{% now 'Y-m-d H:i:s T' %}
+{% annotated_now %} {% now 'T' %}
- Run: {{ result.created }} + Run: {{ result.created|annotated_date }} {% if result.completed %} Duration: {{ result.duration }} {% else %} diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html index e87860622..71a73d80e 100644 --- a/netbox/templates/extras/script_list.html +++ b/netbox/templates/extras/script_list.html @@ -29,7 +29,7 @@
- Run: {{ result.created }} + Run: {{ result.created|annotated_date }} {% if result.completed %} Duration: {{ result.duration }} {% else %} diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html index b2f6926d7..e7424aa56 100644 --- a/netbox/templates/generic/object.html +++ b/netbox/templates/generic/object.html @@ -42,8 +42,8 @@
- Created {{ object.created }} · - Updated {{ object.last_updated|timesince }} ago + Created {{ object.created|annotated_date }} · + Updated {{ object.last_updated|annotated_date }} ({{ object.last_updated|timesince }} ago) {{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}
diff --git a/netbox/templates/home.html b/netbox/templates/home.html index 273a78bc9..618deb8ca 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -291,7 +291,7 @@ {% for result in report_results %}| {{ attachment.size|filesizeformat }} | -{{ attachment.created }} | +{{ attachment.created|annotated_date }} |
| Date Added | -{{ object.date_added|placeholder }} | +{{ object.date_added|annotated_date|placeholder }} |
| Description | diff --git a/netbox/templates/ipam/rir_list.html b/netbox/templates/ipam/rir_list.html deleted file mode 100644 index 89d31ae7d..000000000 --- a/netbox/templates/ipam/rir_list.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends 'generic/object_list.html' %} - -{% block buttons %} - {% if request.GET.family == '6' %} - - - IPv4 Stats - - {% else %} - - - IPv6 Stats - - {% endif %} -{% endblock %} - -{% block sidebar %} - {% if request.GET.family == '6' %} -Memory | {% if object.memory %} - {{ object.memory }} MB + {{ object.memory|humanize_megabytes }} {% else %} — {% endif %} diff --git a/netbox/templates/virtualization/virtualmachine_component_add.html b/netbox/templates/virtualization/virtualmachine_component_add.html deleted file mode 100644 index 11b120ee0..000000000 --- a/netbox/templates/virtualization/virtualmachine_component_add.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends 'base.html' %} -{% load helpers %} -{% load form_helpers %} - -{% block title %}Create {{ component_type }}{% endblock %} - -{% block content %} - -{% endblock %} diff --git a/netbox/utilities/constants.py b/netbox/utilities/constants.py index 8cf047c42..c3fbd0687 100644 --- a/netbox/utilities/constants.py +++ b/netbox/utilities/constants.py @@ -11,7 +11,8 @@ FILTER_CHAR_BASED_LOOKUP_MAP = dict( isw='istartswith', nisw='istartswith', ie='iexact', - nie='iexact' + nie='iexact', + empty='empty', ) FILTER_NUMERIC_BASED_LOOKUP_MAP = dict( diff --git a/netbox/utilities/exceptions.py b/netbox/utilities/exceptions.py index 77a915d9c..4ba62bc01 100644 --- a/netbox/utilities/exceptions.py +++ b/netbox/utilities/exceptions.py @@ -9,6 +9,14 @@ class AbortTransaction(Exception): pass +class PermissionsViolation(Exception): + """ + Raised when an operation was prevented because it would violate the + allowed permissions. + """ + pass + + class RQWorkerNotRunningException(APIException): """ Indicates the temporary inability to enqueue a new task (e.g. custom script execution) because no RQ worker diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 01dce8479..849a12c24 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -5,7 +5,9 @@ import re import yaml from django import template from django.conf import settings +from django.template.defaultfilters import date from django.urls import NoReverseMatch, reverse +from django.utils import timezone from django.utils.html import strip_tags from django.utils.safestring import mark_safe from markdown import markdown @@ -129,6 +131,20 @@ def humanize_speed(speed): return '{} Kbps'.format(speed) +@register.filter() +def humanize_megabytes(mb): + """ + Express a number of megabytes in the most suitable unit (e.g. gigabytes or terabytes). + """ + if not mb: + return '' + if mb >= 1048576: + return f'{int(mb / 1048576)} TB' + if mb >= 1024: + return f'{int(mb / 1024)} GB' + return f'{mb} MB' + + @register.filter() def tzoffset(value): """ @@ -137,6 +153,36 @@ def tzoffset(value): return datetime.datetime.now(value).strftime('%z') +@register.filter(expects_localtime=True) +def annotated_date(date_value): + """ + Returns date as HTML span with short date format as the content and the + (long) date format as the title. + """ + if not date_value: + return '' + + if type(date_value) == datetime.date: + long_ts = date(date_value, 'DATE_FORMAT') + short_ts = date(date_value, 'SHORT_DATE_FORMAT') + else: + long_ts = date(date_value, 'DATETIME_FORMAT') + short_ts = date(date_value, 'SHORT_DATETIME_FORMAT') + + span = f'{short_ts}' + + return mark_safe(span) + + +@register.simple_tag +def annotated_now(): + """ + Returns the current date piped through the annotated_date filter. + """ + tzinfo = timezone.get_current_timezone() if settings.USE_TZ else None + return annotated_date(datetime.datetime.now(tz=tzinfo)) + + @register.filter() def fgcolor(value): """ diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py index 84a7728c2..f7b241c1a 100644 --- a/netbox/virtualization/forms.py +++ b/netbox/virtualization/forms.py @@ -8,7 +8,8 @@ from dcim.constants import INTERFACE_MTU_MAX, INTERFACE_MTU_MIN from dcim.forms import InterfaceCommonForm, INTERFACE_MODE_HELP_TEXT from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site, SiteGroup from extras.forms import ( - AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, CustomFieldFilterForm, + AddRemoveTagsForm, CustomFieldForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, + CustomFieldFilterForm, ) from extras.models import Tag from ipam.models import IPAddress, VLAN @@ -527,8 +528,8 @@ class VirtualMachineBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldB class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm): model = VirtualMachine field_order = [ - 'q', 'cluster_group_id', 'cluster_type_id', 'cluster_id', 'status', 'role_id', 'region_id', 'site_id', - 'tenant_group_id', 'tenant_id', 'platform_id', 'mac_address', + 'q', 'cluster_group_id', 'cluster_type_id', 'cluster_id', 'status', 'role_id', 'region_id', 'site_group_id', + 'site_id', 'tenant_group_id', 'tenant_id', 'platform_id', 'mac_address', ] q = forms.CharField( required=False, @@ -556,14 +557,20 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil required=False, label=_('Region') ) + site_group_id = DynamicModelMultipleChoiceField( + queryset=SiteGroup.objects.all(), + required=False, + label=_('Site group') + ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), required=False, null_option='None', query_params={ - 'region_id': '$region_id' + 'region_id': '$region_id', + 'group_id': '$site_group_id', }, - label=_('Cluster') + label=_('Site') ) role_id = DynamicModelMultipleChoiceField( queryset=DeviceRole.objects.all(), @@ -653,7 +660,8 @@ class VMInterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm) self.fields['tagged_vlans'].widget.add_query_param('available_on_virtualmachine', vm_id) -class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm): +class VMInterfaceCreateForm(BootstrapMixin, CustomFieldForm, InterfaceCommonForm): + model = VMInterface virtual_machine = DynamicModelChoiceField( queryset=VirtualMachine.objects.all() ) @@ -717,7 +725,7 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm): self.fields['tagged_vlans'].widget.add_query_param('available_on_virtualmachine', vm_id) -class VMInterfaceCSVForm(CSVModelForm): +class VMInterfaceCSVForm(CustomFieldModelCSVForm): virtual_machine = CSVModelChoiceField( queryset=VirtualMachine.objects.all(), to_field_name='name' @@ -740,7 +748,7 @@ class VMInterfaceCSVForm(CSVModelForm): return self.cleaned_data['enabled'] -class VMInterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): +class VMInterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm): pk = forms.ModelMultipleChoiceField( queryset=VMInterface.objects.all(), widget=forms.MultipleHiddenInput() diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 421278d6e..4fdca3078 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -34,6 +34,9 @@ class ClusterTypeView(generic.ObjectView): def get_extra_context(self, request, instance): clusters = Cluster.objects.restrict(request.user, 'view').filter( type=instance + ).annotate( + device_count=count_related(Device, 'cluster'), + vm_count=count_related(VirtualMachine, 'cluster') ) clusters_table = tables.ClusterTable(clusters) @@ -93,6 +96,9 @@ class ClusterGroupView(generic.ObjectView): def get_extra_context(self, request, instance): clusters = Cluster.objects.restrict(request.user, 'view').filter( group=instance + ).annotate( + device_count=count_related(Device, 'cluster'), + vm_count=count_related(VirtualMachine, 'cluster') ) clusters_table = tables.ClusterTable(clusters) @@ -455,7 +461,7 @@ class VMInterfaceCreateView(generic.ComponentCreateView): queryset = VMInterface.objects.all() form = forms.VMInterfaceCreateForm model_form = forms.VMInterfaceForm - template_name = 'virtualization/virtualmachine_component_add.html' + template_name = 'dcim/device_component_add.html' class VMInterfaceEditView(generic.ObjectEditView): diff --git a/requirements.txt b/requirements.txt index 467a48542..e2b210fa7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==3.2.4 +Django==3.2.5 django-cacheops==6.0 django-cors-headers==3.7.0 django-debug-toolbar==3.2.1 @@ -8,7 +8,7 @@ django-pglocks==1.0.4 django-prometheus==2.1.0 django-rq==2.4.1 django-tables2==2.4.0 -django-taggit==1.4.0 +django-taggit==1.5.1 django-timezone-field==4.1.2 djangorestframework==3.12.4 drf-yasg[validation]==1.20.0 @@ -16,8 +16,8 @@ gunicorn==20.1.0 Jinja2==3.0.1 Markdown==3.3.4 netaddr==0.8.0 -Pillow==8.2.0 -psycopg2-binary==2.9 +Pillow==8.3.0 +psycopg2-binary==2.9.1 pycryptodome==3.10.1 PyYAML==5.4.1 svgwrite==1.4.1 |