Skip to content

Commit 46bd62f

Browse files
committed
Merge branch 'develop' into feature
2 parents 781d932 + 0b0dab4 commit 46bd62f

File tree

67 files changed

+3838
-3324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+3838
-3324
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: 🐛 Bug Report
33
description: Report a reproducible bug in the current release of NetBox
4-
labels: ["type: bug", "needs triage"]
4+
labels: ["type: bug", "status: needs triage"]
55
body:
66
- type: markdown
77
attributes:
@@ -26,7 +26,7 @@ body:
2626
attributes:
2727
label: NetBox Version
2828
description: What version of NetBox are you currently running?
29-
placeholder: v3.7.4
29+
placeholder: v3.7.6
3030
validations:
3131
required: true
3232
- type: dropdown

.github/ISSUE_TEMPLATE/documentation_change.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: 📖 Documentation Change
33
description: Suggest an addition or modification to the NetBox documentation
4-
labels: ["type: documentation", "needs triage"]
4+
labels: ["type: documentation", "status: needs triage"]
55
body:
66
- type: dropdown
77
attributes:

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: ✨ Feature Request
33
description: Propose a new NetBox feature or enhancement
4-
labels: ["type: feature", "needs triage"]
4+
labels: ["type: feature", "status: needs triage"]
55
body:
66
- type: markdown
77
attributes:
@@ -14,7 +14,7 @@ body:
1414
attributes:
1515
label: NetBox version
1616
description: What version of NetBox are you currently running?
17-
placeholder: v3.7.4
17+
placeholder: v3.7.6
1818
validations:
1919
required: true
2020
- type: dropdown

.github/workflows/auto-assign-issue.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: pozil/auto-assign-issue@v1
16-
if: "contains(github.event.issue.labels.*.name, 'type: bug') || contains(github.event.issue.labels.*.name, 'type: feature')"
16+
if: "contains(github.event.issue.labels.*.name, 'status: needs triage')"
1717
with:
18-
assignees: abhi1693,arthanson,DanSheps,jeffgdotorg,jeremystretch
18+
# Weighted assignments
19+
assignees: arthanson:3, jeffgdotorg:3, jeremystretch:3, abhi1693, DanSheps
1920
numOfAssignee: 1
2021
abortIfPreviousAssignees: true

