External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
10,709 Commits 65 Branches 102 Tags
54980d09e3d09c881f58284fabab07a876769273
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Rominger 54980d09e3 Merge pull request #4578 from AlanCoding/access_list_perm 
Use ParentMixin for access_list permissions check
 2017-01-05 14:53:47 -05:00
Alan Rominger 8ce97bae91 Merge pull request #4579 from AlanCoding/redirect_warning 
Obey the suggestion in RemovedInDjango19Warning
 2017-01-05 14:51:02 -05:00
Alan Rominger ade758af87 Merge pull request #4580 from AlanCoding/team_admins 
In /users/N/teams/, also show direct admin permission
 2017-01-05 12:57:10 -05:00
AlanCoding a17c7fa461 display teams for which user is admin in teams list 2017-01-04 15:36:13 -05:00
AlanCoding 983bee115c provide default for permanent attribute in redirect view before Django 1.9 hits 2017-01-04 15:06:10 -05:00
AlanCoding 4e135bb406 add unit test to assure permission is checked 2017-01-04 14:46:23 -05:00
AlanCoding bd82ab9fb0 use ParentMixin machinery to check access_list parent obj permissions 2017-01-04 13:39:14 -05:00
Alan Rominger c04c54ecfb Merge pull request #4550 from AlanCoding/data_gen_workflows 
Data generator enhancements, including workflows
 2017-01-03 11:07:42 -05:00
Alan Rominger 9bad0e7396 Merge pull request #4560 from AlanCoding/4555 
Fix log bug
 2017-01-03 10:28:14 -05:00
AlanCoding 60ea0bdf92 fix bug with failed login log 2017-01-03 10:12:04 -05:00
AlanCoding 67686f640b finish implementation of data generator presets, fix flake8 2017-01-03 09:23:27 -05:00
AlanCoding 8c05d7e968 clean up boilerplate for reading preset data 2017-01-03 08:53:45 -05:00
AlanCoding ccf9fe4ecb last job, more cleanup, and start work on preset data sets 2016-12-26 22:40:32 -05:00
AlanCoding 8f3041d8b4 add creation of labels 2016-12-25 19:42:56 -05:00
AlanCoding bdfa29b778 apply created_by and other defaults to all 2016-12-25 18:45:58 -05:00
AlanCoding 9d8b1b4a12 add WFJT node networks 2016-12-24 23:17:09 -05:00
AlanCoding be97f2ca74 generators plus WFJT nodes added to data generator 2016-12-22 14:37:02 -05:00
AlanCoding c3aaccc0d4 make it so that repeated runs do not cause problems 2016-12-22 13:53:19 -05:00
AlanCoding 1346f7b580 fixing some of most annoying problems with bulk data generator 2016-12-22 12:03:56 -05:00
Alan Rominger 1fb3986889 Merge pull request #4495 from AlanCoding/ex_perm 
Switch WFJT node permissions to execute and use levels
 2016-12-19 17:27:45 -05:00
AlanCoding 4b57aa238a switch WFJT node permissions to execute and use levels 2016-12-19 11:21:45 -05:00
Alan Rominger 4bf6eb4f98 Merge pull request #4484 from AlanCoding/service_identity 
Feed the service_identity module
 2016-12-16 13:32:17 -05:00
AlanCoding 08bdbe6eca general update of requirements 2016-12-16 13:13:52 -05:00
AlanCoding ce56a5e824 documentation feedback from pip-complie tool incorporated 2016-12-16 12:46:33 -05:00
AlanCoding 42713c9916 add requirements for service identity module causing warning messages 2016-12-16 11:47:35 -05:00
Alan Rominger 600c94dd40 Merge pull request #4390 from AlanCoding/do_not_copy_labels 
Do not copy WFJT labels in 3.1
 2016-12-15 10:06:45 -05:00
Alan Rominger b7f469baab Merge pull request #4388 from AlanCoding/wfjt_copy_perm 
Fix WFJT copy RBAC bugs
 2016-12-12 16:17:02 -05:00
Alan Rominger 5575f67aba Merge pull request #4393 from AlanCoding/encrypt_log_pass 
Encrypt log token or password
 2016-12-12 12:16:58 -05:00
AlanCoding 249469c576 encrypt log token or password 2016-12-12 12:02:56 -05:00
AlanCoding 278d70ed49 do not copy WFJT labels in 3.1 2016-12-12 11:21:21 -05:00
AlanCoding 30b212b724 fix RBAC bugs associated with WFJT copy 2016-12-12 11:11:25 -05:00
Alan Rominger ecdb9ac02a Merge pull request #4374 from AlanCoding/logger_reloading_PR 
Chain reloading uWSGI on log setting change
 2016-12-12 10:28:27 -05:00
