`. Add '*' to this list to exempt all models.
EXEMPT_VIEW_PERMISSIONS = [
@@ -146,9 +112,6 @@ EXEMPT_VIEW_PERMISSIONS = [
# 'ipam.prefix',
]
-# Enable the GraphQL API
-GRAPHQL_ENABLED = True
-
# HTTP proxies NetBox should use when sending outbound HTTP requests (e.g. for webhooks).
# HTTP_PROXIES = {
# 'http': 'http://10.10.1.10:3128',
@@ -175,17 +138,6 @@ LOGIN_REQUIRED = False
# re-authenticate. (Default: 1209600 [14 days])
LOGIN_TIMEOUT = None
-# Setting this to True will display a "maintenance mode" banner at the top of every page.
-MAINTENANCE_MODE = False
-
-# The URL to use when mapping physical addresses or GPS coordinates
-MAPS_URL = 'https://maps.google.com/?q='
-
-# An API consumer can request an arbitrary number of objects =by appending the "limit" parameter to the URL (e.g.
-# "?limit=1000"). This setting defines the maximum limit. Setting it to 0 or None will allow an API consumer to request
-# all objects by specifying "?limit=0".
-MAX_PAGE_SIZE = 1000
-
# The file path where uploaded media such as image attachments are stored. A trailing slash is not needed. Note that
# the default value of this setting is derived from the installed location.
# MEDIA_ROOT = '/opt/netbox/netbox/media'
@@ -203,20 +155,6 @@ MAX_PAGE_SIZE = 1000
# Expose Prometheus monitoring metrics at the HTTP endpoint '/metrics'
METRICS_ENABLED = False
-# Credentials that NetBox will uses to authenticate to devices when connecting via NAPALM.
-NAPALM_USERNAME = ''
-NAPALM_PASSWORD = ''
-
-# NAPALM timeout (in seconds). (Default: 30)
-NAPALM_TIMEOUT = 30
-
-# NAPALM optional arguments (see https://napalm.readthedocs.io/en/latest/support/#optional-arguments). Arguments must
-# be provided as a dictionary.
-NAPALM_ARGS = {}
-
-# Determine how many objects to display per page within a list. (Default: 50)
-PAGINATE_COUNT = 50
-
# Enable installed plugins. Add the name of each plugin to the list.
PLUGINS = []
@@ -229,14 +167,6 @@ PLUGINS = []
# }
# }
-# When determining the primary IP address for a device, IPv6 is preferred over IPv4 by default. Set this to True to
-# prefer IPv4 instead.
-PREFER_IPV4 = False
-
-# Rack elevation size defaults, in pixels. For best results, the ratio of width to height should be roughly 10:1.
-RACK_ELEVATION_DEFAULT_UNIT_HEIGHT = 22
-RACK_ELEVATION_DEFAULT_UNIT_WIDTH = 220
-
# Remote authentication support
REMOTE_AUTH_ENABLED = False
REMOTE_AUTH_BACKEND = 'netbox.authentication.RemoteUserBackend'
diff --git a/netbox/netbox/context_processors.py b/netbox/netbox/context_processors.py
index d6dd67d99..74178ceb4 100644
--- a/netbox/netbox/context_processors.py
+++ b/netbox/netbox/context_processors.py
@@ -1,6 +1,7 @@
from django.conf import settings as django_settings
from extras.registry import registry
+from netbox.config import get_config
def settings_and_registry(request):
@@ -9,6 +10,7 @@ def settings_and_registry(request):
"""
return {
'settings': django_settings,
+ 'config': get_config(),
'registry': registry,
'preferences': request.user.config if request.user.is_authenticated else {},
}
diff --git a/netbox/netbox/filtersets.py b/netbox/netbox/filtersets.py
index 791c21d19..f42ab064b 100644
--- a/netbox/netbox/filtersets.py
+++ b/netbox/netbox/filtersets.py
@@ -2,19 +2,19 @@ import django_filters
from copy import deepcopy
from django.contrib.contenttypes.models import ContentType
from django.db import models
+from django_filters.exceptions import FieldLookupError
from django_filters.utils import get_model_field, resolve_field
-from dcim.forms import MACAddressField
from extras.choices import CustomFieldFilterLogicChoices
-from extras.filters import CustomFieldFilter, TagFilter
+from extras.filters import TagFilter
from extras.models import CustomField
from utilities.constants import (
FILTER_CHAR_BASED_LOOKUP_MAP, FILTER_NEGATION_LOOKUP_MAP, FILTER_TREENODE_NEGATION_LOOKUP_MAP,
FILTER_NUMERIC_BASED_LOOKUP_MAP
)
+from utilities.forms import MACAddressField
from utilities import filters
-
__all__ = (
'BaseFilterSet',
'ChangeLoggedModelFilterSet',
@@ -84,6 +84,7 @@ class BaseFilterSet(django_filters.FilterSet):
def _get_filter_lookup_dict(existing_filter):
# Choose the lookup expression map based on the filter type
if isinstance(existing_filter, (
+ django_filters.NumberFilter,
filters.MultiValueDateFilter,
filters.MultiValueDateTimeFilter,
filters.MultiValueNumberFilter,
@@ -115,6 +116,63 @@ class BaseFilterSet(django_filters.FilterSet):
return None
+ @classmethod
+ def get_additional_lookups(cls, existing_filter_name, existing_filter):
+ new_filters = {}
+
+ # Skip nonstandard lookup expressions
+ if existing_filter.method is not None or existing_filter.lookup_expr not in ['exact', 'in']:
+ return {}
+
+ # Choose the lookup expression map based on the filter type
+ lookup_map = cls._get_filter_lookup_dict(existing_filter)
+ if lookup_map is None:
+ # Do not augment this filter type with more lookup expressions
+ return {}
+
+ # Get properties of the existing filter for later use
+ field_name = existing_filter.field_name
+ field = get_model_field(cls._meta.model, field_name)
+
+ # Create new filters for each lookup expression in the map
+ for lookup_name, lookup_expr in lookup_map.items():
+ new_filter_name = f'{existing_filter_name}__{lookup_name}'
+
+ try:
+ if existing_filter_name in cls.declared_filters:
+ # The filter field has been explicitly defined on the filterset class so we must manually
+ # create the new filter with the same type because there is no guarantee the defined type
+ # is the same as the default type for the field
+ resolve_field(field, lookup_expr) # Will raise FieldLookupError if the lookup is invalid
+ new_filter = type(existing_filter)(
+ field_name=field_name,
+ lookup_expr=lookup_expr,
+ label=existing_filter.label,
+ exclude=existing_filter.exclude,
+ distinct=existing_filter.distinct,
+ **existing_filter.extra
+ )
+ elif hasattr(existing_filter, 'custom_field'):
+ # Filter is for a custom field
+ custom_field = existing_filter.custom_field
+ new_filter = custom_field.to_filter(lookup_expr=lookup_expr)
+ else:
+ # The filter field is listed in Meta.fields so we can safely rely on default behaviour
+ # Will raise FieldLookupError if the lookup is invalid
+ new_filter = cls.filter_for_field(field, field_name, lookup_expr)
+ except FieldLookupError:
+ # The filter could not be created because the lookup expression is not supported on the field
+ continue
+
+ if lookup_name.startswith('n'):
+ # This is a negation filter which requires a queryset.exclude() clause
+ # Of course setting the negation of the existing filter's exclude attribute handles both cases
+ new_filter.exclude = not existing_filter.exclude
+
+ new_filters[new_filter_name] = new_filter
+
+ return new_filters
+
@classmethod
def get_filters(cls):
"""
@@ -125,59 +183,12 @@ class BaseFilterSet(django_filters.FilterSet):
"""
filters = super().get_filters()
- new_filters = {}
+ additional_filters = {}
for existing_filter_name, existing_filter in filters.items():
- # Loop over existing filters to extract metadata by which to create new filters
+ additional_filters.update(cls.get_additional_lookups(existing_filter_name, existing_filter))
- # If the filter makes use of a custom filter method or lookup expression skip it
- # as we cannot sanely handle these cases in a generic mannor
- if existing_filter.method is not None or existing_filter.lookup_expr not in ['exact', 'in']:
- continue
+ filters.update(additional_filters)
- # Choose the lookup expression map based on the filter type
- lookup_map = cls._get_filter_lookup_dict(existing_filter)
- if lookup_map is None:
- # Do not augment this filter type with more lookup expressions
- continue
-
- # Get properties of the existing filter for later use
- field_name = existing_filter.field_name
- field = get_model_field(cls._meta.model, field_name)
-
- # Create new filters for each lookup expression in the map
- for lookup_name, lookup_expr in lookup_map.items():
- new_filter_name = '{}__{}'.format(existing_filter_name, lookup_name)
-
- try:
- if existing_filter_name in cls.declared_filters:
- # The filter field has been explicity defined on the filterset class so we must manually
- # create the new filter with the same type because there is no guarantee the defined type
- # is the same as the default type for the field
- resolve_field(field, lookup_expr) # Will raise FieldLookupError if the lookup is invalid
- new_filter = type(existing_filter)(
- field_name=field_name,
- lookup_expr=lookup_expr,
- label=existing_filter.label,
- exclude=existing_filter.exclude,
- distinct=existing_filter.distinct,
- **existing_filter.extra
- )
- else:
- # The filter field is listed in Meta.fields so we can safely rely on default behaviour
- # Will raise FieldLookupError if the lookup is invalid
- new_filter = cls.filter_for_field(field, field_name, lookup_expr)
- except django_filters.exceptions.FieldLookupError:
- # The filter could not be created because the lookup expression is not supported on the field
- continue
-
- if lookup_name.startswith('n'):
- # This is a negation filter which requires a queryset.exclude() clause
- # Of course setting the negation of the existing filter's exclude attribute handles both cases
- new_filter.exclude = not existing_filter.exclude
-
- new_filters[new_filter_name] = new_filter
-
- filters.update(new_filters)
return filters
@@ -213,8 +224,19 @@ class PrimaryModelFilterSet(ChangeLoggedModelFilterSet):
).exclude(
filter_logic=CustomFieldFilterLogicChoices.FILTER_DISABLED
)
- for cf in custom_fields:
- self.filters['cf_{}'.format(cf.name)] = CustomFieldFilter(field_name=cf.name, custom_field=cf)
+
+ custom_field_filters = {}
+ for custom_field in custom_fields:
+ filter_name = f'cf_{custom_field.name}'
+ filter_instance = custom_field.to_filter()
+ if filter_instance:
+ custom_field_filters[filter_name] = filter_instance
+
+ # Add relevant additional lookups
+ additional_lookups = self.get_additional_lookups(filter_name, filter_instance)
+ custom_field_filters.update(additional_lookups)
+
+ self.filters.update(custom_field_filters)
class OrganizationalModelFilterSet(PrimaryModelFilterSet):
diff --git a/netbox/netbox/graphql/__init__.py b/netbox/netbox/graphql/__init__.py
index 069f6a9c8..0ad25a541 100644
--- a/netbox/netbox/graphql/__init__.py
+++ b/netbox/netbox/graphql/__init__.py
@@ -2,7 +2,7 @@ import graphene
from graphene_django.converter import convert_django_field
from taggit.managers import TaggableManager
-from dcim.fields import MACAddressField
+from dcim.fields import MACAddressField, WWNField
from ipam.fields import IPAddressField, IPNetworkField
@@ -17,6 +17,7 @@ def convert_field_to_tags_list(field, registry=None):
@convert_django_field.register(IPAddressField)
@convert_django_field.register(IPNetworkField)
@convert_django_field.register(MACAddressField)
+@convert_django_field.register(WWNField)
def convert_field_to_string(field, registry=None):
# TODO: Update to use get_django_field_description under django_graphene v3.0
return graphene.String(description=field.help_text, required=not field.null)
diff --git a/netbox/netbox/graphql/scalars.py b/netbox/netbox/graphql/scalars.py
new file mode 100644
index 000000000..7d14189dd
--- /dev/null
+++ b/netbox/netbox/graphql/scalars.py
@@ -0,0 +1,23 @@
+from graphene import Scalar
+from graphql.language import ast
+from graphql.type.scalars import MAX_INT, MIN_INT
+
+
+class BigInt(Scalar):
+ """
+ Handle any BigInts
+ """
+ @staticmethod
+ def to_float(value):
+ num = int(value)
+ if num > MAX_INT or num < MIN_INT:
+ return float(num)
+ return num
+
+ serialize = to_float
+ parse_value = to_float
+
+ @staticmethod
+ def parse_literal(node):
+ if isinstance(node, ast.IntValue):
+ return BigInt.to_float(node.value)
diff --git a/netbox/netbox/graphql/schema.py b/netbox/netbox/graphql/schema.py
index bb752b8c4..812c1656d 100644
--- a/netbox/netbox/graphql/schema.py
+++ b/netbox/netbox/graphql/schema.py
@@ -7,6 +7,7 @@ from ipam.graphql.schema import IPAMQuery
from tenancy.graphql.schema import TenancyQuery
from users.graphql.schema import UsersQuery
from virtualization.graphql.schema import VirtualizationQuery
+from wireless.graphql.schema import WirelessQuery
class Query(
@@ -17,6 +18,7 @@ class Query(
TenancyQuery,
UsersQuery,
VirtualizationQuery,
+ WirelessQuery,
graphene.ObjectType
):
pass
diff --git a/netbox/netbox/graphql/types.py b/netbox/netbox/graphql/types.py
index 181b9a0c6..7d71bd1fb 100644
--- a/netbox/netbox/graphql/types.py
+++ b/netbox/netbox/graphql/types.py
@@ -41,6 +41,7 @@ class ObjectType(
class OrganizationalObjectType(
ChangelogMixin,
CustomFieldsMixin,
+ TagsMixin,
BaseObjectType
):
"""
diff --git a/netbox/netbox/graphql/views.py b/netbox/netbox/graphql/views.py
index c2c0269fa..e1573dba6 100644
--- a/netbox/netbox/graphql/views.py
+++ b/netbox/netbox/graphql/views.py
@@ -6,6 +6,7 @@ from graphene_django.views import GraphQLView as GraphQLView_
from rest_framework.exceptions import AuthenticationFailed
from netbox.api.authentication import TokenAuthentication
+from netbox.config import get_config
class GraphQLView(GraphQLView_):
@@ -15,9 +16,10 @@ class GraphQLView(GraphQLView_):
graphiql_template = 'graphiql.html'
def dispatch(self, request, *args, **kwargs):
+ config = get_config()
# Enforce GRAPHQL_ENABLED
- if not settings.GRAPHQL_ENABLED:
+ if not config.GRAPHQL_ENABLED:
return HttpResponseNotFound("The GraphQL API is not enabled.")
# Attempt to authenticate the user using a DRF token, if provided
diff --git a/netbox/netbox/middleware.py b/netbox/netbox/middleware.py
index ed308ea54..cc768cbdc 100644
--- a/netbox/netbox/middleware.py
+++ b/netbox/netbox/middleware.py
@@ -8,34 +8,26 @@ from django.contrib.auth.middleware import RemoteUserMiddleware as RemoteUserMid
from django.core.exceptions import ImproperlyConfigured
from django.db import ProgrammingError
from django.http import Http404, HttpResponseRedirect
-from django.urls import reverse
from extras.context_managers import change_logging
+from netbox.config import clear_config
from netbox.views import server_error
from utilities.api import is_api_request, rest_api_server_error
-class LoginRequiredMiddleware(object):
+class LoginRequiredMiddleware:
"""
If LOGIN_REQUIRED is True, redirect all non-authenticated users to the login page.
"""
-
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
# Redirect unauthenticated requests (except those exempted) to the login page if LOGIN_REQUIRED is true
if settings.LOGIN_REQUIRED and not request.user.is_authenticated:
- # Determine exempt paths
- exempt_paths = [
- reverse('api-root'),
- reverse('graphql'),
- ]
- if settings.METRICS_ENABLED:
- exempt_paths.append(reverse('prometheus-django-metrics'))
# Redirect unauthenticated requests
- if not request.path_info.startswith(tuple(exempt_paths)) and request.path_info != settings.LOGIN_URL:
+ if not request.path_info.startswith(settings.EXEMPT_PATHS):
login_url = f'{settings.LOGIN_URL}?next={parse.quote(request.get_full_path_info())}'
return HttpResponseRedirect(login_url)
@@ -144,7 +136,7 @@ class ObjectChangeMiddleware:
return response
-class APIVersionMiddleware(object):
+class APIVersionMiddleware:
"""
If the request is for an API endpoint, include the API version as a response header.
"""
@@ -159,7 +151,20 @@ class APIVersionMiddleware(object):
return response
-class ExceptionHandlingMiddleware(object):
+class DynamicConfigMiddleware:
+ """
+ Store the cached NetBox configuration in thread-local storage for the duration of the request.
+ """
+ def __init__(self, get_response):
+ self.get_response = get_response
+
+ def __call__(self, request):
+ response = self.get_response(request)
+ clear_config()
+ return response
+
+
+class ExceptionHandlingMiddleware:
"""
Intercept certain exceptions which are likely indicative of installation issues and provide helpful instructions
to the user.
diff --git a/netbox/netbox/models.py b/netbox/netbox/models.py
index 3045e1fce..091bae7bd 100644
--- a/netbox/netbox/models.py
+++ b/netbox/netbox/models.py
@@ -11,6 +11,7 @@ from taggit.managers import TaggableManager
from extras.choices import ObjectChangeActionChoices
from netbox.signals import post_clean
from utilities.mptt import TreeManager
+from utilities.querysets import RestrictedQuerySet
from utilities.utils import serialize_object
__all__ = (
@@ -138,6 +139,18 @@ class CustomValidationMixin(models.Model):
post_clean.send(sender=self.__class__, instance=self)
+class TagsMixin(models.Model):
+ """
+ Enable the assignment of Tags.
+ """
+ tags = TaggableManager(
+ through='extras.TaggedItem'
+ )
+
+ class Meta:
+ abstract = True
+
+
#
# Base model classes
@@ -157,11 +170,13 @@ class ChangeLoggedModel(ChangeLoggingMixin, CustomValidationMixin, BigIDModel):
"""
Base model for all objects which support change logging.
"""
+ objects = RestrictedQuerySet.as_manager()
+
class Meta:
abstract = True
-class PrimaryModel(ChangeLoggingMixin, CustomFieldsMixin, CustomValidationMixin, BigIDModel):
+class PrimaryModel(ChangeLoggingMixin, CustomFieldsMixin, CustomValidationMixin, TagsMixin, BigIDModel):
"""
Primary models represent real objects within the infrastructure being modeled.
"""
@@ -170,15 +185,14 @@ class PrimaryModel(ChangeLoggingMixin, CustomFieldsMixin, CustomValidationMixin,
object_id_field='assigned_object_id',
content_type_field='assigned_object_type'
)
- tags = TaggableManager(
- through='extras.TaggedItem'
- )
+
+ objects = RestrictedQuerySet.as_manager()
class Meta:
abstract = True
-class NestedGroupModel(ChangeLoggingMixin, CustomFieldsMixin, CustomValidationMixin, BigIDModel, MPTTModel):
+class NestedGroupModel(ChangeLoggingMixin, CustomFieldsMixin, CustomValidationMixin, TagsMixin, BigIDModel, MPTTModel):
"""
Base model for objects which are used to form a hierarchy (regions, locations, etc.). These models nest
recursively using MPTT. Within each parent, each child instance must have a unique name.
@@ -220,7 +234,7 @@ class NestedGroupModel(ChangeLoggingMixin, CustomFieldsMixin, CustomValidationMi
})
-class OrganizationalModel(ChangeLoggingMixin, CustomFieldsMixin, CustomValidationMixin, BigIDModel):
+class OrganizationalModel(ChangeLoggingMixin, CustomFieldsMixin, CustomValidationMixin, TagsMixin, BigIDModel):
"""
Organizational models are those which are used solely to categorize and qualify other objects, and do not convey
any real information about the infrastructure being modeled (for example, functional device roles). Organizational
@@ -242,6 +256,8 @@ class OrganizationalModel(ChangeLoggingMixin, CustomFieldsMixin, CustomValidatio
blank=True
)
+ objects = RestrictedQuerySet.as_manager()
+
class Meta:
abstract = True
ordering = ('name',)
diff --git a/netbox/netbox/navigation_menu.py b/netbox/netbox/navigation_menu.py
index a3978f16e..0bd29229f 100644
--- a/netbox/netbox/navigation_menu.py
+++ b/netbox/netbox/navigation_menu.py
@@ -120,6 +120,14 @@ ORGANIZATION_MENU = Menu(
get_model_item('tenancy', 'tenantgroup', 'Tenant Groups'),
),
),
+ MenuGroup(
+ label='Contacts',
+ items=(
+ get_model_item('tenancy', 'contact', 'Contacts'),
+ get_model_item('tenancy', 'contactgroup', 'Contact Groups'),
+ get_model_item('tenancy', 'contactrole', 'Contact Roles'),
+ ),
+ ),
),
)
@@ -168,6 +176,7 @@ CONNECTIONS_MENU = Menu(
label='Connections',
items=(
get_model_item('dcim', 'cable', 'Cables', actions=['import']),
+ get_model_item('wireless', 'wirelesslink', 'Wirelesss Links', actions=['import']),
MenuItem(
link='dcim:interface_connections_list',
link_text='Interface Connections',
@@ -188,6 +197,20 @@ CONNECTIONS_MENU = Menu(
),
)
+WIRELESS_MENU = Menu(
+ label='Wireless',
+ icon_class='mdi mdi-wifi',
+ groups=(
+ MenuGroup(
+ label='Wireless',
+ items=(
+ get_model_item('wireless', 'wirelesslan', 'Wireless LANs'),
+ get_model_item('wireless', 'wirelesslangroup', 'Wireless LAN Groups'),
+ ),
+ ),
+ ),
+)
+
IPAM_MENU = Menu(
label='IPAM',
icon_class='mdi mdi-counter',
@@ -206,6 +229,12 @@ IPAM_MENU = Menu(
get_model_item('ipam', 'role', 'Prefix & VLAN Roles'),
),
),
+ MenuGroup(
+ label='ASNs',
+ items=(
+ get_model_item('ipam', 'asn', 'ASNs'),
+ ),
+ ),
MenuGroup(
label='Aggregates',
items=(
@@ -228,8 +257,9 @@ IPAM_MENU = Menu(
),
),
MenuGroup(
- label='Services',
+ label='Other',
items=(
+ get_model_item('ipam', 'fhrpgroup', 'FHRP Groups'),
get_model_item('ipam', 'service', 'Services', actions=['import']),
),
),
@@ -343,6 +373,7 @@ MENUS = [
ORGANIZATION_MENU,
DEVICES_MENU,
CONNECTIONS_MENU,
+ WIRELESS_MENU,
IPAM_MENU,
VIRTUALIZATION_MENU,
CIRCUITS_MENU,
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 64869fab0..20a6d5d02 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -12,12 +12,14 @@ from django.contrib.messages import constants as messages
from django.core.exceptions import ImproperlyConfigured, ValidationError
from django.core.validators import URLValidator
+from netbox.config import PARAMS
+
#
# Environment setup
#
-VERSION = '3.0.12'
+VERSION = '3.1.0'
# Hostname
HOSTNAME = platform.node()
@@ -28,7 +30,11 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Validate Python version
if sys.version_info < (3, 7):
raise RuntimeError(
- f"NetBox requires Python 3.7 or higher (current: Python {platform.python_version()})"
+ f"NetBox requires Python 3.7 or later. (Currently installed: Python {platform.python_version()})"
+ )
+if sys.version_info < (3, 8):
+ warnings.warn(
+ f"NetBox v3.2 will require Python 3.8 or later. (Currently installed: Python {platform.python_version()})"
)
@@ -69,52 +75,32 @@ DATABASE = getattr(configuration, 'DATABASE')
REDIS = getattr(configuration, 'REDIS')
SECRET_KEY = getattr(configuration, 'SECRET_KEY')
-# Set optional parameters
+# Set static config parameters
ADMINS = getattr(configuration, 'ADMINS', [])
-ALLOWED_URL_SCHEMES = getattr(configuration, 'ALLOWED_URL_SCHEMES', (
- 'file', 'ftp', 'ftps', 'http', 'https', 'irc', 'mailto', 'sftp', 'ssh', 'tel', 'telnet', 'tftp', 'vnc', 'xmpp',
-))
-BANNER_BOTTOM = getattr(configuration, 'BANNER_BOTTOM', '')
-BANNER_LOGIN = getattr(configuration, 'BANNER_LOGIN', '')
-BANNER_TOP = getattr(configuration, 'BANNER_TOP', '')
BASE_PATH = getattr(configuration, 'BASE_PATH', '')
if BASE_PATH:
BASE_PATH = BASE_PATH.strip('/') + '/' # Enforce trailing slash only
-CHANGELOG_RETENTION = getattr(configuration, 'CHANGELOG_RETENTION', 90)
CORS_ORIGIN_ALLOW_ALL = getattr(configuration, 'CORS_ORIGIN_ALLOW_ALL', False)
CORS_ORIGIN_REGEX_WHITELIST = getattr(configuration, 'CORS_ORIGIN_REGEX_WHITELIST', [])
CORS_ORIGIN_WHITELIST = getattr(configuration, 'CORS_ORIGIN_WHITELIST', [])
-CUSTOM_VALIDATORS = getattr(configuration, 'CUSTOM_VALIDATORS', {})
DATE_FORMAT = getattr(configuration, 'DATE_FORMAT', 'N j, Y')
DATETIME_FORMAT = getattr(configuration, 'DATETIME_FORMAT', 'N j, Y g:i a')
DEBUG = getattr(configuration, 'DEBUG', False)
DEVELOPER = getattr(configuration, 'DEVELOPER', False)
DOCS_ROOT = getattr(configuration, 'DOCS_ROOT', os.path.join(os.path.dirname(BASE_DIR), 'docs'))
EMAIL = getattr(configuration, 'EMAIL', {})
-ENFORCE_GLOBAL_UNIQUE = getattr(configuration, 'ENFORCE_GLOBAL_UNIQUE', False)
EXEMPT_VIEW_PERMISSIONS = getattr(configuration, 'EXEMPT_VIEW_PERMISSIONS', [])
-GRAPHQL_ENABLED = getattr(configuration, 'GRAPHQL_ENABLED', True)
HTTP_PROXIES = getattr(configuration, 'HTTP_PROXIES', None)
INTERNAL_IPS = getattr(configuration, 'INTERNAL_IPS', ('127.0.0.1', '::1'))
LOGGING = getattr(configuration, 'LOGGING', {})
+LOGIN_PERSISTENCE = getattr(configuration, 'LOGIN_PERSISTENCE', False)
LOGIN_REQUIRED = getattr(configuration, 'LOGIN_REQUIRED', False)
LOGIN_TIMEOUT = getattr(configuration, 'LOGIN_TIMEOUT', None)
-MAINTENANCE_MODE = getattr(configuration, 'MAINTENANCE_MODE', False)
-MAPS_URL = getattr(configuration, 'MAPS_URL', 'https://maps.google.com/?q=')
-MAX_PAGE_SIZE = getattr(configuration, 'MAX_PAGE_SIZE', 1000)
MEDIA_ROOT = getattr(configuration, 'MEDIA_ROOT', os.path.join(BASE_DIR, 'media')).rstrip('/')
METRICS_ENABLED = getattr(configuration, 'METRICS_ENABLED', False)
-NAPALM_ARGS = getattr(configuration, 'NAPALM_ARGS', {})
-NAPALM_PASSWORD = getattr(configuration, 'NAPALM_PASSWORD', '')
-NAPALM_TIMEOUT = getattr(configuration, 'NAPALM_TIMEOUT', 30)
-NAPALM_USERNAME = getattr(configuration, 'NAPALM_USERNAME', '')
-PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50)
-LOGIN_PERSISTENCE = getattr(configuration, 'LOGIN_PERSISTENCE', False)
PLUGINS = getattr(configuration, 'PLUGINS', [])
PLUGINS_CONFIG = getattr(configuration, 'PLUGINS_CONFIG', {})
-PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False)
-RACK_ELEVATION_DEFAULT_UNIT_HEIGHT = getattr(configuration, 'RACK_ELEVATION_DEFAULT_UNIT_HEIGHT', 22)
-RACK_ELEVATION_DEFAULT_UNIT_WIDTH = getattr(configuration, 'RACK_ELEVATION_DEFAULT_UNIT_WIDTH', 220)
+RELEASE_CHECK_URL = getattr(configuration, 'RELEASE_CHECK_URL', None)
REMOTE_AUTH_AUTO_CREATE_USER = getattr(configuration, 'REMOTE_AUTH_AUTO_CREATE_USER', False)
REMOTE_AUTH_BACKEND = getattr(configuration, 'REMOTE_AUTH_BACKEND', 'netbox.authentication.RemoteUserBackend')
REMOTE_AUTH_DEFAULT_GROUPS = getattr(configuration, 'REMOTE_AUTH_DEFAULT_GROUPS', [])
@@ -128,7 +114,6 @@ REMOTE_AUTH_SUPERUSERS = getattr(configuration, 'REMOTE_AUTH_SUPERUSERS', [])
REMOTE_AUTH_STAFF_GROUPS = getattr(configuration, 'REMOTE_AUTH_STAFF_GROUPS', [])
REMOTE_AUTH_STAFF_USERS = getattr(configuration, 'REMOTE_AUTH_STAFF_USERS', [])
REMOTE_AUTH_GROUP_SEPARATOR = getattr(configuration, 'REMOTE_AUTH_GROUP_SEPARATOR', '|')
-RELEASE_CHECK_URL = getattr(configuration, 'RELEASE_CHECK_URL', None)
REPORTS_ROOT = getattr(configuration, 'REPORTS_ROOT', os.path.join(BASE_DIR, 'reports')).rstrip('/')
RQ_DEFAULT_TIMEOUT = getattr(configuration, 'RQ_DEFAULT_TIMEOUT', 300)
SCRIPTS_ROOT = getattr(configuration, 'SCRIPTS_ROOT', os.path.join(BASE_DIR, 'scripts')).rstrip('/')
@@ -142,6 +127,11 @@ STORAGE_CONFIG = getattr(configuration, 'STORAGE_CONFIG', {})
TIME_FORMAT = getattr(configuration, 'TIME_FORMAT', 'g:i a')
TIME_ZONE = getattr(configuration, 'TIME_ZONE', 'UTC')
+# Check for hard-coded dynamic config parameters
+for param in PARAMS:
+ if hasattr(configuration, param.name):
+ globals()[param.name] = getattr(configuration, param.name)
+
# Validate update repo URL and timeout
if RELEASE_CHECK_URL:
validator = URLValidator(
@@ -317,6 +307,7 @@ INSTALLED_APPS = [
'graphene_django',
'mptt',
'rest_framework',
+ 'social_django',
'taggit',
'timezone_field',
'circuits',
@@ -327,6 +318,7 @@ INSTALLED_APPS = [
'users',
'utilities',
'virtualization',
+ 'wireless',
'django_rq', # Must come after extras to allow overriding management commands
'drf_yasg',
]
@@ -346,6 +338,7 @@ MIDDLEWARE = [
'netbox.middleware.ExceptionHandlingMiddleware',
'netbox.middleware.RemoteUserMiddleware',
'netbox.middleware.LoginRequiredMiddleware',
+ 'netbox.middleware.DynamicConfigMiddleware',
'netbox.middleware.APIVersionMiddleware',
'netbox.middleware.ObjectChangeMiddleware',
'django_prometheus.middleware.PrometheusAfterMiddleware',
@@ -410,7 +403,8 @@ MESSAGE_TAGS = {
}
# Authentication URLs
-LOGIN_URL = '/{}login/'.format(BASE_PATH)
+LOGIN_URL = f'/{BASE_PATH}login/'
+LOGIN_REDIRECT_URL = f'/{BASE_PATH}'
CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
@@ -424,6 +418,27 @@ EXEMPT_EXCLUDE_MODELS = (
('users', 'objectpermission'),
)
+# All URLs starting with a string listed here are exempt from login enforcement
+EXEMPT_PATHS = (
+ f'/{BASE_PATH}api/',
+ f'/{BASE_PATH}graphql/',
+ f'/{BASE_PATH}login/',
+ f'/{BASE_PATH}oauth/',
+ f'/{BASE_PATH}metrics/',
+)
+
+
+#
+# Django social auth
+#
+
+# Load all SOCIAL_AUTH_* settings from the user configuration
+for param in dir(configuration):
+ if param.startswith('SOCIAL_AUTH_'):
+ globals()[param] = getattr(configuration, param)
+
+SOCIAL_AUTH_JSONFIELD_ENABLED = True
+
#
# Django Prometheus
@@ -444,7 +459,7 @@ FILTERS_NULL_CHOICE_VALUE = 'null'
# Django REST framework (API)
#
-REST_FRAMEWORK_VERSION = VERSION.rsplit('.', 1)[0] # Use major.minor as API version
+REST_FRAMEWORK_VERSION = '.'.join(VERSION.split('-')[0].split('.')[:2]) # Use major.minor as API version
REST_FRAMEWORK = {
'ALLOWED_VERSIONS': [REST_FRAMEWORK_VERSION],
'COERCE_DECIMAL_TO_STRING': False,
@@ -466,7 +481,7 @@ REST_FRAMEWORK = {
),
'DEFAULT_VERSION': REST_FRAMEWORK_VERSION,
'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.AcceptHeaderVersioning',
- 'PAGE_SIZE': PAGINATE_COUNT,
+ # 'PAGE_SIZE': PAGINATE_COUNT,
'SCHEMA_COERCE_METHOD_NAMES': {
# Default mappings
'retrieve': 'read',
@@ -565,23 +580,6 @@ RQ_QUEUES = {
}
-#
-# NetBox internal settings
-#
-
-# Pagination
-if MAX_PAGE_SIZE and PAGINATE_COUNT > MAX_PAGE_SIZE:
- raise ImproperlyConfigured(
- f"PAGINATE_COUNT ({PAGINATE_COUNT}) must be less than or equal to MAX_PAGE_SIZE ({MAX_PAGE_SIZE}), if set."
- )
-PER_PAGE_DEFAULTS = [
- 25, 50, 100, 250, 500, 1000
-]
-if PAGINATE_COUNT not in PER_PAGE_DEFAULTS:
- PER_PAGE_DEFAULTS.append(PAGINATE_COUNT)
- PER_PAGE_DEFAULTS = sorted(PER_PAGE_DEFAULTS)
-
-
#
# Plugins
#
diff --git a/netbox/netbox/tests/test_config.py b/netbox/netbox/tests/test_config.py
new file mode 100644
index 000000000..db401cf0c
--- /dev/null
+++ b/netbox/netbox/tests/test_config.py
@@ -0,0 +1,68 @@
+from django.conf import settings
+from django.core.cache import cache
+from django.test import override_settings, TestCase
+
+from extras.models import ConfigRevision
+from netbox.config import clear_config, get_config
+
+
+# Prefix cache keys to avoid interfering with the local environment
+CACHES = settings.CACHES
+CACHES['default'].update({'KEY_PREFIX': 'TEST-'})
+
+
+class ConfigTestCase(TestCase):
+
+ @override_settings(CACHES=CACHES)
+ def test_config_init_empty(self):
+ cache.clear()
+
+ config = get_config()
+ self.assertEqual(config.config, {})
+ self.assertEqual(config.version, None)
+
+ clear_config()
+
+ @override_settings(CACHES=CACHES)
+ def test_config_init_from_db(self):
+ CONFIG_DATA = {'BANNER_TOP': 'A'}
+ cache.clear()
+
+ # Create a config but don't load it into the cache
+ configrevision = ConfigRevision.objects.create(data=CONFIG_DATA)
+
+ config = get_config()
+ self.assertEqual(config.config, CONFIG_DATA)
+ self.assertEqual(config.version, configrevision.pk)
+
+ clear_config()
+
+ @override_settings(CACHES=CACHES)
+ def test_config_init_from_cache(self):
+ CONFIG_DATA = {'BANNER_TOP': 'B'}
+ cache.clear()
+
+ # Create a config and load it into the cache
+ configrevision = ConfigRevision.objects.create(data=CONFIG_DATA)
+ configrevision.activate()
+
+ config = get_config()
+ self.assertEqual(config.config, CONFIG_DATA)
+ self.assertEqual(config.version, configrevision.pk)
+
+ clear_config()
+
+ @override_settings(CACHES=CACHES, BANNER_TOP='Z')
+ def test_settings_override(self):
+ CONFIG_DATA = {'BANNER_TOP': 'A'}
+ cache.clear()
+
+ # Create a config and load it into the cache
+ configrevision = ConfigRevision.objects.create(data=CONFIG_DATA)
+ configrevision.activate()
+
+ config = get_config()
+ self.assertEqual(config.BANNER_TOP, 'Z')
+ self.assertEqual(config.version, configrevision.pk)
+
+ clear_config()
diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py
index 3d4c60c93..e76efe0fe 100644
--- a/netbox/netbox/urls.py
+++ b/netbox/netbox/urls.py
@@ -39,6 +39,7 @@ _patterns = [
# Login/logout
path('login/', LoginView.as_view(), name='login'),
path('logout/', LogoutView.as_view(), name='logout'),
+ path('oauth/', include('social_django.urls', namespace='social')),
# Apps
path('circuits/', include('circuits.urls')),
@@ -48,6 +49,7 @@ _patterns = [
path('tenancy/', include('tenancy.urls')),
path('user/', include('users.urls')),
path('virtualization/', include('virtualization.urls')),
+ path('wireless/', include('wireless.urls')),
# API
path('api/', APIRootView.as_view(), name='api-root'),
@@ -58,6 +60,7 @@ _patterns = [
path('api/tenancy/', include('tenancy.api.urls')),
path('api/users/', include('users.api.urls')),
path('api/virtualization/', include('virtualization.api.urls')),
+ path('api/wireless/', include('wireless.api.urls')),
path('api/status/', StatusView.as_view(), name='api-status'),
path('api/docs/', schema_view.with_ui('swagger', cache_timeout=86400), name='api_docs'),
path('api/redoc/', schema_view.with_ui('redoc', cache_timeout=86400), name='api_redocs'),
diff --git a/netbox/netbox/views/__init__.py b/netbox/netbox/views/__init__.py
index 2c033e760..b361352d0 100644
--- a/netbox/netbox/views/__init__.py
+++ b/netbox/netbox/views/__init__.py
@@ -27,6 +27,7 @@ from netbox.constants import SEARCH_MAX_RESULTS, SEARCH_TYPES
from netbox.forms import SearchForm
from tenancy.models import Tenant
from virtualization.models import Cluster, VirtualMachine
+from wireless.models import WirelessLAN, WirelessLink
class HomeView(View):
@@ -92,14 +93,19 @@ class HomeView(View):
("dcim.view_powerpanel", "Power Panels", PowerPanel.objects.restrict(request.user, 'view').count),
("dcim.view_powerfeed", "Power Feeds", PowerFeed.objects.restrict(request.user, 'view').count),
)
+ wireless = (
+ ("wireless.view_wirelesslan", "Wireless LANs", WirelessLAN.objects.restrict(request.user, 'view').count),
+ ("wireless.view_wirelesslink", "Wireless Links", WirelessLink.objects.restrict(request.user, 'view').count),
+ )
sections = (
("Organization", org, "domain"),
("IPAM", ipam, "counter"),
("Virtualization", virtualization, "monitor"),
("Inventory", dcim, "server"),
- ("Connections", connections, "cable-data"),
("Circuits", circuits, "transit-connection-variant"),
+ ("Connections", connections, "cable-data"),
("Power", power, "flash"),
+ ("Wireless", wireless, "wifi"),
)
stats = []
diff --git a/netbox/project-static/dist/cable_trace.css b/netbox/project-static/dist/cable_trace.css
index 633ccd572..50622f128 100644
Binary files a/netbox/project-static/dist/cable_trace.css and b/netbox/project-static/dist/cable_trace.css differ
diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index bac0e589a..adc964ea1 100644
Binary files a/netbox/project-static/dist/netbox-dark.css and b/netbox/project-static/dist/netbox-dark.css differ
diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index 3ae6b5779..a072cda9f 100644
Binary files a/netbox/project-static/dist/netbox-light.css and b/netbox/project-static/dist/netbox-light.css differ
diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 7974e338d..2093ef4d1 100644
Binary files a/netbox/project-static/dist/netbox-print.css and b/netbox/project-static/dist/netbox-print.css differ
diff --git a/netbox/project-static/styles/cable-trace.scss b/netbox/project-static/styles/cable-trace.scss
index 85deafe96..51d94d38a 100644
--- a/netbox/project-static/styles/cable-trace.scss
+++ b/netbox/project-static/styles/cable-trace.scss
@@ -59,8 +59,13 @@ svg {
stroke: var(--nbx-trace-cable-shadow);
stroke-width: 7px;
}
+ line.wireless-link {
+ stroke: var(--nbx-trace-attachment);
+ stroke-dasharray: 4px 12px;
+ stroke-linecap: round;
+ }
line.attachment {
stroke: var(--nbx-trace-attachment);
- stroke-dasharray: 5px, 5px;
+ stroke-dasharray: 5px;
}
}
diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index b21f38f89..89adfc8bc 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -967,6 +967,17 @@ div.card-overlay {
max-width: unset;
}
+// Preformatted text blocks
+td pre {
+ margin-bottom: 0
+}
+pre.block {
+ padding: $spacer;
+ background-color: var(--nbx-pre-bg);
+ border: 1px solid var(--nbx-pre-border-color);
+ border-radius: $border-radius;
+}
+
#django-messages {
position: fixed;
right: $spacer;
diff --git a/netbox/project-static/styles/overrides.scss b/netbox/project-static/styles/overrides.scss
index 85e6f0d40..03c72c6e6 100644
--- a/netbox/project-static/styles/overrides.scss
+++ b/netbox/project-static/styles/overrides.scss
@@ -7,11 +7,7 @@ body {
}
pre {
- padding: $spacer;
white-space: pre;
- background-color: var(--nbx-pre-bg);
- border: 1px solid var(--nbx-pre-border-color);
- border-radius: $border-radius;
}
// Force
The complete exception is provided below:
-{{ exception }} {{ exception }} Restore configuration #{{ object.pk }} from {{ object.created }} ?
+
+
+
+
+ Parameter
+ Current Value
+ New Value
+
+
+
+ {% for param, current, new in params %}
+
+ {{ param }}
+ {{ current }}
+ {{ new }}
+ {% if current != new %}
+
+ {% endfor %}
+
+
+
+
+{% endblock content %}
+
+
diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html
index 9575d4dcb..d45dc62f6 100644
--- a/netbox/templates/base/layout.html
+++ b/netbox/templates/base/layout.html
@@ -58,13 +58,13 @@
- {% if settings.BANNER_TOP %}
+ {% if config.BANNER_TOP %}
- {{ settings.BANNER_TOP|safe }}
+ {{ config.BANNER_TOP|safe }}
{% endif %}
- {% if settings.MAINTENANCE_MODE %}
+ {% if config.MAINTENANCE_MODE %}
NetBox is currently in maintenance mode. Functionality may be limited.
@@ -98,9 +98,9 @@
{% endblock %}
- {% if settings.BANNER_BOTTOM %}
+ {% if config.BANNER_BOTTOM %}
- {{ settings.BANNER_BOTTOM|safe }}
+ {{ config.BANNER_BOTTOM|safe }}
{% endif %}
@@ -127,7 +127,7 @@
{# GraphQL API #}
- {% if settings.GRAPHQL_ENABLED %}
+ {% if config.GRAPHQL_ENABLED %}
diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index b863a8a0e..22713b592 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -64,17 +64,18 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='circuits:circuit_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
- {% include 'circuits/inc/circuit_termination.html' with termination=object.termination_a side='A' %}
- {% include 'circuits/inc/circuit_termination.html' with termination=object.termination_z side='Z' %}
- {% include 'inc/image_attachments_panel.html' %}
- {% plugin_right_page object %}
-
+ {% include 'circuits/inc/circuit_termination.html' with termination=object.termination_a side='A' %}
+ {% include 'circuits/inc/circuit_termination.html' with termination=object.termination_z side='Z' %}
+ {% include 'inc/panels/contacts.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
+ {% plugin_right_page object %}
+
diff --git a/netbox/templates/circuits/circuittype.html b/netbox/templates/circuits/circuittype.html
index 899ba83c3..57737a6d1 100644
--- a/netbox/templates/circuits/circuittype.html
+++ b/netbox/templates/circuits/circuittype.html
@@ -28,10 +28,11 @@
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index e2fe6af29..5c224f7c0 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -45,7 +45,7 @@
Marked as connected
{% elif termination.cable %}
{{ termination.cable }}
- {% with peer=termination.get_cable_peer %}
+ {% with peer=termination.get_link_peer %}
to
{% if peer.device %}
{{ peer.device }}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='circuits:provider_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/comments.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html
index a5eac1f78..9641c9934 100644
--- a/netbox/templates/circuits/providernetwork.html
+++ b/netbox/templates/circuits/providernetwork.html
@@ -37,9 +37,9 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='circuits:providernetwork_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html
index c7cd71b65..00704e6ca 100644
--- a/netbox/templates/dcim/cable.html
+++ b/netbox/templates/dcim/cable.html
@@ -23,6 +23,19 @@
{{ object.get_status_display }}
+
+ Tenant
+
+ {% if object.tenant %}
+ {% if object.tenant.group %}
+ {{ object.tenant.group }} /
+ {% endif %}
+ {{ object.tenant }}
+ {% else %}
+ None
+ {% endif %}
+
+
Label
{{ object.label|placeholder }}
@@ -50,8 +63,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:cable_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
index ee8b56980..60711eb9d 100644
--- a/netbox/templates/dcim/consoleport.html
+++ b/netbox/templates/dcim/consoleport.html
@@ -40,8 +40,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index 8eb84993c..f65af3285 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -40,8 +40,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 9d1868e1e..ea0c795c5 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -93,6 +93,12 @@
{{ object.device_type }} ({{ object.device_type.u_height }}U)
+
+ Airflow
+
+ {{ object.get_airflow_display|placeholder }}
+
+
Serial Number
{{ object.serial|placeholder }}
@@ -214,9 +220,9 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:device_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
@@ -290,7 +296,8 @@
{% endif %}
- {% include 'inc/image_attachments_panel.html' %}
+ {% include 'inc/panels/contacts.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index bb5743ace..21a04e7d0 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -1,51 +1,8 @@
-{% extends 'generic/object.html' %}
+{% extends 'dcim/devicetype/base.html' %}
{% load buttons %}
{% load helpers %}
{% load plugins %}
-{% block title %}{{ object.manufacturer }} {{ object.model }}{% endblock %}
-
-{% block breadcrumbs %}
- {{ block.super }}
- {{ object.manufacturer }}
-
-
-
-
- {% endif %}
-{% endblock %}
-
{% block content %}
@@ -90,6 +47,12 @@
{{ object.get_subdevice_role_display|placeholder }}
+
+ Airflow
+
+ {{ object.get_airflow_display|placeholder }}
+
+
Front Image
@@ -124,9 +87,9 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:devicetype_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_right_page object %}
@@ -135,76 +98,4 @@
{% plugin_full_width_page object %}
-
-
-
-
-
- Interfaces {% badge interface_table.rows|length %}
-
-
-
-
- Front Ports {% badge front_port_table.rows|length %}
-
-
-
-
- Rear Ports {% badge rear_port_table.rows|length %}
-
-
-
-
- Console Ports {% badge consoleport_table.rows|length %}
-
-
-
-
- Console Server Ports {% badge consoleserverport_table.rows|length %}
-
-
-
-
- Power Ports {% badge powerport_table.rows|length %}
-
-
-
-
- Power Outlets {% badge poweroutlet_table.rows|length %}
-
-
-
-
- Device Bays {% badge devicebay_table.rows|length %}
-
-
-
-
-
- {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' tab='interfaces' %}
-
-
- {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Ports' tab='frontports' %}
-
-
- {% include 'dcim/inc/devicetype_component_table.html' with table=rear_port_table title='Rear Ports' tab='rearports' %}
-
-
- {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' tab='consoleports' %}
-
-
- {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' tab='consoleserverports' %}
-
-
- {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' tab='powerports' %}
-
-
- {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' tab='poweroutlets' %}
-
-
- {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' tab='devicebays' %}
-
-
-
-
{{ object.manufacturer }}
+
+
+
+
+ {% endif %}
+{% endblock %}
+
+{% block tab_items %}
+
+
+ Device Type
+
+
+
+ {% with interface_count=object.interfacetemplates.count %}
+ {% if interface_count %}
+
+ Interfaces {% badge interface_count %}
+
+ {% endif %}
+ {% endwith %}
+
+ {% with frontport_count=object.frontporttemplates.count %}
+ {% if frontport_count %}
+
+ Front Ports {% badge frontport_count %}
+
+ {% endif %}
+ {% endwith %}
+
+ {% with rearport_count=object.rearporttemplates.count %}
+ {% if rearport_count %}
+
+ Rear Ports {% badge rearport_count %}
+
+ {% endif %}
+ {% endwith %}
+
+ {% with consoleport_count=object.consoleporttemplates.count %}
+ {% if consoleport_count %}
+
+ Console Ports {% badge consoleport_count %}
+
+ {% endif %}
+ {% endwith %}
+
+ {% with consoleserverport_count=object.consoleserverporttemplates.count %}
+ {% if consoleserverport_count %}
+
+ Console Server Ports {% badge consoleserverport_count %}
+
+ {% endif %}
+ {% endwith %}
+
+ {% with powerport_count=object.powerporttemplates.count %}
+ {% if powerport_count %}
+
+ Power Ports {% badge powerport_count %}
+
+ {% endif %}
+ {% endwith %}
+
+ {% with poweroutlet_count=object.poweroutlettemplates.count %}
+ {% if poweroutlet_count %}
+
+ Power Outlets {% badge poweroutlet_count %}
+
+ {% endif %}
+ {% endwith %}
+
+ {% with devicebay_count=object.devicebaytemplates.count %}
+ {% if devicebay_count %}
+
+ Device Bays {% badge devicebay_count %}
+
+ {% endif %}
+ {% endwith %}
+{% endblock %}
diff --git a/netbox/templates/dcim/inc/devicetype_component_table.html b/netbox/templates/dcim/devicetype/component_templates.html
similarity index 93%
rename from netbox/templates/dcim/inc/devicetype_component_table.html
rename to netbox/templates/dcim/devicetype/component_templates.html
index 900e0f818..d83a232cd 100644
--- a/netbox/templates/dcim/inc/devicetype_component_table.html
+++ b/netbox/templates/dcim/devicetype/component_templates.html
@@ -1,7 +1,9 @@
-{% load helpers %}
+{% extends 'dcim/devicetype/base.html' %}
{% load render_table from django_tables2 %}
+{% load helpers %}
-{% if perms.dcim.change_devicetype %}
+{% block content %}
+ {% if perms.dcim.change_devicetype %}
-{% else %}
+ {% else %}
-{% endif %}
+ {% endif %}
+{% endblock content %}
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index 43ded0c6a..6cc3d482f 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -52,8 +52,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/inc/cable_form.html b/netbox/templates/dcim/inc/cable_form.html
index 05929821c..0f11ac3cb 100644
--- a/netbox/templates/dcim/inc/cable_form.html
+++ b/netbox/templates/dcim/inc/cable_form.html
@@ -2,6 +2,8 @@
{% render_field form.status %}
{% render_field form.type %}
+{% render_field form.tenant_group %}
+{% render_field form.tenant %}
{% render_field form.label %}
{% render_field form.color %}
@@ -17,7 +19,7 @@
{% render_field form.tags %}
{% if form.custom_fields %}
-
+
Custom Fields
{% render_custom_fields form %}
diff --git a/netbox/templates/dcim/inc/device_component_table.html b/netbox/templates/dcim/inc/device_component_table.html
deleted file mode 100644
index b272e2731..000000000
--- a/netbox/templates/dcim/inc/device_component_table.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% load helpers %}
-{% load perms %}
-
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 3a4d16db3..811bf6257 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -69,6 +69,16 @@
{% endif %}
+
+ Bridge
+
+ {% if object.bridge %}
+ {{ object.bridge }}
+ {% else %}
+ None
+ {% endif %}
+
+
LAG
@@ -91,6 +101,14 @@
MAC Address
{{ object.mac_address|placeholder }}
+
+ WWN
+ {{ object.wwn|placeholder }}
+
+ Transmit power (dBm)
+ {{ object.tx_power|placeholder }}
+
802.1Q Mode
{{ object.get_mode_display|placeholder }}
@@ -98,12 +116,12 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
- {% if object.is_connectable %}
+ {% if not object.is_virtual %}
+ {% elif object.wireless_link %}
+
{% else %}
Not Connected
- {% if perms.dcim.add_cable %}
+ {% if object.is_wired and perms.dcim.add_cable %}
+ {% elif object.is_wireless and perms.wireless.add_wirelesslink %}
+
{% endif %}
+
+
+ {% with peer=object.connected_endpoint %}
+
+
+
+ Local
+ {% if peer %}
+ Peer
+ {% endif %}
+
+
+
+ Role
+ {{ object.get_rf_role_display|placeholder }}
+ {% if peer %}
+ {{ peer.get_rf_role_display|placeholder }}
+ {% endif %}
+
+
+ Channel
+ {{ object.get_rf_channel_display|placeholder }}
+ {% if peer %}
+
+ {{ peer.get_rf_channel_display|placeholder }}
+
+ {% endif %}
+
+
+ Channel Frequency
+
+ {% if object.rf_channel_frequency %}
+ {{ object.rf_channel_frequency|simplify_decimal }} MHz
+ {% else %}
+ —
+ {% endif %}
+
+ {% if peer %}
+
+ {% if peer.rf_channel_frequency %}
+ {{ peer.rf_channel_frequency|simplify_decimal }} MHz
+ {% else %}
+ —
+ {% endif %}
+
+ {% endif %}
+
+
+ Channel Width
+
+ {% if object.rf_channel_width %}
+ {{ object.rf_channel_width|simplify_decimal }} MHz
+ {% else %}
+ —
+ {% endif %}
+
+ {% if peer %}
+
+ {% if peer.rf_channel_width %}
+ {{ peer.rf_channel_width|simplify_decimal }} MHz
+ {% else %}
+ —
+ {% endif %}
+
+ {% endif %}
+
+
+ {% endwith %}
+
+
+
+
+
+
+
+ Group
+ SSID
+
+
+
+ {% for wlan in object.wireless_lans.all %}
+
+
+ {% if wlan.group %}
+ {{ wlan.group }}
+ {% else %}
+ —
+ {% endif %}
+
+
+ {{ wlan.ssid }}
+
+
+ {% empty %}
+
+ None
+
+ {% endfor %}
+
+
+
+
@@ -279,6 +440,7 @@
{% endif %}
+ {% include 'ipam/inc/panels/fhrp_groups.html' %}
{% plugin_right_page object %}
@@ -297,7 +459,7 @@
{% if perms.ipam.add_ipaddress %}
diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html
index 317b49a79..a5f686633 100644
--- a/netbox/templates/dcim/interface_edit.html
+++ b/netbox/templates/dcim/interface_edit.html
@@ -15,19 +15,54 @@
{% endif %}
{% render_field form.name %}
- {% render_field form.label %}
{% render_field form.type %}
- {% render_field form.parent %}
- {% render_field form.lag %}
- {% render_field form.mac_address %}
- {% render_field form.mtu %}
+ {% render_field form.label %}
{% render_field form.description %}
{% render_field form.tags %}
+
+
+
+
+
Addressing
+
+ {% render_field form.mac_address %}
+ {% render_field form.wwn %}
+
+
+
Operation
+
+ {% render_field form.mtu %}
+ {% render_field form.tx_power %}
{% render_field form.enabled %}
{% render_field form.mgmt_only %}
{% render_field form.mark_connected %}
+
+
Related Interfaces
+
+ {% render_field form.parent %}
+ {% render_field form.bridge %}
+ {% render_field form.lag %}
+
+
+
Wireless
+
+ {% render_field form.rf_role %}
+ {% render_field form.rf_channel %}
+ {% render_field form.rf_channel_frequency %}
+ {% render_field form.rf_channel_width %}
+ {% render_field form.wireless_lan_group %}
+ {% render_field form.wireless_lans %}
+
802.1Q Switching
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html
index 545e8f1e4..163d8edb3 100644
--- a/netbox/templates/dcim/inventoryitem.html
+++ b/netbox/templates/dcim/inventoryitem.html
@@ -64,8 +64,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index 7d5598bbc..bb0763875 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -40,6 +40,19 @@
{% endif %}
+
+ Tenant
+
+ {% if object.tenant %}
+ {% if object.tenant.group %}
+ {{ object.tenant.group }} /
+ {% endif %}
+ {{ object.tenant }}
+ {% else %}
+ None
+ {% endif %}
+
+
Racks
@@ -62,11 +75,13 @@
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'inc/image_attachments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html
index 85d76f14f..d43a206c6 100644
--- a/netbox/templates/dcim/manufacturer.html
+++ b/netbox/templates/dcim/manufacturer.html
@@ -34,10 +34,12 @@
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index 7229d8078..a926c4ed4 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -55,6 +55,7 @@
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
@@ -63,10 +64,10 @@
NAPALM Arguments
-
{{ object.napalm_args }}
+
{{ object.napalm_args|render_json }}
@@ -182,7 +182,7 @@
{% endif %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index f8973c79b..396ef42a8 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -44,8 +44,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index b1367aa1e..021fa1133 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -39,12 +39,13 @@
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:powerpanel_list' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'inc/image_attachments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index db367df1f..dfe428c50 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -44,8 +44,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 5d44e2125..93bd21fd9 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -162,9 +162,9 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:rack_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
+ {% include 'inc/panels/comments.html' %}
{% if power_feeds %}
{% endif %}
- {% include 'inc/image_attachments_panel.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
{% endif %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html
index 9d1b4deea..1e16af675 100644
--- a/netbox/templates/dcim/rackreservation.html
+++ b/netbox/templates/dcim/rackreservation.html
@@ -83,8 +83,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:rackreservation_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html
index 703e7e3d2..2f4661c9f 100644
--- a/netbox/templates/dcim/rackrole.html
+++ b/netbox/templates/dcim/rackrole.html
@@ -34,10 +34,11 @@
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index 1104bd988..b3ecce3ad 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -46,8 +46,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html
index b46c905c3..7452e594e 100644
--- a/netbox/templates/dcim/region.html
+++ b/netbox/templates/dcim/region.html
@@ -45,7 +45,9 @@
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/tags.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 2afa5376c..2ad970301 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -20,235 +20,286 @@
{% block content %}
-
-
-
-
-
-
- Region
-
- {% if object.region %}
- {% for region in object.region.get_ancestors %}
- {{ region }} /
- {% endfor %}
- {{ object.region }}
- {% else %}
- None
- {% endif %}
-
-
-
- Group
-
- {% if object.group %}
- {% for group in object.group.get_ancestors %}
- {{ group }} /
- {% endfor %}
- {{ object.group }}
- {% else %}
- None
- {% endif %}
-
-
-
- Status
-
- {{ object.get_status_display }}
-
-
-
- Tenant
-
- {% if object.tenant %}
- {% if object.tenant.group %}
- {{ object.tenant.group }} /
- {% endif %}
- {{ object.tenant }}
- {% else %}
- None
- {% endif %}
-
-
-
- Facility
- {{ object.facility|placeholder }}
-
-
- AS Number
- {{ object.asn|placeholder }}
-
-
- Time Zone
-
- {% if object.time_zone %}
- {{ object.time_zone }} (UTC {{ object.time_zone|tzoffset }})Site time: {% timezone object.time_zone %}{% annotated_now %}{% endtimezone %}
- {% else %}
- —
- {% endif %}
-
-
-
- Description
- {{ object.description|placeholder }}
-
-
-
-
-
-
-
-
-
- Physical Address
-
- {% if object.physical_address %}
-
- {{ object.physical_address|linebreaksbr }}
- {% else %}
- —
- {% endif %}
-
-
-
- Shipping Address
- {{ object.shipping_address|linebreaksbr|placeholder }}
-
-
- GPS Coordinates
-
- {% if object.latitude and object.longitude %}
-
- {{ object.latitude }}, {{ object.longitude }}
- {% else %}
- —
- {% endif %}
-
-
-
- Contact Name
- {{ object.contact_name|placeholder }}
-
-
- Contact Phone
-
- {% if object.contact_phone %}
- {{ object.contact_phone }}
- {% else %}
- —
- {% endif %}
-
-
-
- Contact E-Mail
-
- {% if object.contact_email %}
- {{ object.contact_email }}
- {% else %}
- —
- {% endif %}
-
-
-
-
-
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:site_list' %}
- {% include 'inc/comments_panel.html' %}
- {% plugin_left_page object %}
-
-
-
-
-
-
- {% if locations %}
-
+
+
+
+
+
+
+ Region
+
+ {% if object.region %}
+ {% for region in object.region.get_ancestors %}
+ {{ region }} /
+ {% endfor %}
+ {{ object.region }}
{% else %}
None
{% endif %}
+
+
+
+ Group
+
+ {% if object.group %}
+ {% for group in object.group.get_ancestors %}
+ {{ group }} /
+ {% endfor %}
+ {{ object.group }}
+ {% else %}
+ None
+ {% endif %}
+
+
+
+ Status
+
+ {{ object.get_status_display }}
+
+
+
+ Tenant
+
+ {% if object.tenant %}
+ {% if object.tenant.group %}
+ {{ object.tenant.group }} /
+ {% endif %}
+ {{ object.tenant }}
+ {% else %}
+ None
+ {% endif %}
+
+
+
+ Facility
+ {{ object.facility|placeholder }}
+
+
+ Description
+ {{ object.description|placeholder }}
+
+
+ AS Number
+ {{ object.asn|placeholder }}
+
+
+ Time Zone
+
+ {% if object.time_zone %}
+ {{ object.time_zone }} (UTC {{ object.time_zone|tzoffset }})Site time: {% timezone object.time_zone %}{% annotated_now %}{% endtimezone %}
+ {% else %}
+ —
+ {% endif %}
+
+
+
+ Physical Address
+
+ {% if object.physical_address %}
+
+ {{ object.physical_address|linebreaksbr }}
+ {% else %}
+ —
+ {% endif %}
+
+
+
+ Shipping Address
+ {{ object.shipping_address|linebreaksbr|placeholder }}
+
+
+ GPS Coordinates
+
+ {% if object.latitude and object.longitude %}
+
+ {{ object.latitude }}, {{ object.longitude }}
+ {% else %}
+ —
+ {% endif %}
+
+
+ {# Legacy contact fields #}
+ {% with deprecation_warning="This field will be removed in a future release. Please migrate this data to contact objects." %}
+ {% if object.contact_name %}
+
+ Contact Name
+
+ {% if object.contact_name %}
+
+
+ {% endif %}
+ {{ object.contact_name|placeholder }}
+
+
+ {% endif %}
+ {% if object.contact_phone %}
+
+ Contact Phone
+
+ {% if object.contact_phone %}
+
+
+ {{ object.contact_phone }}
+ {% else %}
+ —
+ {% endif %}
+
+
+ {% endif %}
+ {% if object.contact_email %}
+
+ Contact E-Mail
+
+ {% if object.contact_email %}
+
+
+ {{ object.contact_email }}
+ {% else %}
+ —
+ {% endif %}
+
+
+ {% endif %}
+ {% endwith %}
+
+
+
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
+ {% include 'inc/panels/comments.html' %}
+ {% plugin_left_page object %}
+
+
+
+
+
- {% include 'inc/image_attachments_panel.html' %}
- {% plugin_right_page object %}
+
+ {% include 'inc/panels/contacts.html' %}
+
+
+
+ {% if locations %}
+
+ {% else %}
+
None
+ {% endif %}
+
+ {% if perms.dcim.add_location %}
+
+ {% endif %}
+
+
+
+
+ {% if asns %}
+
+
+ ASN
+ Description
+
+ {% for asn in asns %}
+
+ {{ asn }} {{ asn.description|placeholder }}
+
+ {% endfor %}
+
+ {% else %}
+
None
+ {% endif %}
+
+ {% if perms.ipam.add_asn %}
+
+ {% endif %}
+
+ {% include 'inc/panels/image_attachments.html' %}
+ {% plugin_right_page object %}
-
- {% plugin_full_width_page object %}
-
+
+ {% plugin_full_width_page object %}
+
{% endblock %}
diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html
index 856a86d64..d04330413 100644
--- a/netbox/templates/dcim/sitegroup.html
+++ b/netbox/templates/dcim/sitegroup.html
@@ -45,7 +45,9 @@
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/tags.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index 60c20a5dc..eadf1645d 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -38,8 +38,8 @@
diff --git a/netbox/templates/extras/inc/configcontext_data.html b/netbox/templates/extras/inc/configcontext_data.html
index 085887748..48ca18543 100644
--- a/netbox/templates/extras/inc/configcontext_data.html
+++ b/netbox/templates/extras/inc/configcontext_data.html
@@ -1,5 +1,5 @@
{% load helpers %}
-
{% if format == 'json' %}{{ data|render_json }}{% elif format == 'yaml' %}{{ data|render_yaml }}{% else %}{{ data }}{% endif %}
+
{% if format == 'json' %}{{ data|render_json }}{% elif format == 'yaml' %}{{ data|render_yaml }}{% else %}{{ data }}{% endif %}
diff --git a/netbox/templates/extras/inc/tags_panel.html b/netbox/templates/extras/inc/tags_panel.html
deleted file mode 100644
index e67098c0f..000000000
--- a/netbox/templates/extras/inc/tags_panel.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% load helpers %}
-
-
-
- {% for tag in tags.all %} {% tag tag url %} {% empty %}
- No tags assigned
- {% endfor %}
-
-
diff --git a/netbox/templates/extras/journalentry.html b/netbox/templates/extras/journalentry.html
index 925d98b41..2e7fcbbf5 100644
--- a/netbox/templates/extras/journalentry.html
+++ b/netbox/templates/extras/journalentry.html
@@ -45,7 +45,7 @@
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/comments.html' %}
{% endblock %}
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 3a50e09a1..bb2b83360 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -69,7 +69,7 @@
{{ script.filename }}
-
{{ script.source }}
+
{{ script.source }}
{% endblock content-wrapper %}
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index f463b0f2c..3cbd0c611 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -102,11 +102,11 @@
{% endif %}
-
{{ result.data.output }}
+
{{ result.data.output }}
{{ script.filename }}
-
{{ script.source }}
+
{{ script.source }}
{% endblock content-wrapper %}
diff --git a/netbox/templates/extras/webhook.html b/netbox/templates/extras/webhook.html
index 266fa9263..ab53c56a2 100644
--- a/netbox/templates/extras/webhook.html
+++ b/netbox/templates/extras/webhook.html
@@ -132,6 +132,18 @@
+
+
+
+ {% if object.conditions %}
+
{{ object.conditions|render_json }}
+ {% else %}
+
None
+ {% endif %}
+
+
{% endif %}