Mascali
/
netbox-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
661 Commits 2 Branches 56 Tags 1.4 MiB
Commit Graph

661 Commits

Author SHA1 Message Date
Tobias Genannt 120a605d35
Merge pull request #347 from tobiasge/python-final 
Use release version of Python 3.9 in tests
 2020-10-26 16:06:12 +01:00
Christian Mäder e51f9cbc18
Merge pull request #344 from netbox-community/Prometheus 
Prepare for Monitoring with Prometheus
 2020-10-26 15:58:52 +01:00
Tobias Genannt 071401b771
Merge pull request #346 from tobiasge/fix-action-warning 
Fix warning in Github Actions
 2020-10-26 15:48:50 +01:00
Tobias Genannt 911488242f Use release version of Python 3.9 in tests 2020-10-26 15:42:31 +01:00
Christian Mäder 5512ea68b3 Ignore prometheus.yml 2020-10-26 15:40:22 +01:00
Christian Mäder 7d055fbcaf Mention monitoring in README 2020-10-26 15:29:41 +01:00
Tobias Genannt 3d244a1946 Fix warning in Github Actions 
Our build script is using "set-env" which has been deprecated by Github.
See this bolg entry:
https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
 2020-10-26 15:23:17 +01:00
Christian Mäder e18d6c53b3 Revert most changes 2020-10-26 15:22:56 +01:00
Christian Mäder 48decdeb0e Monitoring parts to docker-compose.monitorin.yml 2020-10-26 15:22:56 +01:00
Christian Mäder 6ac65a64c9 Fix test 2020-10-26 15:22:56 +01:00
Christian Mäder f46d8a7782 Adds Prometheus/Grafana monitoring infrastructure 2020-10-26 15:22:52 +01:00
Christian Mäder 64d82b5e42
Merge pull request #343 from netbox-community/DynamicVariables 
Dynamic Configuration
 2020-10-26 15:21:42 +01:00
Christian Mäder 58050e5287 Merge core functionality into `configuration.py` 
Which is the file `docker/configuration.docker.py` in our repo.
The common code is then imported by `docker/ldap_config.docker.py`.
 2020-10-26 14:43:11 +01:00
Christian Mäder 2dba2b8811 Fix default for secret_key in configuration.py 2020-10-20 21:45:37 +02:00
Christian Mäder d0c7b87925 Improve order in configuration.py 2020-10-20 21:40:14 +02:00
Christian Mäder ec3fd8a790 Revert accidential change to _read_secret order 2020-10-20 21:36:40 +02:00
Christian Mäder 75554ef5b4 Consistency in namespace name 2020-10-20 21:29:08 +02:00
Christian Mäder dad0608834 Rename example.py to extra.py 
And add some comments to the the file that hopefully guide the user.
 2020-10-20 20:51:43 +02:00
Christian Mäder dc77f1a0b1 Ignore non-default configuration files 2020-10-20 20:51:43 +02:00
Christian Mäder 16b567939c Dot character has special meaning in module names 
Therefore we esacpe it using the underscore character.
 2020-10-20 20:51:43 +02:00
Christian Mäder 20820e10c2 Optimize Imports in ldap_config.py 2020-10-20 20:51:35 +02:00
Christian Mäder 553c8ea470 Update configuration.py 2020-10-20 20:49:59 +02:00
Christian Mäder 811618b359 Lower gunicorn default loglevel 2020-10-20 20:46:43 +02:00
Christian Mäder 7429835970 Sample dynamic configuration file 2020-10-20 20:46:43 +02:00
Christian Mäder 43c05d816d Dynamically load configuration files 2020-10-20 20:46:43 +02:00
Christian Mäder fd3d3d11d1 Tiny refactoring 2020-10-20 20:46:43 +02:00
Christian Mäder 121c3f800d Merge branch 'eemil-develop' into develop 2020-10-20 19:23:11 +02:00
Christian Mäder 9287995df4 Update to latest configuration 2020-10-20 19:22:52 +02:00
eemil 85fbb0af70 fix typo 
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2020-10-20 19:20:29 +02:00
eemil 6bada6660a Prefer secret to env variable if both are configured 2020-10-20 19:20:29 +02:00
Christian Mäder df3ab69c0f
Merge pull request #310 from shuichiro-makigaki/add-remote-auth 
Add REMOTE_AUTH_* configs
 2020-10-20 09:02:27 +02:00
Shuichiro MAKIGAKI 38f4474b14 Add REMOTE_AUTH_* support 2020-10-20 11:11:32 +09:00
Christian Mäder 51331621ab
Merge pull request #345 from netbox-community/enable_sponsoring 
Enable Sponsoring Button
 2020-10-19 17:13:34 +02:00
Christian Mäder 156681f68d
Merge pull request #327 from madnutter56/mirror_ldap_groups 
add option to mirror ldap groups into netbox
 2020-10-19 17:06:51 +02:00
Alex Houlton 9f4a9f528c add option to mirror ldap groups into netbox 
this commit allows ldap assigned groups to be mirrored into
netbox users.

The default is None as this is not the primary way to do this
change.
 2020-10-19 07:50:33 -07:00
Christian Mäder cad803ed31
Create FUNDING.yml to enable sponsoring 2020-10-19 16:50:04 +02:00
Christian Mäder 9efaccadf7 Merge branch 'Tassatux-develop' into develop 2020-10-18 11:41:03 +02:00
Christian Mäder f553d17655 Change log message 2020-10-18 11:31:48 +02:00
Christian Mäder 2b361c4541 Merge branch 'develop' of https://github.com/Tassatux/netbox-docker into Tassatux-develop 2020-10-18 11:24:51 +02:00
Christian Mäder c744603a85
Merge pull request #336 from ericgeldmacher/develop 
Fix sites.yml initializer
 2020-09-21 21:04:39 +02:00
Eric Geldmacher 1133ef50de Fix sites.yml initializer 2020-09-15 15:38:24 -05:00
Tobias Genannt b33a509e25
Merge pull request #333 from tobiasge/python-3.8 
Move default source image to Python 3.8
 2020-09-01 15:35:17 +02:00
Tobias Genannt 79f0b997f3
Merge pull request #332 from tobiasge/image-deps 
Update images in docker-compose
 2020-09-01 14:04:21 +02:00
Tobias Genannt 32cef1dcf8
Enable test on Python 3.9 2020-09-01 13:52:01 +02:00
Tobias Genannt 74833a9b21 Update images in docker-compose 2020-09-01 13:34:42 +02:00
Tobias Genannt a68f315acb Move default source image to Python 3.8 2020-09-01 12:27:39 +02:00
Tobias Genannt 00022e7d79
Merge pull request #331 from netbox-community/develop 
Develop
 2020-09-01 11:05:25 +02:00
Tobias Genannt dd490605ca Preparation for 0.25.0 2020-09-01 10:40:16 +02:00
Tobias Genannt e2711ca205
Merge pull request #326 from tobiasge/fix-startup-2.9 
Fixes for Netbox 2.9
 2020-09-01 10:37:37 +02:00
Tobias Genannt a87f2b3331
Merge pull request #329 from tdorsey/patch-1 
Fix typo in Readme
 2020-08-31 08:03:33 +02:00