docs/_theme/main.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
{% block site_meta %}
44
{{ super() }}
5-
{# Disable search indexing unless we're building for ReadTheDocs (see #10496) #}
6-
{% if page.canonical_url != 'https://docs.netbox.dev/' %}
5+
{# Disable search indexing unless we're building for ReadTheDocs #}
6+
{% if not config.extra.readthedocs %}
77
<meta name="robots" content="noindex">
88
{% endif %}
99
{% endblock %}

docs/configuration/security.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,30 @@ The view name or URL to which a user is redirected after logging out.
181181

182182
---
183183

184+
## SECURE_HSTS_INCLUDE_SUBDOMAINS
185+
186+
Default: False
187+
188+
If true, the `includeSubDomains` directive will be included in the HTTP Strict Transport Security (HSTS) header. This directive instructs the browser to apply the HSTS policy to all subdomains of the current domain.
189+
190+
---
191+
192+
## SECURE_HSTS_PRELOAD
193+
194+
Default: False
195+
196+
If true, the `preload` directive will be included in the HTTP Strict Transport Security (HSTS) header. This directive instructs the browser to preload the site in HTTPS. Browsers that use the HSTS preload list will force the site to be accessed via HTTPS even if the user types HTTP in the address bar.
197+
198+
---
199+
200+
## SECURE_HSTS_SECONDS
201+
202+
Default: 0
203+
204+
If set to a non-zero integer value, the SecurityMiddleware sets the HTTP Strict Transport Security (HSTS) header on all responses that do not already have it. This will instruct the browser that the website must be accessed via HTTPS, blocking any HTTP request.
205+
206+
---
207+
184208
## SECURE_SSL_REDIRECT
185209

186210
Default: False

docs/configuration/system.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ BASE_PATH = 'netbox/'
1616

1717
Default: `en-us` (US English)
1818

19-
Defines the default preferred language/locale for requests that do not specify one. This is used to alter e.g. the display of dates and numbers to fit the user's locale. See [this list](http://www.i18nguy.com/unicode/language-identifiers.html) of standard language codes. (This parameter maps to Django's [`LANGUAGE_CODE`](https://docs.djangoproject.com/en/stable/ref/settings/#language-code) internal setting.)
20-
21-
!!! note
22-
Altering this parameter will *not* change the language used in NetBox. We hope to provide translation support in a future NetBox release.
19+
Defines the default preferred language/locale for requests that do not specify one. (This parameter maps to Django's [`LANGUAGE_CODE`](https://docs.djangoproject.com/en/stable/ref/settings/#language-code) internal setting.)
2320

2421
---
2522

docs/integrations/rest-api.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,19 @@ Each model generally has two views associated with it: a list view and a detail
8585
* `/api/dcim/devices/` - List existing devices or create a new device
8686
* `/api/dcim/devices/123/` - Retrieve, update, or delete the device with ID 123
8787

88-
Lists of objects can be filtered using a set of query parameters. For example, to find all interfaces belonging to the device with ID 123:
88+
Lists of objects can be filtered and ordered using a set of query parameters. For example, to find all interfaces belonging to the device with ID 123:
8989

9090
```
9191
GET /api/dcim/interfaces/?device_id=123
9292
```
9393

94-
See the [filtering documentation](../reference/filtering.md) for more details.
94+
An optional `ordering` parameter can be used to define how to sort the results. Building off the previous example, to sort all the interfaces in reverse order of creation (newest to oldest) for a device with ID 123:
95+
96+
```
97+
GET /api/dcim/interfaces/?device_id=123&ordering=-created
98+
```
99+
100+
See the [filtering documentation](../reference/filtering.md) for more details on topics related to filtering, ordering and lookup expressions.
95101

96102
## Serialization
97103

docs/plugins/development/index.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
!!! tip "Plugins Development Tutorial"
44
Just getting started with plugins? Check out our [**NetBox Plugin Tutorial**](https://github.com/netbox-community/netbox-plugin-tutorial) on GitHub! This in-depth guide will walk you through the process of creating an entire plugin from scratch. It even includes a companion [demo plugin repo](https://github.com/netbox-community/netbox-plugin-demo) to ensure you can jump in at any step along the way. This will get you up and running with plugins in no time!
55

6+
!!! tip "Plugin Certification Program"
7+
NetBox Labs offers a [**Plugin Certification Program**](https://github.com/netbox-community/netbox/wiki/Plugin-Certification-Program) for plugin developers interested in establishing a co-maintainer relationship. The program aims to assure ongoing compatibility, maintainability, and commercial supportability of key plugins.
8+
69
NetBox can be extended to support additional data models and functionality through the use of plugins. A plugin is essentially a self-contained [Django app](https://docs.djangoproject.com/en/stable/) which gets installed alongside NetBox to provide custom functionality. Multiple plugins can be installed in a single NetBox instance, and each plugin can be enabled and configured independently.
710

811
!!! info "Django Development"

docs/plugins/development/views.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ These views are provided to enable or enhance certain NetBox model features, suc
157157

158158
### Additional Tabs
159159

160-
Plugins can "attach" a custom view to a core NetBox model by registering it with `register_model_view()`. To include a tab for this view within the NetBox UI, declare a TabView instance named `tab`:
160+
Plugins can "attach" a custom view to a core NetBox model by registering it with `register_model_view()`. To include a tab for this view within the NetBox UI, declare a TabView instance named `tab`, and add it to the template context dict:
161161

162162
```python
163163
from dcim.models import Site
@@ -173,6 +173,16 @@ class MyView(generic.ObjectView):
173173
badge=lambda obj: Stuff.objects.filter(site=obj).count(),
174174
permission='myplugin.view_stuff'
175175
)
176+
177+
def get(self, request, pk):
178+
...
179+
return render(
180+
request,
181+
"myplugin/mytabview.html",
182+
context={
183+
"tab": self.tab,
184+
},
185+
)
176186
```
177187

178188
::: utilities.views.register_model_view

0 commit comments

Comments
 (0)