From b8feba107065585f11d0da2adcb8911e541fec03 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Sun, 13 Oct 2019 04:12:58 -0400 Subject: [PATCH 01/20] implemented #3606 - added stale bot config --- .github/stale.yaml | 22 ++++++++++++++++++++++ CONTRIBUTING.md | 23 +++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 .github/stale.yaml diff --git a/.github/stale.yaml b/.github/stale.yaml new file mode 100644 index 000000000..3f309b0ca --- /dev/null +++ b/.github/stale.yaml @@ -0,0 +1,22 @@ +# Number of days of inactivity before an issue becomes stale +daysUntilStale: 14 +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 7 +# Issues with these labels will never be considered stale +exemptLabels: + - "status: accepted" + - "status: gathering feedback" +# Label to use when marking an issue as stale +staleLabel: wontfix +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. NetBox + is governed by a small group of core maintainers which means not all opened + issues may receive direct feedback. Please see our [contributing guide](https://github.com/netbox-community/netbox/blob/develop/CONTRIBUTING.md). +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: > + This issue has been automatically closed due to lack of activity. In an + effort to reduce noise, please do not comment any further. Note that the + core maintainers may elect to reopen this issue at a later date if deemed + necessary. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a688be9b3..1ecdbf1ac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -118,6 +118,29 @@ feedback. **Do not** comment on an issue just to show your support (give the top post a :+1: instead) or ask for an ETA. These comments will be deleted to 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. + +The core maintainers group has chosen to make use of the GitHub Stale bot 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 with either the "status: accepted" or "status: gathering feedback" labels applied will be exempt from all Stale bot actions. + +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. + ## Maintainer Guidance * Maintainers are expected to contribute at least four hours per week to the From f08968da494ff4bbe341075622c26df3e9c113c4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 17 Oct 2019 14:28:27 -0400 Subject: [PATCH 02/20] Exempt issues tagged with "status: blocked" --- .github/stale.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/stale.yaml b/.github/stale.yaml index 3f309b0ca..7c8d03f12 100644 --- a/.github/stale.yaml +++ b/.github/stale.yaml @@ -6,6 +6,7 @@ daysUntilClose: 7 exemptLabels: - "status: accepted" - "status: gathering feedback" + - "status: blocked" # Label to use when marking an issue as stale staleLabel: wontfix # Comment to post when marking an issue as stale. Set to `false` to disable From 1df6713ad584ea6e14563da3a4e8a0baf5853ba2 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 17 Oct 2019 20:56:37 -0400 Subject: [PATCH 03/20] Minor improvements pertaining to CII best practices --- CONTRIBUTING.md | 17 ++++++++++------- README.md | 12 +++++++++++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1ecdbf1ac..55a979eef 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,7 @@ already been fixed. to see if the bug you've found has already been reported. If you think you may be experiencing a reported issue that hasn't already been resolved, please click "add a reaction" in the top right corner of the issue and add a thumbs -up (+1). You mightalso want to add a comment describing how it's affecting your +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. @@ -99,6 +99,8 @@ any work that's already in progress. * Any pull request which does _not_ relate to an accepted issue will be closed. +* All major new functionality must include relevant tests where applicable. + * 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. @@ -128,15 +130,16 @@ If an issue is labeled as "status: revisions needed" a moderator has identified 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. - + The core maintainers group has chosen to make use of the GitHub Stale bot 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 with either the "status: accepted" or "status: gathering feedback" labels applied 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. diff --git a/README.md b/README.md index e915c8662..996f26332 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ NetBox is an IP address management (IPAM) and data center infrastructure management (DCIM) tool. Initially conceived by the network engineering team at [DigitalOcean](https://www.digitalocean.com/), NetBox was developed specifically -to address the needs of network and infrastructure engineers. +to address the needs of network and infrastructure engineers. It is intended to +function as a domain-specific source of truth for network operations. NetBox runs as a web application atop the [Django](https://www.djangoproject.com/) Python framework with a [PostgreSQL](http://www.postgresql.org/) database. For a @@ -42,6 +43,15 @@ and run `upgrade.sh`. * [Ansible deployment](https://github.com/lae/ansible-role-netbox) (via [@lae](https://github.com/lae)) * [Kubernetes deployment](https://github.com/CENGN/netbox-kubernetes) (via [@CENGN](https://github.com/CENGN)) +# Providing Feedback + +Feature requests and bug reports must be submitted as GiHub issues. (Please be +sure to use the [appropriate template](https://github.com/netbox-community/netbox/issues/new/choose).) +For general discussion, please consider joining our [mailing list](https://groups.google.com/forum/#!forum/netbox-discuss). + +If you are interested in contributing to the development of NetBox, please read +our [contributing guide](CONTRIBUTING.md) prior to beginning any work. + # Related projects Please see [our wiki](https://github.com/netbox-community/netbox/wiki/Community-Contributions) for a list of relevant community projects. From 244e85e8366c4790d6c23bcb088ce909129a0911 Mon Sep 17 00:00:00 2001 From: kobayashi Date: Mon, 14 Oct 2019 17:30:29 -0400 Subject: [PATCH 04/20] modify patch panel port connection type list --- netbox/templates/dcim/inc/frontport.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html index ae86a36b4..1b7f85e2c 100644 --- a/netbox/templates/dcim/inc/frontport.html +++ b/netbox/templates/dcim/inc/frontport.html @@ -64,6 +64,8 @@
  • Interface
    • +
  • Console Server Port
    • +
  • Console Port
  • Front Port
  • Rear Port
  • Circuit Termination
    • From f21a63382cf25523bc0a91c7b5292a2a50d1addf Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 18 Oct 2019 09:08:56 -0400 Subject: [PATCH 05/20] Changelog for #3340 --- docs/release-notes/version-2.6.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/version-2.6.md b/docs/release-notes/version-2.6.md index fe72331a7..246cc0d91 100644 --- a/docs/release-notes/version-2.6.md +++ b/docs/release-notes/version-2.6.md @@ -2,6 +2,7 @@ ## Enhancements +* [#3340](https://github.com/netbox-community/netbox/issues/3340) - Add missing options to connect front ports to console ports * [#3445](https://github.com/netbox-community/netbox/issues/3445) - Add support for additional user defined headers to be added to webhook requests * [#3499](https://github.com/netbox-community/netbox/issues/3499) - Add `ca_file_path` to Webhook model to support user supplied CA certificate verification of webhook requests From fd99994fdb6081b1a9d291233b7e82475ff45792 Mon Sep 17 00:00:00 2001 From: Brady Lamprecht Date: Fri, 18 Oct 2019 14:59:55 -0600 Subject: [PATCH 06/20] Adding note on invalidating cache --- docs/administration/replicating-netbox.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/administration/replicating-netbox.md b/docs/administration/replicating-netbox.md index 6dd686594..781b3d214 100644 --- a/docs/administration/replicating-netbox.md +++ b/docs/administration/replicating-netbox.md @@ -39,6 +39,11 @@ If you want to export only the database schema, and not the data itself (e.g. fo ```no-highlight pg_dump -s netbox > netbox_schema.sql ``` +If you are migrating your instance of NetBox to a different machine, please make sure you invalidate the cache by performing this command: + +```no-highlight +python3 manage.py invalidate all +``` --- From 68e0329c1b760b83f7680f80c484b387cdb77442 Mon Sep 17 00:00:00 2001 From: Vincent Catros Date: Mon, 21 Oct 2019 11:57:23 +0200 Subject: [PATCH 07/20] Retrieve port-id in LLDP tab --- netbox/templates/dcim/device_lldp_neighbors.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/templates/dcim/device_lldp_neighbors.html b/netbox/templates/dcim/device_lldp_neighbors.html index 4764fffa2..221c17a52 100644 --- a/netbox/templates/dcim/device_lldp_neighbors.html +++ b/netbox/templates/dcim/device_lldp_neighbors.html @@ -52,10 +52,10 @@