Alan Rominger 39e5765f12 Merge pull request #4381 from AlanCoding/prefetch_optimizing 
Use prefetch_related for several more things
 2016-12-12 10:22:43 -05:00
Alan Rominger 5ee11b5ba3 Merge pull request #4379 from AlanCoding/node_exec_rbac 
Check for UJT start access when adding node
 2016-12-12 10:12:20 -05:00
AlanCoding 4cc1642ab3 clarity edit of uWSGI chain reload task 2016-12-12 09:40:49 -05:00
AlanCoding a90bafe6f0 move various items to prefetch for optimization 2016-12-11 07:31:04 -05:00
AlanCoding c3666752e6 check for UJT start access when adding node 2016-12-10 07:46:30 -05:00
Alan Rominger 75a85cdab2 Merge pull request #4376 from AlanCoding/wf_start_survey 
Do not check survey license for workflow job relaunch
 2016-12-09 16:49:26 -05:00
AlanCoding c6f3d498de remove django configure_logging import 2016-12-09 16:07:47 -05:00
AlanCoding c318b12428 do not check survey license for workflow job relaunch 2016-12-09 16:03:10 -05:00
AlanCoding 431dcc6490 switch to smoother chain reloading 2016-12-09 15:38:38 -05:00
AlanCoding 5ff62c97b6 uwsgi auto-reload on logging change 2016-12-09 15:21:03 -05:00
Alan Rominger 26adcf5972 Merge pull request #4321 from AlanCoding/role_filter2 
filter.py implementation of RBAC downselection
 2016-12-08 12:45:07 -05:00
AlanCoding 2092e67f6f docs and lazy eval for role_level filter 2016-12-08 12:28:46 -05:00
Alan Rominger c13a2e9401 Merge pull request #4323 from AlanCoding/team_singleton 
Prohibit adding singleton permissions as child of team
 2016-12-07 10:10:31 -05:00
AlanCoding 3663c97ac2 Prohibit adding singleton permissions as child of team 2016-12-07 08:42:39 -05:00
AlanCoding adebe00ca5 filter.py implementation of role level filtering 2016-12-06 20:43:15 -05:00
Alan Rominger 95f54b59cf Merge pull request #4288 from AlanCoding/user_aud_31_fixes 
Fix system auditor getter logic
 2016-12-05 17:07:19 -05:00
AlanCoding 1daeff8db1 unsaved user system auditor status made more conservative 2016-12-05 17:01:50 -05:00
Alan Rominger 9396fb0400 Merge pull request #4289 from AlanCoding/org_sublist_fix 
Avoid applying system auditor prop if action was association
 2016-12-05 16:58:28 -05:00
Alan Rominger 6d43771190 Merge pull request #4296 from AlanCoding/org_admin_cred_movement 
Let the org admins share credentials
 2016-12-05 16:56:31 -05:00
Alan Rominger 4f8bc13fdb Merge pull request #4297 from AlanCoding/cred_org_fd 
Allow reading of credential org field in list view
 2016-12-05 16:56:04 -05:00
AlanCoding 81cb57be4f remove tests pertaining to credential org related field 2016-12-05 16:17:58 -05:00
AlanCoding e81dca3249 allow reading of credential org field in list view 2016-12-05 16:00:54 -05:00
AlanCoding 4b5e131362 allow org admins to share credentials between orgs 2016-12-05 15:17:34 -05:00
Alan Rominger b6c8fc1513 Merge pull request #4290 from AlanCoding/wf_type_options 
Workflow jobs in OPTIONS for unified_jobs
 2016-12-05 13:39:34 -05:00
AlanCoding 0255b9483d add workflow jobs to UJ options 2016-12-05 13:27:17 -05:00
AlanCoding 8c64fa2fe1 handle is_system_auditor case with unsaved users 2016-12-05 12:13:28 -05:00
AlanCoding 057efd3d5a avoid applying system auditor prop if action was association 2016-12-05 11:40:26 -05:00
AlanCoding 14746eebe3 fix system auditor getter logic 2016-12-05 11:22:11 -05:00
Alan Rominger 8e76da89f2 Merge pull request #4286 from AlanCoding/destroyer_of_nodes 
Switch job destroy WF check to OneToOne patterns
 2016-12-05 11:15:47 -05:00
AlanCoding 101b50c888 switch job destroy WF check to OneToOne patterns 2016-12-05 10:10:04 -05:00
Alan Rominger ef87a58239 Merge pull request #4242 from ansible/logging_int 
Logging Integration
 2016-12-02 16:51:00 -05:00
