- The premier source of truth powering network automation
-
+ The cornerstone of every automated network
+
+ 
+ 
+ 
+ 
+
- The premier source of truth powering network automation
-
+ The cornerstone of every automated network
+
+
+
+
+
+
+ NetBox's Role | + Why NetBox? | + Getting Started | + Get Involved | + Project Stats | + Screenshots +
- +
+ 
+
+ 
+
+ 
+ Looking for an enterprise solution? Check out NetBox Cloud!
+
Stats via Repography
-
+ NetBox Dashboard (Light Mode)
+
+
+ NetBox Dashboard (Dark Mode)
+ 
+
+ Prefixes List
+ 
+
+ Rack View
+ 
+
+ Cable Trace
+ 
+
{{ object }}. Links "
+ "Jinja2 template code for the link text. Reference the object as {example}. Links "
"which render as empty text will not be displayed."
- ),
- 'link_url': _("Jinja2 template code for the link URL. Reference the object as {{ object }}."),
+ ).format(example="{{ object }}"),
+ 'link_url': _(
+ "Jinja2 template code for the link URL. Reference the object as {example}."
+ ).format(example="{{ object }}"),
}
diff --git a/netbox/extras/migrations/0106_bookmark_user_cascade_deletion.py b/netbox/extras/migrations/0106_bookmark_user_cascade_deletion.py
new file mode 100644
index 000000000..d7bef2f0b
--- /dev/null
+++ b/netbox/extras/migrations/0106_bookmark_user_cascade_deletion.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.9 on 2024-01-19 19:46
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('extras', '0105_customfield_min_max_values'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='bookmark',
+ name='user',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/netbox/extras/migrations/0106_delete_report_delete_reportmodule.py b/netbox/extras/migrations/0107_delete_report_delete_reportmodule.py
similarity index 94%
rename from netbox/extras/migrations/0106_delete_report_delete_reportmodule.py
rename to netbox/extras/migrations/0107_delete_report_delete_reportmodule.py
index 8ebd2c004..652e89cee 100644
--- a/netbox/extras/migrations/0106_delete_report_delete_reportmodule.py
+++ b/netbox/extras/migrations/0107_delete_report_delete_reportmodule.py
@@ -17,7 +17,7 @@ def migrate_report_jobs(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
- ('extras', '0105_customfield_min_max_values'),
+ ('extras', '0106_bookmark_user_cascade_deletion'),
]
operations = [
diff --git a/netbox/extras/models/mixins.py b/netbox/extras/models/mixins.py
index cb1d31837..0950324c8 100644
--- a/netbox/extras/models/mixins.py
+++ b/netbox/extras/models/mixins.py
@@ -8,6 +8,16 @@ __all__ = (
class PythonModuleMixin:
+ def get_jobs(self, name):
+ """
+ Returns a list of Jobs associated with this specific script or report module
+ :param name: The class name of the script or report
+ :return: List of Jobs associated with this
+ """
+ return self.jobs.filter(
+ name=name
+ )
+
@property
def path(self):
return os.path.splitext(self.file_path)[0]
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 778d7b68d..4ac36a3ac 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -771,7 +771,7 @@ class Bookmark(models.Model):
)
user = models.ForeignKey(
to=settings.AUTH_USER_MODEL,
- on_delete=models.PROTECT
+ on_delete=models.CASCADE
)
objects = RestrictedQuerySet.as_manager()
diff --git a/netbox/extras/querysets.py b/netbox/extras/querysets.py
index 478dedf92..b3bdc0a3e 100644
--- a/netbox/extras/querysets.py
+++ b/netbox/extras/querysets.py
@@ -120,34 +120,29 @@ class ConfigContextModelQuerySet(RestrictedQuerySet):
if self.model._meta.model_name == 'device':
base_query.add((Q(locations=OuterRef('location')) | Q(locations=None)), Q.AND)
base_query.add((Q(device_types=OuterRef('device_type')) | Q(device_types=None)), Q.AND)
- base_query.add((Q(roles=OuterRef('role')) | Q(roles=None)), Q.AND)
- base_query.add((Q(sites=OuterRef('site')) | Q(sites=None)), Q.AND)
- region_field = 'site__region'
- sitegroup_field = 'site__group'
elif self.model._meta.model_name == 'virtualmachine':
- base_query.add((Q(roles=OuterRef('role')) | Q(roles=None)), Q.AND)
- base_query.add((Q(sites=OuterRef('cluster__site')) | Q(sites=None)), Q.AND)
base_query.add(Q(device_types=None), Q.AND)
- region_field = 'cluster__site__region'
- sitegroup_field = 'cluster__site__group'
+
+ base_query.add((Q(roles=OuterRef('role')) | Q(roles=None)), Q.AND)
+ base_query.add((Q(sites=OuterRef('site')) | Q(sites=None)), Q.AND)
base_query.add(
(Q(
- regions__tree_id=OuterRef(f'{region_field}__tree_id'),
- regions__level__lte=OuterRef(f'{region_field}__level'),
- regions__lft__lte=OuterRef(f'{region_field}__lft'),
- regions__rght__gte=OuterRef(f'{region_field}__rght'),
+ regions__tree_id=OuterRef('site__region__tree_id'),
+ regions__level__lte=OuterRef('site__region__level'),
+ regions__lft__lte=OuterRef('site__region__lft'),
+ regions__rght__gte=OuterRef('site__region__rght'),
) | Q(regions=None)),
Q.AND
)
base_query.add(
(Q(
- site_groups__tree_id=OuterRef(f'{sitegroup_field}__tree_id'),
- site_groups__level__lte=OuterRef(f'{sitegroup_field}__level'),
- site_groups__lft__lte=OuterRef(f'{sitegroup_field}__lft'),
- site_groups__rght__gte=OuterRef(f'{sitegroup_field}__rght'),
+ site_groups__tree_id=OuterRef('site__group__tree_id'),
+ site_groups__level__lte=OuterRef('site__group__level'),
+ site_groups__lft__lte=OuterRef('site__group__lft'),
+ site_groups__rght__gte=OuterRef('site__group__rght'),
) | Q(site_groups=None)),
Q.AND
)
diff --git a/netbox/extras/signals.py b/netbox/extras/signals.py
index 798a9f442..4c15e839a 100644
--- a/netbox/extras/signals.py
+++ b/netbox/extras/signals.py
@@ -68,21 +68,23 @@ def handle_changed_object(sender, instance, **kwargs):
else:
return
- # Record an ObjectChange if applicable
- if m2m_changed:
- ObjectChange.objects.filter(
+ # Create/update an ObejctChange record for this change
+ objectchange = instance.to_objectchange(action)
+ # If this is a many-to-many field change, check for a previous ObjectChange instance recorded
+ # for this object by this request and update it
+ if m2m_changed and (
+ prev_change := ObjectChange.objects.filter(
changed_object_type=ContentType.objects.get_for_model(instance),
changed_object_id=instance.pk,
request_id=request.id
- ).update(
- postchange_data=instance.to_objectchange(action).postchange_data
- )
- else:
- objectchange = instance.to_objectchange(action)
- if objectchange and objectchange.has_changes:
- objectchange.user = request.user
- objectchange.request_id = request.id
- objectchange.save()
+ ).first()
+ ):
+ prev_change.postchange_data = objectchange.postchange_data
+ prev_change.save()
+ elif objectchange and objectchange.has_changes:
+ objectchange.user = request.user
+ objectchange.request_id = request.id
+ objectchange.save()
# If this is an M2M change, update the previously queued webhook (from post_save)
queue = events_queue.get()
@@ -251,7 +253,8 @@ def process_job_start_event_rules(sender, **kwargs):
Process event rules for jobs starting.
"""
event_rules = EventRule.objects.filter(type_job_start=True, enabled=True, content_types=sender.object_type)
- process_event_rules(event_rules, sender.object_type.model, EVENT_JOB_START, sender.data, sender.user.username)
+ username = sender.user.username if sender.user else None
+ process_event_rules(event_rules, sender.object_type.model, EVENT_JOB_START, sender.data, username)
@receiver(job_end)
@@ -260,4 +263,5 @@ def process_job_end_event_rules(sender, **kwargs):
Process event rules for jobs terminating.
"""
event_rules = EventRule.objects.filter(type_job_end=True, enabled=True, content_types=sender.object_type)
- process_event_rules(event_rules, sender.object_type.model, EVENT_JOB_END, sender.data, sender.user.username)
+ username = sender.user.username if sender.user else None
+ process_event_rules(event_rules, sender.object_type.model, EVENT_JOB_END, sender.data, username)
diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py
index 0c414ef21..3232a07da 100644
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -14,7 +14,6 @@ from extras.reports import Report
from extras.scripts import BooleanVar, IntegerVar, Script, StringVar
from utilities.testing import APITestCase, APIViewTestCases
-
User = get_user_model()
@@ -251,6 +250,23 @@ class CustomFieldChoiceSetTest(APIViewTestCases.APIViewTestCase):
)
CustomFieldChoiceSet.objects.bulk_create(choice_sets)
+ def test_invalid_choice_items(self):
+ """
+ Attempting to define each choice as a single-item list should return a 400 error.
+ """
+ self.add_permissions('extras.add_customfieldchoiceset')
+ data = {
+ "name": "test",
+ "extra_choices": [
+ ["choice1"],
+ ["choice2"],
+ ["choice3"],
+ ]
+ }
+
+ response = self.client.post(self._get_list_url(), data, format='json', **self.header)
+ self.assertEqual(response.status_code, 400)
+
class CustomLinkTest(APIViewTestCases.APIViewTestCase):
model = CustomLink
diff --git a/netbox/extras/tests/test_models.py b/netbox/extras/tests/test_models.py
index ef9398401..cb3f08acb 100644
--- a/netbox/extras/tests/test_models.py
+++ b/netbox/extras/tests/test_models.py
@@ -270,7 +270,12 @@ class ConfigContextTest(TestCase):
tag = Tag.objects.first()
cluster_type = ClusterType.objects.create(name="Cluster Type")
cluster_group = ClusterGroup.objects.create(name="Cluster Group")
- cluster = Cluster.objects.create(name="Cluster", group=cluster_group, type=cluster_type)
+ cluster = Cluster.objects.create(
+ name="Cluster",
+ group=cluster_group,
+ type=cluster_type,
+ site=site,
+ )
region_context = ConfigContext.objects.create(
name="region",
@@ -354,6 +359,41 @@ class ConfigContextTest(TestCase):
annotated_queryset = VirtualMachine.objects.filter(name=virtual_machine.name).annotate_config_context_data()
self.assertEqual(virtual_machine.get_config_context(), annotated_queryset[0].get_config_context())
+ def test_virtualmachine_site_context(self):
+ """
+ Check that config context associated with a site applies to a VM whether the VM is assigned
+ directly to that site or via its cluster.
+ """
+ site = Site.objects.first()
+ cluster_type = ClusterType.objects.create(name="Cluster Type")
+ cluster = Cluster.objects.create(name="Cluster", type=cluster_type, site=site)
+ vm_role = DeviceRole.objects.first()
+
+ # Create a ConfigContext associated with the site
+ context = ConfigContext.objects.create(
+ name="context1",
+ weight=100,
+ data={"foo": True}
+ )
+ context.sites.add(site)
+
+ # Create one VM assigned directly to the site, and one assigned via the cluster
+ vm1 = VirtualMachine.objects.create(name="VM 1", site=site, role=vm_role)
+ vm2 = VirtualMachine.objects.create(name="VM 2", cluster=cluster, role=vm_role)
+
+ # Check that their individually-rendered config contexts are identical
+ self.assertEqual(
+ vm1.get_config_context(),
+ vm2.get_config_context()
+ )
+
+ # Check that their annotated config contexts are identical
+ vms = VirtualMachine.objects.filter(pk__in=(vm1.pk, vm2.pk)).annotate_config_context_data()
+ self.assertEqual(
+ vms[0].get_config_context(),
+ vms[1].get_config_context()
+ )
+
def test_multiple_tags_return_distinct_objects(self):
"""
Tagged items use a generic relationship, which results in duplicate rows being returned when queried.
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 4c9d25ceb..b4f87e633 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -9,7 +9,7 @@ from django.urls import reverse
from django.utils.translation import gettext as _
from django.views.generic import View
-from core.choices import JobStatusChoices, ManagedFileRootPathChoices
+from core.choices import ManagedFileRootPathChoices
from core.forms import ManagedFileForm
from core.models import Job
from core.tables import JobTable
@@ -24,7 +24,6 @@ from utilities.templatetags.builtins.filters import render_markdown
from utilities.utils import copy_safe_request, count_related, get_viewname, normalize_querydict, shallow_compare_dict
from utilities.views import ContentTypePermissionRequiredMixin, register_model_view
from . import filtersets, forms, tables
-from .forms.reports import ReportForm
from .models import *
from .scripts import run_script
@@ -1051,19 +1050,11 @@ class ScriptView(ContentTypePermissionRequiredMixin, View):
def get(self, request, module, name):
module = get_script_module(module, request)
script = module.scripts[name]()
+ jobs = module.get_jobs(script.class_name)
form = script.as_form(initial=normalize_querydict(request.GET))
- # Look for a pending Job (use the latest one by creation timestamp)
- object_type = ContentType.objects.get(app_label='extras', model='scriptmodule')
- script.result = Job.objects.filter(
- object_type=object_type,
- object_id=module.pk,
- name=script.name,
- ).exclude(
- status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
- ).first()
-
return render(request, 'extras/script.html', {
+ 'job_count': jobs.count(),
'module': module,
'script': script,
'form': form,
@@ -1075,6 +1066,7 @@ class ScriptView(ContentTypePermissionRequiredMixin, View):
module = get_script_module(module, request)
script = module.scripts[name]()
+ jobs = module.get_jobs(script.class_name)
form = script.as_form(request.POST, request.FILES)
# Allow execution only if RQ worker process is running
@@ -1098,6 +1090,7 @@ class ScriptView(ContentTypePermissionRequiredMixin, View):
return redirect('extras:script_result', job_pk=job.pk)
return render(request, 'extras/script.html', {
+ 'job_count': jobs.count(),
'module': module,
'script': script,
'form': form,
@@ -1112,8 +1105,10 @@ class ScriptSourceView(ContentTypePermissionRequiredMixin, View):
def get(self, request, module, name):
module = get_script_module(module, request)
script = module.scripts[name]()
+ jobs = module.get_jobs(script.class_name)
return render(request, 'extras/script/source.html', {
+ 'job_count': jobs.count(),
'module': module,
'script': script,
'tab': 'source',
@@ -1128,13 +1123,7 @@ class ScriptJobsView(ContentTypePermissionRequiredMixin, View):
def get(self, request, module, name):
module = get_script_module(module, request)
script = module.scripts[name]()
-
- object_type = ContentType.objects.get(app_label='extras', model='scriptmodule')
- jobs = Job.objects.filter(
- object_type=object_type,
- object_id=module.pk,
- name=script.class_name
- )
+ jobs = module.get_jobs(script.class_name)
jobs_table = JobTable(
data=jobs,
@@ -1144,6 +1133,7 @@ class ScriptJobsView(ContentTypePermissionRequiredMixin, View):
jobs_table.configure(request)
return render(request, 'extras/script/jobs.html', {
+ 'job_count': jobs.count(),
'module': module,
'script': script,
'table': jobs_table,
diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py
index bf4825be9..72d57e941 100644
--- a/netbox/ipam/forms/bulk_edit.py
+++ b/netbox/ipam/forms/bulk_edit.py
@@ -254,7 +254,7 @@ class PrefixBulkEditForm(NetBoxModelBulkEditForm):
mark_utilized = forms.NullBooleanField(
required=False,
widget=BulkEditNullBooleanSelect(),
- label=_('Treat as 100% utilized')
+ label=_('Treat as fully utilized')
)
description = forms.CharField(
label=_('Description'),
@@ -298,7 +298,7 @@ class IPRangeBulkEditForm(NetBoxModelBulkEditForm):
mark_utilized = forms.NullBooleanField(
required=False,
widget=BulkEditNullBooleanSelect(),
- label=_('Treat as 100% utilized')
+ label=_('Treat as fully utilized')
)
description = forms.CharField(
label=_('Description'),
diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py
index e6acdb012..909de886f 100644
--- a/netbox/ipam/forms/filtersets.py
+++ b/netbox/ipam/forms/filtersets.py
@@ -240,7 +240,7 @@ class PrefixFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
)
mark_utilized = forms.NullBooleanField(
required=False,
- label=_('Marked as 100% utilized'),
+ label=_('Treat as fully utilized'),
widget=forms.Select(
choices=BOOLEAN_WITH_BLANK_CHOICES
)
@@ -279,7 +279,7 @@ class IPRangeFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
)
mark_utilized = forms.NullBooleanField(
required=False,
- label=_('Marked as 100% utilized'),
+ label=_('Treat as fully utilized'),
widget=forms.Select(
choices=BOOLEAN_WITH_BLANK_CHOICES
)
diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py
index 0e2250d2d..f6a67d643 100644
--- a/netbox/ipam/forms/model_forms.py
+++ b/netbox/ipam/forms/model_forms.py
@@ -214,7 +214,7 @@ class PrefixForm(TenancyForm, NetBoxModelForm):
required=False,
selector=True,
query_params={
- 'site_id': '$site',
+ 'available_at_site': '$site',
},
label=_('VLAN'),
)
diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py
index 01e2ed1c7..76fae2990 100644
--- a/netbox/ipam/models/ip.py
+++ b/netbox/ipam/models/ip.py
@@ -268,7 +268,7 @@ class Prefix(GetAvailablePrefixesMixin, PrimaryModel):
mark_utilized = models.BooleanField(
verbose_name=_('mark utilized'),
default=False,
- help_text=_("Treat as 100% utilized")
+ help_text=_("Treat as fully utilized")
)
# Cached depth & child counts
@@ -427,10 +427,10 @@ class Prefix(GetAvailablePrefixesMixin, PrimaryModel):
prefix = netaddr.IPSet(self.prefix)
child_ips = netaddr.IPSet([ip.address.ip for ip in self.get_child_ips()])
- child_ranges = netaddr.IPSet()
+ child_ranges = []
for iprange in self.get_child_ranges():
- child_ranges.add(iprange.range)
- available_ips = prefix - child_ips - child_ranges
+ child_ranges.append(iprange.range)
+ available_ips = prefix - child_ips - netaddr.IPSet(child_ranges)
# IPv6 /127's, pool, or IPv4 /31-/32 sets are fully usable
if (self.family == 6 and self.prefix.prefixlen >= 127) or self.is_pool or (self.family == 4 and self.prefix.prefixlen >= 31):
@@ -535,7 +535,7 @@ class IPRange(PrimaryModel):
mark_utilized = models.BooleanField(
verbose_name=_('mark utilized'),
default=False,
- help_text=_("Treat as 100% utilized")
+ help_text=_("Treat as fully utilized")
)
clone_fields = (
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 1598f0321..9c4a9a102 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -604,7 +604,7 @@ class PrefixIPAddressesView(generic.ObjectChildrenView):
return parent.get_child_ips().restrict(request.user, 'view').prefetch_related('vrf', 'tenant', 'tenant__group')
def prep_table_data(self, request, queryset, parent):
- if not get_table_ordering(request, self.table):
+ if not request.GET.get('q') and not get_table_ordering(request, self.table):
return add_available_ipaddresses(parent.prefix, queryset, parent.is_pool)
return queryset
@@ -1068,6 +1068,12 @@ class FHRPGroupAssignmentEditView(generic.ObjectEditView):
instance.interface = get_object_or_404(content_type.model_class(), pk=request.GET.get('interface_id'))
return instance
+ def get_extra_addanother_params(self, request):
+ return {
+ 'interface_type': request.GET.get('interface_type'),
+ 'interface_id': request.GET.get('interface_id'),
+ }
+
@register_model_view(FHRPGroupAssignment, 'delete')
class FHRPGroupAssignmentDeleteView(generic.ObjectDeleteView):
diff --git a/netbox/netbox/configuration_testing.py b/netbox/netbox/configuration_testing.py
index cec05cabb..346cd89d2 100644
--- a/netbox/netbox/configuration_testing.py
+++ b/netbox/netbox/configuration_testing.py
@@ -39,6 +39,8 @@ REDIS = {
SECRET_KEY = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
+DJANGO_ADMIN_ENABLED = True
+
DEFAULT_PERMISSIONS = {}
LOGGING = {
diff --git a/netbox/netbox/constants.py b/netbox/netbox/constants.py
index faddf8c21..547e2079b 100644
--- a/netbox/netbox/constants.py
+++ b/netbox/netbox/constants.py
@@ -36,3 +36,7 @@ DEFAULT_ACTION_PERMISSIONS = {
'bulk_edit': {'change'},
'bulk_delete': {'delete'},
}
+
+# General-purpose tokens
+CENSOR_TOKEN = '********'
+CENSOR_TOKEN_CHANGED = '***CHANGED***'
diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py
index e3e3f0581..2dba76e72 100644
--- a/netbox/netbox/navigation/menu.py
+++ b/netbox/netbox/navigation/menu.py
@@ -371,19 +371,19 @@ ADMIN_MENU = Menu(
items=(
# Proxy model for auth.User
MenuItem(
- link=f'users:netboxuser_list',
+ link=f'users:user_list',
link_text=_('Users'),
permissions=[f'auth.view_user'],
staff_only=True,
buttons=(
MenuItemButton(
- link=f'users:netboxuser_add',
+ link=f'users:user_add',
title='Add',
icon_class='mdi mdi-plus-thick',
permissions=[f'auth.add_user']
),
MenuItemButton(
- link=f'users:netboxuser_import',
+ link=f'users:user_import',
title='Import',
icon_class='mdi mdi-upload',
permissions=[f'auth.add_user']
@@ -445,13 +445,18 @@ ADMIN_MENU = Menu(
),
),
MenuGroup(
- label=_('Plugins'),
+ label=_('System'),
items=(
MenuItem(
link='core:plugin_list',
link_text=_('Plugins'),
staff_only=True
),
+ MenuItem(
+ link='core:background_queue_list',
+ link_text=_('Background Tasks'),
+ staff_only=True
+ ),
),
),
),
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index bc7603fc4..305696f52 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -29,7 +29,7 @@ from netbox.plugins import PluginConfig
# Environment setup
#
-VERSION = '3.7-beta1'
+VERSION = '3.7.3-dev'
# Hostname
HOSTNAME = platform.node()
@@ -115,6 +115,7 @@ DEFAULT_PERMISSIONS = getattr(configuration, 'DEFAULT_PERMISSIONS', {
'users.delete_token': ({'user': '$user'},),
})
DEVELOPER = getattr(configuration, 'DEVELOPER', False)
+DJANGO_ADMIN_ENABLED = getattr(configuration, 'DJANGO_ADMIN_ENABLED', False)
DOCS_ROOT = getattr(configuration, 'DOCS_ROOT', os.path.join(os.path.dirname(BASE_DIR), 'docs'))
EMAIL = getattr(configuration, 'EMAIL', {})
EVENTS_PIPELINE = getattr(configuration, 'EVENTS_PIPELINE', (
@@ -123,7 +124,6 @@ EVENTS_PIPELINE = getattr(configuration, 'EVENTS_PIPELINE', (
EXEMPT_VIEW_PERMISSIONS = getattr(configuration, 'EXEMPT_VIEW_PERMISSIONS', [])
FIELD_CHOICES = getattr(configuration, 'FIELD_CHOICES', {})
FILE_UPLOAD_MAX_MEMORY_SIZE = getattr(configuration, 'FILE_UPLOAD_MAX_MEMORY_SIZE', 2621440)
-GIT_PATH = getattr(configuration, 'GIT_PATH', 'git')
HTTP_PROXIES = getattr(configuration, 'HTTP_PROXIES', None)
INTERNAL_IPS = getattr(configuration, 'INTERNAL_IPS', ('127.0.0.1', '::1'))
JINJA2_FILTERS = getattr(configuration, 'JINJA2_FILTERS', {})
@@ -355,7 +355,6 @@ SERVER_EMAIL = EMAIL.get('FROM_EMAIL')
#
INSTALLED_APPS = [
- 'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
@@ -393,6 +392,9 @@ INSTALLED_APPS = [
'drf_spectacular_sidecar',
]
+if DJANGO_ADMIN_ENABLED:
+ INSTALLED_APPS.insert(0, 'django.contrib.admin')
+
# Middleware
MIDDLEWARE = [
'graphiql_debug_toolbar.middleware.DebugToolbarMiddleware',
@@ -452,6 +454,8 @@ AUTHENTICATION_BACKENDS = [
'netbox.authentication.ObjectPermissionBackend',
]
+AUTH_USER_MODEL = 'users.User'
+
# Time zones
USE_TZ = True
@@ -592,6 +596,8 @@ for param in dir(configuration):
SOCIAL_AUTH_JSONFIELD_ENABLED = True
SOCIAL_AUTH_CLEAN_USERNAME_FUNCTION = 'users.utils.clean_username'
+SOCIAL_AUTH_USER_MODEL = AUTH_USER_MODEL
+
#
# Django Prometheus
#
@@ -729,8 +735,10 @@ LANGUAGES = (
('en', _('English')),
('es', _('Spanish')),
('fr', _('French')),
+ ('ja', _('Japanese')),
('pt', _('Portuguese')),
('ru', _('Russian')),
+ ('tr', _('Turkish')),
)
LOCALE_PATHS = (
diff --git a/netbox/netbox/tests/dummy_plugin/migrations/0001_initial.py b/netbox/netbox/tests/dummy_plugin/migrations/0001_initial.py
index 4342d9576..b7241b51d 100644
--- a/netbox/netbox/tests/dummy_plugin/migrations/0001_initial.py
+++ b/netbox/netbox/tests/dummy_plugin/migrations/0001_initial.py
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='DummyModel',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
('name', models.CharField(max_length=20)),
('number', models.IntegerField(default=100)),
],
diff --git a/netbox/netbox/tests/dummy_plugin/navigation.py b/netbox/netbox/tests/dummy_plugin/navigation.py
index 4e7bb4be8..803cb67dc 100644
--- a/netbox/netbox/tests/dummy_plugin/navigation.py
+++ b/netbox/netbox/tests/dummy_plugin/navigation.py
@@ -4,23 +4,23 @@ from netbox.plugins.navigation import PluginMenu, PluginMenuButton, PluginMenuIt
items = (
PluginMenuItem(
- link='plugins:dummy_plugin:dummy_models',
+ link='plugins:dummy_plugin:dummy_model_list',
link_text='Item 1',
buttons=(
PluginMenuButton(
- link='admin:dummy_plugin_dummymodel_add',
- title='Add a new dummy model',
+ link='plugins:dummy_plugin:dummy_model_add',
+ title='Button 1',
icon_class='mdi mdi-plus-thick',
),
PluginMenuButton(
- link='admin:dummy_plugin_dummymodel_add',
- title='Add a new dummy model',
+ link='plugins:dummy_plugin:dummy_model_add',
+ title='Button 2',
icon_class='mdi mdi-plus-thick',
),
)
),
PluginMenuItem(
- link='plugins:dummy_plugin:dummy_models',
+ link='plugins:dummy_plugin:dummy_model_list',
link_text='Item 2',
),
)
diff --git a/netbox/netbox/tests/dummy_plugin/urls.py b/netbox/netbox/tests/dummy_plugin/urls.py
index 053a7443e..9e383ffe2 100644
--- a/netbox/netbox/tests/dummy_plugin/urls.py
+++ b/netbox/netbox/tests/dummy_plugin/urls.py
@@ -4,5 +4,6 @@ from . import views
urlpatterns = (
- path('models/', views.DummyModelsView.as_view(), name='dummy_models'),
+ path('models/', views.DummyModelsView.as_view(), name='dummy_model_list'),
+ path('models/add/', views.DummyModelAddView.as_view(), name='dummy_model_add'),
)
diff --git a/netbox/netbox/tests/dummy_plugin/views.py b/netbox/netbox/tests/dummy_plugin/views.py
index 03a83b585..f6cf6a5c5 100644
--- a/netbox/netbox/tests/dummy_plugin/views.py
+++ b/netbox/netbox/tests/dummy_plugin/views.py
@@ -1,3 +1,6 @@
+import random
+import string
+
from django.http import HttpResponse
from django.views.generic import View
@@ -15,6 +18,20 @@ class DummyModelsView(View):
return HttpResponse(f"Instances: {instance_count}")
+class DummyModelAddView(View):
+
+ def get(self, request):
+ return HttpResponse(f"Create an instance")
+
+ def post(self, request):
+ instance = DummyModel(
+ name=''.join(random.choices(string.ascii_lowercase, k=8)),
+ number=random.randint(1, 100000)
+ )
+ instance.save()
+ return HttpResponse(f"Instance created")
+
+
@register_model_view(Site, 'extra', path='other-stuff')
class ExtraCoreModelView(View):
diff --git a/netbox/netbox/tests/test_plugins.py b/netbox/netbox/tests/test_plugins.py
index 40bf8b0ea..f7aeb7a53 100644
--- a/netbox/netbox/tests/test_plugins.py
+++ b/netbox/netbox/tests/test_plugins.py
@@ -41,7 +41,7 @@ class PluginTest(TestCase):
def test_views(self):
# Test URL resolution
- url = reverse('plugins:dummy_plugin:dummy_models')
+ url = reverse('plugins:dummy_plugin:dummy_model_list')
self.assertEqual(url, '/plugins/dummy-plugin/models/')
# Test GET request
diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py
index 7f37f01f1..43cfc1d4f 100644
--- a/netbox/netbox/urls.py
+++ b/netbox/netbox/urls.py
@@ -11,7 +11,6 @@ from netbox.graphql.schema import schema
from netbox.graphql.views import GraphQLView
from netbox.plugins.urls import plugin_patterns, plugin_api_patterns
from netbox.views import HomeView, StaticMediaFailureView, SearchView, htmx
-from .admin import admin_site
_patterns = [
@@ -70,27 +69,25 @@ _patterns = [
# Plugins
path('plugins/', include((plugin_patterns, 'plugins'))),
path('api/plugins/', include((plugin_api_patterns, 'plugins-api'))),
-
- # Admin
- path('admin/background-tasks/', include('django_rq.urls')),
- path('admin/', admin_site.urls),
]
+# Django admin UI
+if settings.DJANGO_ADMIN_ENABLED:
+ from .admin import admin_site
+ _patterns.append(path('admin/', admin_site.urls))
+# django-debug-toolbar
if settings.DEBUG:
import debug_toolbar
- _patterns += [
- path('__debug__/', include(debug_toolbar.urls)),
- ]
+ _patterns.append(path('__debug__/', include(debug_toolbar.urls)))
+# Prometheus metrics
if settings.METRICS_ENABLED:
- _patterns += [
- path('', include('django_prometheus.urls')),
- ]
+ _patterns.append(path('', include('django_prometheus.urls')))
# Prepend BASE_PATH
urlpatterns = [
- path('{}'.format(settings.BASE_PATH), include(_patterns))
+ path(settings.BASE_PATH, include(_patterns))
]
handler404 = 'netbox.views.errors.handler_404'
diff --git a/netbox/netbox/views/misc.py b/netbox/netbox/views/misc.py
index 781b40494..fc6c18218 100644
--- a/netbox/netbox/views/misc.py
+++ b/netbox/netbox/views/misc.py
@@ -2,14 +2,17 @@ import re
from collections import namedtuple
from django.conf import settings
+from django.contrib import messages
from django.contrib.contenttypes.models import ContentType
from django.core.cache import cache
from django.shortcuts import redirect, render
+from django.utils.translation import gettext_lazy as _
from django.views.generic import View
from django_tables2 import RequestConfig
from packaging import version
-from extras.dashboard.utils import get_dashboard
+from extras.constants import DEFAULT_DASHBOARD
+from extras.dashboard.utils import get_dashboard, get_default_dashboard
from netbox.forms import SearchForm
from netbox.search import LookupTypes
from netbox.search.backends import search_backend
@@ -32,7 +35,13 @@ class HomeView(View):
return redirect('login')
# Construct the user's custom dashboard layout
- dashboard = get_dashboard(request.user).get_layout()
+ try:
+ dashboard = get_dashboard(request.user).get_layout()
+ except Exception:
+ messages.error(request, _(
+ "There was an error loading the dashboard configuration. A default dashboard is in use."
+ ))
+ dashboard = get_default_dashboard(config=DEFAULT_DASHBOARD).get_layout()
# Check whether a new release is available. (Only for staff/superusers.)
new_release = None
diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 5fc874a09..194e79351 100644
Binary files a/netbox/project-static/dist/netbox.css and b/netbox/project-static/dist/netbox.css differ
diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index fcf2ddfa3..5146f855f 100644
Binary files a/netbox/project-static/dist/netbox.js and b/netbox/project-static/dist/netbox.js differ
diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index 64093d66b..c28525be9 100644
Binary files a/netbox/project-static/dist/netbox.js.map and b/netbox/project-static/dist/netbox.js.map differ
diff --git a/netbox/project-static/src/search.ts b/netbox/project-static/src/search.ts
index e3bdc18dc..8275b126e 100644
--- a/netbox/project-static/src/search.ts
+++ b/netbox/project-static/src/search.ts
@@ -7,12 +7,12 @@ import { isTruthy } from './util';
*/
function quickSearchEventHandler(event: Event): void {
const quicksearch = event.currentTarget as HTMLInputElement;
- const inputgroup = quicksearch.parentElement as HTMLDivElement;
- if (isTruthy(inputgroup)) {
+ const clearbtn = document.getElementById("quicksearch_clear") as HTMLAnchorElement;
+ if (isTruthy(clearbtn)) {
if (quicksearch.value === "") {
- inputgroup.classList.add("hide-last-child");
+ clearbtn.classList.add("d-none");
} else {
- inputgroup.classList.remove("hide-last-child");
+ clearbtn.classList.remove("d-none");
}
}
}
@@ -22,7 +22,7 @@ function quickSearchEventHandler(event: Event): void {
*/
export function initQuickSearch(): void {
const quicksearch = document.getElementById("quicksearch") as HTMLInputElement;
- const clearbtn = document.getElementById("quicksearch_clear") as HTMLButtonElement;
+ const clearbtn = document.getElementById("quicksearch_clear") as HTMLAnchorElement;
if (isTruthy(quicksearch)) {
quicksearch.addEventListener("keyup", quickSearchEventHandler, {
passive: true
diff --git a/netbox/project-static/styles/_variables.scss b/netbox/project-static/styles/_variables.scss
index f2e2f9ed4..6ac3c4896 100644
--- a/netbox/project-static/styles/_variables.scss
+++ b/netbox/project-static/styles/_variables.scss
@@ -18,3 +18,6 @@ $table-cell-padding-y: 0.5rem;
// Fix Tabler bug #1694 in 1.0.0-beta20
$hover-bg: rgba(var(--tblr-secondary-rgb), 0.08);
+
+// Ensure active nav-pill has a background color in dark mode
+$nav-pills-link-active-bg: rgba(var(--tblr-secondary-rgb), 0.15);
diff --git a/netbox/project-static/styles/custom/_markdown.scss b/netbox/project-static/styles/custom/_markdown.scss
new file mode 100644
index 000000000..08de23581
--- /dev/null
+++ b/netbox/project-static/styles/custom/_markdown.scss
@@ -0,0 +1,38 @@
+// Rendered Markdown
+.rendered-markdown {
+
+ table {
+ width: 100%;
+
+ // Apply a border
+ th {
+ border-bottom: 2px solid #dddddd;
+ padding: 8px;
+ }
+ td {
+ border-top: 1px solid #dddddd;
+ padding: 8px;
+ }
+
+ // Map "align" attr of column headings
+ th[align="left"] {
+ text-align: left;
+ }
+ th[align="center"] {
+ text-align: center;
+ }
+ th[align="right"] {
+ text-align: right;
+ }
+ }
+
+}
+
+// Markdown preview
+.markdown-widget {
+ .preview {
+ border: 1px solid $border-color;
+ border-radius: $border-radius;
+ min-height: 200px;
+ }
+}
diff --git a/netbox/project-static/styles/custom/_misc.scss b/netbox/project-static/styles/custom/_misc.scss
index 42ea9a8c6..ebf66d547 100644
--- a/netbox/project-static/styles/custom/_misc.scss
+++ b/netbox/project-static/styles/custom/_misc.scss
@@ -10,36 +10,6 @@ span.color-label {
border-radius: $border-radius;
}
-// Rendered Markdown
-.rendered-markdown {
-
- table {
- width: 100%;
-
- // Apply a border
- th {
- border-bottom: 2px solid #dddddd;
- padding: 8px;
- }
- td {
- border-top: 1px solid #dddddd;
- padding: 8px;
- }
-
- // Map "align" attr of column headings
- th[align="left"] {
- text-align: left;
- }
- th[align="center"] {
- text-align: center;
- }
- th[align="right"] {
- text-align: right;
- }
- }
-
-}
-
// Object hierarchy depth indicators
.record-depth {
display: inline;
diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index f86c4433f..17c6d88c9 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -19,4 +19,5 @@
// Custom styling
@import 'custom/code';
+@import 'custom/markdown';
@import 'custom/misc';
diff --git a/netbox/templates/account/profile.html b/netbox/templates/account/profile.html
index 07c701de2..fb6da891a 100644
--- a/netbox/templates/account/profile.html
+++ b/netbox/templates/account/profile.html
@@ -38,7 +38,7 @@
| - {% trans "Background Tasks" %} - | -
|---|
| - {% trans "Installed plugins" %} - | -
{% endif %}| {% trans "Queue" %} | +{{ job.origin|placeholder }} | +
|---|---|
| {% trans "Timeout" %} | +{{ job.timeout|placeholder }} | +
| {% trans "Result TTL" %} | +{{ job.result_ttl|placeholder }} | +
| {% trans "Created" %} | +{{ job.created_at|annotated_date }} | +
| {% trans "Queued" %} | +{{ job.enqueued_at|annotated_date }} | +
| {% trans "Status" %} | +{{ job.get_status|placeholder }} | +
| {% trans "Callable" %} | +{{ object.get_type_display|placeholder }} | +
| {% trans "Meta" %} | +{{ job.meta|placeholder }} | +
| {% trans "Arguments" %} | +{{ jobs.args|placeholder }} | +
| {% trans "Keyword Arguments" %} | + {# TODO: Render as formatted JSON #} +{{ job.kwargs }} | +
| {% trans "Depends on" %} | +{{ dependency_id }} | +
| {% trans "Exception" %} | +{% if job.exc_info %}{{ job.exc_info|linebreaks }}{% endif %} |
+
| {% trans "Name" %} | +{{ worker.name|placeholder }} | +
|---|---|
| {% trans "State" %} | +{{ worker.get_state|bettertitle|placeholder }} | +
| {% trans "Birth" %} | +{{ worker.birth_date|annotated_date }} | +
| {% trans "Queues" %} | +{{ worker.queue_names|join:", " }} | +
| {% trans "PID" %} | +{{ worker.pid|placeholder }} | +
| {% trans "Curent Job" %} | +{{ job.func_name|placeholder }} | +
| {% trans "Successful job count" %} | +{{ worker.successful_job_count|placeholder }} | +
| {% trans "Failed job count" %} | +{{ worker.failed_job_count }} | +
| {% trans "Total working time" %} | +{{ total_working_time }} {% trans "seconds" %} | +
| {% trans "Device" %} | @@ -142,29 +147,23 @@
|---|
| {{ group_name }} | +|
|---|---|
| {{ field }} + | {{ field }} {% if field.description %} |
| {% trans "Utilization" %} | @@ -131,7 +140,7 @@ {% with first_available_ip=object.get_first_available_ip %} {% if first_available_ip %} {% if perms.ipam.add_ipaddress %} - {{ first_available_ip }} + {{ first_available_ip }} {% else %} {{ first_available_ip }} {% endif %} @@ -142,13 +151,6 @@
|---|