Merge pull request #3828 from netbox-community/develop

Release v2.6.10

Author: jeremystretch

CONTRIBUTING.md

@@ -16,7 +16,7 @@ For real-time discussion, you can join the #netbox Slack channel on [NetworkToCo
 
 ## Reporting Bugs
 
-* First, ensure that you've installed the [latest stable version](https://github.com/netbox-community/netbox/releases)
+* First, ensure that you're running the [latest stable version](https://github.com/netbox-community/netbox/releases)
 of NetBox. If you're running an older version, it's possible that the bug has
 already been fixed.
 
@@ -28,27 +28,26 @@ up (+1). You might also want to add a comment describing how it's affecting your
 installation. This will allow us to prioritize bugs based on how many users are
 affected.
 
-* If you haven't found an existing issue that describes your suspected bug,
-please inquire about it on the mailing list. **Do not** file an issue until you
-have received confirmation that it is in fact a bug. Invalid issues are very
-distracting and slow the pace at which NetBox is developed.
-
 * When submitting an issue, please be as descriptive as possible. Be sure to
-include:
+provide all information request in the issue template, including:
 
     * The environment in which NetBox is running
-    * The exact steps that can be taken to reproduce the issue (if applicable)
+    * The exact steps that can be taken to reproduce the issue
+    * Expected and observed behavior
     * Any error messages generated
     * Screenshots (if applicable)
 
 * Please avoid prepending any sort of tag (e.g. "[Bug]") to the issue title.
-The issue will be reviewed by a moderator after submission and the appropriate
+The issue will be reviewed by a maintainer after submission and the appropriate
 labels will be applied for categorization.
 
 * Keep in mind that we prioritize bugs based on their severity and how much
 work is required to resolve them. It may take some time for someone to address
 your issue.
 
