Commit Graph

958 Commits

Author SHA1 Message Date
ryanmerolle 8678ad92ce update permission user & group lookup as suggested 2021-04-26 09:17:25 -04:00
Tobias Genannt 5b34df1471 Build feature branch
The branch for the next version of Netbox is now called "feature".
2021-04-26 09:44:52 +02:00
Christian Mäder 3d063a4b35
Merge branch 'ryanmerolle-plugins-and-logging' into develop 2021-04-26 08:55:41 +02:00
Christian Mäder f924e76adf
Formatting 2021-04-26 08:55:22 +02:00
Christian Mäder 604ff3b76d
Merge branch 'plugins-and-logging' of https://github.com/ryanmerolle/netbox-docker into ryanmerolle-plugins-and-logging 2021-04-26 08:54:31 +02:00
ryanmerolle 96545135cb remove example evn var for logging 2021-04-25 16:38:03 -04:00
ryanmerolle 474ca9e78f fully working object permissions 2021-04-25 16:31:50 -04:00
ryanmerolle 12401f2a3f correct black formatting for object_permissions.py 2021-04-25 12:13:27 -04:00
ryanmerolle 528bc17eb8 correct flake8 in object_permissions.py 2021-04-25 11:59:13 -04:00
ryanmerolle 4e31218ce6 update object permission conditionals 2021-04-25 11:15:46 -04:00
Christian Mäder d1b70ba2d4
Merge pull request #499 from ryanmerolle/ldap-example-var-name 2021-04-24 23:58:30 +02:00
ryanmerolle ff0bc9757a correct ldap example var name case 2021-04-24 10:57:15 -04:00
ryanmerolle a1e0c52825 revert startup scripts to use key for object name 2021-04-24 10:41:06 -04:00
ryanmerolle 45889c3811 commented out the logging 2021-04-23 22:38:38 -04:00
ryanmerolle 71d8ac10ac correct issues with users.yml spacing 2021-04-21 12:59:30 -04:00
ryanmerolle 744ed91e2a permissions script cleanup 2021-04-21 12:33:35 -04:00
ryanmerolle b1bcfcbc4e fix isort on groups & permissions scripts 2021-04-21 08:27:20 -04:00
ryanmerolle a7a5d13637 updated given linting feedback 2021-04-20 18:05:47 -04:00
ryanmerolle 5d4ecb7f9e user, group, & permissions fix 2021-04-20 17:47:49 -04:00
ryanmerolle 69dd87689c switch plugin example to netbox_bgp 2021-04-20 07:55:12 -04:00
ryanmerolle 9fab9a3434 mention plugin wiki page in plugins.py comment 2021-04-20 07:52:08 -04:00
ryanmerolle b69a97d2ca add LOGLEVEL into netbox.env 2021-04-20 07:48:41 -04:00
ryanmerolle 8176ef8499 Add expample logging configuration 2021-04-20 07:46:39 -04:00
ryanmerolle eb5cc88b25 Add expample plugin configuration 2021-04-20 07:46:29 -04:00
Christian Mäder f2731d3fe6
Merge pull request #448 from ryanmerolle/develop
AUTH_LDAP_MIRROR_GROUPS ldap_config tweak
2021-04-20 10:15:52 +02:00
ryanmerolle 6f4d025cb7 backed out ldap_config changes 2021-04-20 03:38:20 -04:00
ryanmerolle 222ede2c4b enahance ldap extra.py with more examples 2021-04-20 03:35:57 -04:00
Christian Mäder 5304c8f901
Merge pull request #483 from netbox-community/renovate/django-auth-ldap-2.x
Update dependency django-auth-ldap to v2.4.0
2021-04-20 09:24:20 +02:00
Ryan Merolle 28a26288c9
Merge pull request #3 from netbox-community/develop
pull in develop changes
2021-04-19 22:25:55 -04:00
Renovate Bot 53d759e263
Update dependency django-auth-ldap to v2.4.0 2021-04-19 13:13:02 +00:00
Tobias Genannt 6879412e2b
Merge pull request #495 from tobiasge/no-random-port
Don't publish Netbox on random port
2021-04-19 11:33:23 +02:00
Tobias Genannt a89d2e035c Don't publish Netbox on random port 2021-04-17 10:16:40 +02:00
Tobias Genannt d5c92e9a7d Preparation for 1.2.0 2021-04-16 20:27:33 +02:00
Tobias Genannt c7df608696
Merge pull request #485 from tobiasge/prepare-2.11
Initializer updates for Netbox 2.11
2021-04-16 20:00:35 +02:00
Christian Mäder eee07f703a
Merge pull request #492 from jhujhiti/upstreaming
Fix quoting of exec argument in the entrypoint script
2021-04-16 08:42:15 +02:00
Erick Turnquist 6e7d5a6f59 Fix quoting of exec argument in the entrypoint script 2021-04-15 17:36:14 -04:00
Tobias Genannt 752f592e58
Fixed Python f-string
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
2021-04-13 15:50:23 +02:00
Tobias Genannt f637de88f0 Improved error logging 2021-04-13 14:38:52 +02:00
Christian Mäder a5da38203f
Merge pull request #482 from Daimler/custom-link-error-fix
Fixes #480: Custom Links initialiser breaks if content_type is invalid
2021-04-13 09:33:41 +02:00
Christian Mäder 14c0d17704
Merge pull request #486 from netbox-community/renovate/ruamel.yaml-0.x
Update dependency ruamel.yaml to v0.17.4
2021-04-12 17:12:05 +02:00
Renovate Bot a572d5f5de
Update dependency ruamel.yaml to v0.17.4 2021-04-07 20:52:56 +00:00
Tobias Genannt 3673196c16 Fields in Custom links have been renamed 2021-04-07 15:19:14 +02:00
Tobias Genannt 9874cef369 VLAN Groups can be scoped to multiple types 2021-04-07 15:18:33 +02:00
Tobias Genannt 1c4b6741ac Fixed isort issues 2021-04-07 11:01:01 +02:00
Tobias Genannt b18e4aaf92 Fix super-linter on PRs
See: https://github.com/github/super-linter#example-connecting-github-action-workflow
2021-04-07 10:57:14 +02:00
Tobias Genannt 45824ba4f3 Devices can be added to locations 2021-04-07 09:57:59 +02:00
Tobias Genannt 5944086435 Rack groups have been renamed to locations 2021-04-07 09:40:58 +02:00
Marcus Crane a2e33c166d
Fix link name reference if content type is invalid
Currently, the name of a custom link is referenced
as if it is an object attribute which causes a break
due to it actually being a dictionary.

This minor change means that the startup script won't
*ahem* fail upon failing :)

Signed-Off-by: Marcus Crane <marcus.crane@daimler.com>
2021-04-01 18:48:13 +13:00
Christian Mäder 9ab202f921
Merge pull request #479 from netbox-community/renovate/ruamel.yaml-0.x 2021-03-29 19:25:17 +02:00
Renovate Bot cca79b5dbd
Update dependency ruamel.yaml to v0.17.2 2021-03-29 17:03:30 +00:00