AlanCoding 064a40ba92 Manage null default state for logging integration and DB definition 2016-12-02 16:45:27 -05:00
AlanCoding ebff4f4f24 get rid of out of date logger unit tests 2016-12-02 15:16:00 -05:00
AlanCoding 7848198b9f New awx.main.utils directory, distributed task to invalidate settings 2016-12-02 14:36:04 -05:00
AlanCoding db21178b14 remove unused log handlers and cleanup 2016-12-02 10:21:36 -05:00
AlanCoding 7344a998b2 move formatter to logger file, settings reload on startup 2016-12-01 19:09:55 -05:00
AlanCoding 3643d9c06b allow for reloading of logging settings via CTiT 2016-11-30 16:52:47 -05:00
AlanCoding 37ef4e8bc8 HTTP logger overrides kwargs with settings 2016-11-29 16:26:28 -05:00
AlanCoding f3805b1317 enable Logstash auth and prepare for handler for multiple auth types 2016-11-29 14:05:19 -05:00
AlanCoding f3427d1359 Logging Integration, ELK docker-compose as update file 2016-11-29 13:09:47 -05:00
Alan Rominger 25eaae5f09 Merge pull request #4140 from ansible/AlanCoding-patch-1 
Fix scan job relaunch bug
 2016-11-29 08:52:01 -05:00
AlanCoding dd02ab329a add test assertions that check the relaunch job_type bug 2016-11-29 08:07:57 -05:00
Alan Rominger fbd27e25a6 Fix scan job relaunch bug 2016-11-28 16:55:11 -05:00
Alan Rominger df658e7f65 Merge pull request #4108 from AlanCoding/wfjt_ssf 
Add WFJT survey and recent_jobs
 2016-11-23 16:11:16 -05:00
AlanCoding dc3e744dda change unit tests to work with JobTemplateMixin serializer 2016-11-23 16:06:23 -05:00
AlanCoding bf0a235ce9 Add WFJT survey and recent_jobs 2016-11-23 15:48:11 -05:00
Alan Rominger 6bffaec6f9 Merge pull request #4066 from AlanCoding/log_doc 
Logging Integration feature documentation
 2016-11-22 15:38:43 -05:00
Alan Rominger dd1d911775 Merge pull request #4022 from AlanCoding/workflow_copy_relaunch 
Workflow copy and relaunch
 2016-11-22 11:50:51 -05:00
Alan Rominger 69f1e2d24c Merge pull request #3679 from AlanCoding/3677 
Fixes for manual groups/projects
 2016-11-22 11:46:34 -05:00
AlanCoding 8cd4ba0175 refactor of create_unified_job in connection with new copy endpoint development 2016-11-22 11:35:41 -05:00
AlanCoding a39af2a7fd update to consistent copy naming with UI 2016-11-22 11:35:41 -05:00
AlanCoding 4a992e531a copy organization when copying a WFJT 2016-11-22 11:35:40 -05:00
AlanCoding 31a95e5c04 fix up tests from workflow copy work 2016-11-22 11:35:40 -05:00
AlanCoding 8cda12c020 add workflow relaunch 2016-11-22 11:35:40 -05:00
AlanCoding 14ce50c845 implement copying of WFJT objects 2016-11-22 11:35:01 -05:00
Alan Rominger 266d29936d Merge pull request #3985 from AlanCoding/auditor_optimization 
System auditor optimization via cache
 2016-11-22 11:19:23 -05:00
AlanCoding fb5575f71c fqdn 2016-11-21 10:20:06 -05:00
Alan Rominger ab840f9551 Merge pull request #4074 from AlanCoding/test_filename 
Fix test naming conflict
 2016-11-21 08:03:27 -05:00
AlanCoding fe6e928480 Fix test naming conflict 2016-11-20 20:06:32 -05:00
AlanCoding fa766c3657 update old test to new scheme 2016-11-19 11:56:11 -05:00
AlanCoding fc72aafeb8 introduce caching for is_system_auditor method 2016-11-19 11:54:06 -05:00
AlanCoding 42cf74b085 block user from shooting themselves in the foot by scheduling a manual project 2016-11-19 11:48:28 -05:00
AlanCoding 48c155dfb0 schedule capability set to False for manual groups 2016-11-19 11:48:28 -05:00
Alan Rominger 34b638f59d Merge pull request #4071 from AlanCoding/fix_workflow_test 
Fix launch_type kwarg that broke workflow unit tests
 2016-11-19 11:14:25 -05:00
AlanCoding c717bf090d update workflow unit tests to new launch_type addition 2016-11-19 10:55:48 -05:00
Alan Rominger a192077be4 Merge pull request #4025 from AlanCoding/text_type 
Change JSONField to be a DB text type
 2016-11-18 11:50:13 -05:00
AlanCoding 3d8429fe30 Logging Integration feature documentation 2016-11-18 11:20:50 -05:00
AlanCoding a1f2f64a09 change JSONField to be a DB text type 2016-11-15 13:57:10 -05:00