+* For more information on how bug reports are handled, please see our [issue
+intake policy](https://github.com/netbox-community/netbox/wiki/Issue-Intake-Policy).
+
 ## Feature Requests
 
 * First, check the GitHub [issues list](https://github.com/netbox-community/netbox/issues)
@@ -61,10 +60,10 @@ free to add a comment with any additional justification for the feature.
 (However, note that comments with no substance other than a "+1" will be
 deleted. Please use GitHub's reactions feature to indicate your support.)
 
-* Due to an excessive backlog of feature requests, we are not currently
-accepting any proposals which substantially extend NetBox's functionality
-beyond its current feature set. This includes the introduction of any new views
-or models which have not already been proposed in an existing feature request.
+* Due to a large backlog of feature requests, we are not currently accepting
+any proposals which substantially extend NetBox's functionality beyond its
+current feature set. This includes the introduction of any new views or models
+which have not already been proposed in an existing feature request.
 
 * Before filing a new feature request, consider raising your idea on the
 mailing list first. Feedback you receive there will help validate and shape the
@@ -75,8 +74,8 @@ describe the functionality and data model(s) being proposed. The more effort
 you put into writing a feature request, the better its chance is of being
 implemented. Overly broad feature requests will be closed.
 
-* When submitting a feature request on GitHub, be sure to include the
-following:
+* When submitting a feature request on GitHub, be sure to include all
+information requested by the issue template, including:
 
     * A detailed description of the proposed functionality
     * A use case for the feature; who would use it and what value it would add
@@ -89,6 +88,9 @@ following:
 title. The issue will be reviewed by a moderator after submission and the
 appropriate labels will be applied for categorization.
 
+* For more information on how feature requests are handled, please see our
+[issue intake policy](https://github.com/netbox-community/netbox/wiki/Issue-Intake-Policy).
+
 ## Submitting Pull Requests
 
 * Be sure to open an issue **before** starting work on a pull request, and
@@ -103,7 +105,7 @@ any work that's already in progress.
 
 * When submitting a pull request, please be sure to work off of the `develop`
 branch, rather than `master`. The `develop` branch is used for ongoing
-development, while `master` is used for tagging new stable releases.
+development, while `master` is used for tagging stable releases.
 
 * All code submissions should meet the following criteria (CI will enforce
 these checks):
@@ -122,27 +124,26 @@ reduce noise in the discussion.
 
 ## Issue Lifecycle
 
-When a correctly formatted issue is submitted it is evaluated by a moderator
-who may elect to immediately label the issue as accepted in addition to another
-issue type label. In other cases, the issue may be labeled as "status: gathering feedback"
-which will often be accompanied by a comment from a moderator asking for further dialog from the community.
-If an issue is labeled as "status: revisions needed" a moderator has identified a problem with
-the issue itself and is asking for the submitter himself to update the original post with
-the requested information. If the original post is not updated in a reasonable amount of time,
-the issue will be closed as invalid.
+New issues are handled according to our [issue intake policy](https://github.com/netbox-community/netbox/wiki/Issue-Intake-Policy).
+Maintainers will assign label(s) and/or close new issues as the policy
+dictates. This helps ensure a productive development environment and avoid
+accumulating a large backlog of work.
 
-The core maintainers group has chosen to make use of the GitHub Stale bot to aid in issue management.
+The core maintainers group has chosen to make use of GitHub's [Stale bot](https://github.com/apps/stale)
+to aid in issue management.
 
 * Issues will be marked as stale after 14 days of no activity.
 * Then after 7 more days of inactivity, the issue will be closed.
-* Any issue bearing one of the following labels will be exempt from all Stale bot actions:
+* Any issue bearing one of the following labels will be exempt from all Stale
+  bot actions:
   * `status: accepted`
   * `status: gathering feedback`
   * `status: blocked`
 
-It is natural that some new issues get more attention than others. Often this is a metric of an issues's
-overall usefulness to the project. In other cases in which issues merely get lost in the shuffle,
-notifications from Stale bot can bring renewed attention to potentially meaningful issues.
+It is natural that some new issues get more attention than others. Often this
+is a metric of an issues's overall value to the project. In other cases in
+which issues merely get lost in the shuffle, notifications from Stale bot can
+bring renewed attention to potentially meaningful issues.
 
 ## Maintainer Guidance
 

README.md

@@ -1,4 +1,4 @@
-![NetBox](docs/netbox_logo.png "NetBox logo")
+![NetBox](docs/netbox_logo.svg "NetBox logo")
 
 NetBox is an IP address management (IPAM) and data center infrastructure
 management (DCIM) tool. Initially conceived by the network engineering team at

docs/additional-features/custom-scripts.md

@@ -71,6 +71,18 @@ The checkbox to commit database changes when executing a script is checked by de
 commit_default = False
 ```
 
+## Accessing Request Data
+
+Details of the current HTTP request (the one being made to execute the script) are available as the instance attribute `self.request`. This can be used to infer, for example, the user executing the script and the client IP address:
+
+```python
+username = self.request.user.username
+ip_address = self.request.META.get('HTTP_X_FORWARDED_FOR') or self.request.META.get('REMOTE_ADDR')
+self.log_info("Running as user {} (IP: {})...".format(username, ip_address))
+```
+
+For a complete list of available request parameters, please see the [Django documentation](https://docs.djangoproject.com/en/stable/ref/request-response/).
+
 ## Reading Data from Files
 
 The Script class provides two convenience methods for reading data from files:

docs/index.md

@@ -1,4 +1,4 @@
-![NetBox](netbox_logo.png "NetBox logo")
+![NetBox](netbox_logo.svg "NetBox logo")
 
 # What is NetBox?
 

docs/installation/2-netbox.md

@@ -14,7 +14,7 @@ This section of the documentation discusses installing and configuring the NetBo
 # yum install -y epel-release
 # yum install -y gcc python36 python36-devel python36-setuptools libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel redhat-rpm-config redis
 # easy_install-3.6 pip
-# ln -s /usr/bin/python36 /usr/bin/python3
+# ln -s /usr/bin/python3.6 /usr/bin/python3
 ```
 
 You may opt to install NetBox either from a numbered release or by cloning the master branch of its repository on GitHub.

docs/installation/4-ldap.md

@@ -80,6 +80,7 @@ AUTH_LDAP_USER_ATTR_MAP = {
 ```
 
 # User Groups for Permissions
+
 !!! info
     When using Microsoft Active Directory, support for nested groups can be activated by using `NestedGroupOfNamesType()` instead of `GroupOfNamesType()` for `AUTH_LDAP_GROUP_TYPE`. You will also need to modify the import line to use `NestedGroupOfNamesType` instead of `GroupOfNamesType` .
 
@@ -117,6 +118,9 @@ AUTH_LDAP_GROUP_CACHE_TIMEOUT = 3600
 * `is_staff` - Users mapped to this group are enabled for access to the administration tools; this is the equivalent of checking the "staff status" box on a manually created user. This doesn't grant any specific permissions.
 * `is_superuser` - Users mapped to this group will be granted superuser status. Superusers are implicitly granted all permissions.
 
+!!! warning
+    Authentication will fail if the groups (the distinguished names) do not exist in the LDAP directory.
+
 # Troubleshooting LDAP
 
 `supervisorctl restart netbox` restarts the Netbox service, and initiates any changes made to `ldap_config.py`. If there are syntax errors present, the NetBox process will not spawn an instance, and errors should be logged to `/var/log/supervisor/`.

docs/netbox_logo.svg

@@ -1,3 +1,29 @@
+# v2.6.10 (2019-01-02)
+
+## Enhancements
+
+* [#2233](https://github.com/netbox-community/netbox/issues/2233) - Add ability to move inventory items between devices
+* [#2892](https://github.com/netbox-community/netbox/issues/2892) - Extend admin UI to allow deleting old report results
+* [#3062](https://github.com/netbox-community/netbox/issues/3062) - Add `assigned_to_interface` filter for IP addresses
+* [#3461](https://github.com/netbox-community/netbox/issues/3461) - Fail gracefully on custom link rendering exception
+* [#3705](https://github.com/netbox-community/netbox/issues/3705) - Provide request context when executing custom scripts
+* [#3762](https://github.com/netbox-community/netbox/issues/3762) - Add date/time picker widgets
+* [#3788](https://github.com/netbox-community/netbox/issues/3788) - Enable partial search for inventory items
+* [#3812](https://github.com/netbox-community/netbox/issues/3812) - Optimize size of pages containing a dynamic selection field
+* [#3827](https://github.com/netbox-community/netbox/issues/3827) - Allow filtering console/power/interface connections by device ID
+
+## Bug Fixes
+
+* [#3106](https://github.com/netbox-community/netbox/issues/3106) - Restrict queryset of chained fields when form validation fails
+* [#3695](https://github.com/netbox-community/netbox/issues/3695) - Include A/Z termination sites for circuits in global search
+* [#3712](https://github.com/netbox-community/netbox/issues/3712) - Scrolling to target (hash) did not account for the header size
+* [#3780](https://github.com/netbox-community/netbox/issues/3780) - Fix AttributeError exception in API docs
+* [#3809](https://github.com/netbox-community/netbox/issues/3809) - Filter platform by manufacturer when editing devices
+* [#3811](https://github.com/netbox-community/netbox/issues/3811) - Fix filtering of racks by group on device list
+* [#3822](https://github.com/netbox-community/netbox/issues/3822) - Fix exception when editing a device bay (regression from #3596)
+
+---
+
 # v2.6.9 (2019-12-16)
 
 ## Enhancements
@@ -13,6 +39,8 @@
 * [#3749](https://github.com/netbox-community/netbox/issues/3749) - Fix exception on password change page for local users
 * [#3757](https://github.com/netbox-community/netbox/issues/3757) - Fix unable to assign IP to interface
 
+---
+
 # v2.6.8 (2019-12-10)
 
 ## Enhancements
@@ -35,6 +63,8 @@
 * [#3724](https://github.com/netbox-community/netbox/issues/3724) - Fix API filtering of interfaces by more than one device name
 * [#3725](https://github.com/netbox-community/netbox/issues/3725) - Enforce client validation for minimum service port number
 
+---
+
 # v2.6.7 (2019-11-01)
 
 ## Enhancements

docs/release-notes/version-2.6.md

@@ -7,7 +7,7 @@
 from tenancy.models import Tenant
 from utilities.forms import (
     APISelect, APISelectMultiple, add_blank_choice, BootstrapMixin, CommentField, CSVChoiceField,
-    FilterChoiceField, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple
+    DatePicker, FilterChoiceField, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple
 )
 from .constants import *
 from .models import Circuit, CircuitTermination, CircuitType, Provider
@@ -161,7 +161,6 @@ class Meta:
         ]
         help_texts = {
             'cid': "Unique circuit ID",
-            'install_date': "Format: YYYY-MM-DD",
             'commit_rate': "Committed rate",
         }
         widgets = {
@@ -172,7 +171,7 @@ class Meta:
                 api_url="/api/circuits/circuit-types/"
             ),
             'status': StaticSelect2(),
-
+            'install_date': DatePicker(),
         }