{{ item.label }}
{{ item.count }}
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html
index bf7c8a69a..bc02424cc 100644
--- a/netbox/templates/virtualization/cluster.html
+++ b/netbox/templates/virtualization/cluster.html
@@ -19,6 +19,10 @@
Type |
{{ object.type|linkify }} |
+
+ | Status |
+ {% badge object.get_status_display bg_color=object.get_status_color %} |
+
| Group |
{{ object.group|linkify|placeholder }} |
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 5756d939a..c0e2ebd07 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -46,7 +46,7 @@
{% if object.primary_ip4.nat_inside %}
(NAT for {{ object.primary_ip4.nat_inside.address.ip }})
{% elif object.primary_ip4.nat_outside.exists %}
- (NAT for {% for nat in object.primary_ip4.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %})
+ (NAT: {% for nat in object.primary_ip4.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %})
{% endif %}
{% else %}
{{ ''|placeholder }}
@@ -61,7 +61,7 @@
{% if object.primary_ip6.nat_inside %}
(NAT for {{ object.primary_ip6.nat_inside.address.ip }})
{% elif object.primary_ip6.nat_outside.exists %}
- (NAT for {% for nat in object.primary_ip6.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %})
+ (NAT: {% for nat in object.primary_ip6.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %})
{% endif %}
{% else %}
{{ ''|placeholder }}
diff --git a/netbox/tenancy/forms/__init__.py b/netbox/tenancy/forms/__init__.py
index 61f0bc961..96c1e50f7 100644
--- a/netbox/tenancy/forms/__init__.py
+++ b/netbox/tenancy/forms/__init__.py
@@ -1,5 +1,5 @@
from .forms import *
-from .models import *
+from .model_forms import *
from .filtersets import *
from .bulk_edit import *
from .bulk_import import *
diff --git a/netbox/tenancy/forms/models.py b/netbox/tenancy/forms/model_forms.py
similarity index 100%
rename from netbox/tenancy/forms/models.py
rename to netbox/tenancy/forms/model_forms.py
diff --git a/netbox/utilities/templatetags/buttons.py b/netbox/utilities/templatetags/buttons.py
index 4b8178405..bcdb099d8 100644
--- a/netbox/utilities/templatetags/buttons.py
+++ b/netbox/utilities/templatetags/buttons.py
@@ -83,7 +83,7 @@ def export_button(context, model):
data_format = 'YAML' if hasattr(content_type.model_class(), 'to_yaml') else 'CSV'
# Retrieve all export templates for this model
- export_templates = ExportTemplate.objects.restrict(user, 'view').filter(content_type=content_type)
+ export_templates = ExportTemplate.objects.restrict(user, 'view').filter(content_types=content_type)
return {
'perms': context['perms'],
diff --git a/netbox/virtualization/forms/__init__.py b/netbox/virtualization/forms/__init__.py
index 00f28b852..3c9dd3651 100644
--- a/netbox/virtualization/forms/__init__.py
+++ b/netbox/virtualization/forms/__init__.py
@@ -1,4 +1,4 @@
-from .models import *
+from .model_forms import *
from .filtersets import *
from .object_create import *
from .bulk_create import *
diff --git a/netbox/virtualization/forms/models.py b/netbox/virtualization/forms/model_forms.py
similarity index 99%
rename from netbox/virtualization/forms/models.py
rename to netbox/virtualization/forms/model_forms.py
index 1b5c5adc6..5438002b4 100644
--- a/netbox/virtualization/forms/models.py
+++ b/netbox/virtualization/forms/model_forms.py
@@ -3,7 +3,7 @@ from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ValidationError
from dcim.forms.common import InterfaceCommonForm
-from dcim.forms.models import INTERFACE_MODE_HELP_TEXT
+from dcim.forms.model_forms import INTERFACE_MODE_HELP_TEXT
from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site, SiteGroup
from ipam.models import IPAddress, VLAN, VLANGroup, VRF
from netbox.forms import NetBoxModelForm
diff --git a/netbox/virtualization/forms/object_create.py b/netbox/virtualization/forms/object_create.py
index 79457a56e..2e0cc5db1 100644
--- a/netbox/virtualization/forms/object_create.py
+++ b/netbox/virtualization/forms/object_create.py
@@ -1,5 +1,5 @@
from utilities.forms import ExpandableNameField
-from .models import VMInterfaceForm
+from .model_forms import VMInterfaceForm
__all__ = (
'VMInterfaceCreateForm',
diff --git a/netbox/virtualization/tables/clusters.py b/netbox/virtualization/tables/clusters.py
index fec539b8c..ae4c610d7 100644
--- a/netbox/virtualization/tables/clusters.py
+++ b/netbox/virtualization/tables/clusters.py
@@ -64,6 +64,7 @@ class ClusterTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
group = tables.Column(
linkify=True
)
+ status = columns.ChoiceFieldColumn()
site = tables.Column(
linkify=True
)
diff --git a/netbox/wireless/forms/__init__.py b/netbox/wireless/forms/__init__.py
index 62c2ec2d9..3098b356a 100644
--- a/netbox/wireless/forms/__init__.py
+++ b/netbox/wireless/forms/__init__.py
@@ -1,4 +1,4 @@
-from .models import *
+from .model_forms import *
from .filtersets import *
from .bulk_edit import *
from .bulk_import import *
diff --git a/netbox/wireless/forms/models.py b/netbox/wireless/forms/model_forms.py
similarity index 100%
rename from netbox/wireless/forms/models.py
rename to netbox/wireless/forms/model_forms.py
diff --git a/requirements.txt b/requirements.txt
index 891a61779..c8fdd410a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,18 +19,18 @@ graphene-django==3.0.0
gunicorn==20.1.0
Jinja2==3.1.2
Markdown==3.3.7
-mkdocs-material==8.5.6
+mkdocs-material==8.5.7
mkdocstrings[python-legacy]==0.19.0
netaddr==0.8.0
Pillow==9.2.0
-psycopg2-binary==2.9.3
+psycopg2-binary==2.9.5
PyYAML==6.0
-sentry-sdk==1.9.10
+sentry-sdk==1.10.1
social-auth-app-django==5.0.0
social-auth-core[openidconnect]==4.3.0
svgwrite==1.4.3
tablib==3.2.1
-tzdata==2022.4
+tzdata==2022.5
# Workaround for #7401
jsonschema==3.2.0