External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 17:00:12 -02:30
Code Issues Packages Projects Releases Wiki Activity
14,997 Commits 63 Branches 102 Tags
50b4002280175b55388e81db116a85aadbf14b7a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Church 7a052e6f0c Merge pull request #238 from APenketh/devel 
Added In Ansible Version Requirement Into Installation Doc
 2017-09-21 20:38:02 -04:00
Chris Church 22a4279615 Fix license expires on to use license_date instead of number of days remaining. 2017-05-02 15:35:49 -04:00
Chris Church 9f1f770ebe Add custom paginator to use PostgreSQL window function instead of needing a separate COUNT(*) query. 2017-04-20 16:45:14 -04:00
Chris Church 15092c2159 Skip sending task to process cache changes when migrating to database settings. 2017-02-07 16:40:03 -05:00
Chris Church 41553c879c Make AWX_PROOT_HIDE_PATHS, AWX_PROOT_SHOW_PATHS and AWX_ANSIBLE_CALLBACK_PLUGINS not required. 2017-01-20 16:02:33 -05:00
Chris Church b6e2e3da70 Add new ansi_download format to download stdout and preserve ANSI escape sequences. 2016-12-15 16:03:00 -05:00
Chris Church 46922e956f Merge pull request #4446 from cchurch/settings-no-conflict 
Make settings read-only if modified in Python config files.
 2016-12-15 15:01:42 -05:00
Chris Church f735c86d2b Merge pull request #4425 from cchurch/related-search-fields 
Related search fields
 2016-12-15 15:01:24 -05:00
Chris Church 092c2be0e7 Make any settings read-only that have been modified in custom Python config files. 2016-12-14 16:57:32 -05:00
Chris Church 9c444e084e Handle psutil errors when terminating tasks. 2016-12-14 16:37:44 -05:00
Chris Church e8f01c9029 Stringify the MAX_EVENT_RES_DATA setting when sticking it into an environment variable. 2016-12-14 16:13:06 -05:00
Chris Church a38ab75086 Merge pull request #4404 from cchurch/split-job-event-data 
Split job event data between callback queue and stdout.
 2016-12-14 15:23:13 -05:00
Chris Church 2b94e348e2 Merge pull request #4440 from matburt/split-job-event-data 
Purge event res dict if it is over a certain size
 2016-12-14 15:21:41 -05:00
Chris Church 2988ac1904 Only use known stats keys for determining hostnames to use for job host summaries. 2016-12-14 15:12:27 -05:00
Chris Church 0a6d2f179e Extend stdout background to width of text. 2016-12-14 13:50:51 -05:00
Chris Church b9aab38185 Handle TypeError when lookup is not valid for a given field. 2016-12-14 13:20:19 -05:00
Chris Church b947367606 Add default for ldap group type. 2016-12-14 11:54:50 -05:00
Chris Church ea10ff8b93 Initial pass at related search fields. 2016-12-13 21:44:09 -05:00
Chris Church b85c98afd2 Split job event data between callback queue and stdout. Send most of event data directly over queue and capture only stdout/counter/start_line/end_line in celery task; recombine into single event in callback receiver. 2016-12-12 16:34:36 -05:00
Chris Church 08286d6d06 Add valid 1px GIF as placeholder. 2016-12-12 14:57:13 -05:00
Chris Church c52366e580 Merge pull request #4312 from cchurch/saml-error-handling 
SAML error handling fixes
 2016-12-12 12:29:17 -05:00
Chris Church ae16cadcc2 Ignore exception in sitecustomize. 2016-12-07 23:50:58 -05:00
Chris Church 27a3bae5dc Merge pull request #4319 from cchurch/remove-cached-validated-license-data 
Remove caching of validated license data.
 2016-12-07 13:47:58 -05:00
Chris Church 9a68f48e4d Merge pull request #4320 from cchurch/api-config-check-permissions 
Add check_permissions method to ApiV1ConfigView.
 2016-12-07 13:47:39 -05:00
Chris Church f2e2ca30ab Skip settings field validation for encrypted fields if submitted value is the $encrypted$ placeholder. 2016-12-06 19:36:31 -05:00
Chris Church 9feef6e76a Add default AzureAD settings. 2016-12-06 19:03:05 -05:00
Chris Church 2727bbcf52 Add check_permissions method to ApiV1ConfigView. 2016-12-06 18:54:49 -05:00
Chris Church f55c47e927 Remove caching of validated license data. 2016-12-06 17:57:23 -05:00
Chris Church 1e157c2255 Display error instead of raising 500 for invalid SAML config to generate metadata. 2016-12-06 12:57:01 -05:00
Chris Church 417d7c29ee Allow SAML entity ID to be any string, not required to be a URL. 2016-12-06 12:56:25 -05:00
Chris Church 4295ab3e4a Show SAML errors that aren't tied to a specific IdP. 2016-12-06 12:55:51 -05:00
Chris Church 96e923361e Merge pull request #4251 from cchurch/workflows-license-feature 
Add workflows as a licensed feature
 2016-12-02 22:03:02 -05:00
Chris Church a231ef0608 Only enforce workflows once. 2016-12-02 17:00:08 -05:00
Chris Church 36dc0d7059 Add workflows as a licensed feature, add mixin for workflow and activity stream license enforcement on views, update mixins to consistently come before base classes. 2016-12-02 16:54:24 -05:00
Chris Church 15bffdf861 Merge pull request #4168 from cchurch/encrypt-that-ctit 
Add support for encrypting settings that are passwords.
 2016-12-02 16:50:23 -05:00
Chris Church 0cf5b025ec Merge pull request #4213 from cchurch/optimize-job-events 
Optimize query for job events to speed up loading job details page.
 2016-12-02 16:27:25 -05:00
Chris Church 2e7e424109 Add missing host_qs. 2016-12-02 16:14:16 -05:00
Chris Church 4f058506f7 Merge pull request #4142 from cchurch/fix-azuread-auth 
AzureAD auth updates.
 2016-12-02 11:36:11 -05:00
Chris Church 1ce81f9640 Optimize query for job events for a single job to speed up loading job details page. 2016-12-01 18:33:05 -05:00
Chris Church 8911766eea Don't truncate job event stdout for playbook_on_ events. 2016-12-01 18:08:26 -05:00
Chris Church a5c0d5a0f9 Merge pull request #4201 from cchurch/callback-shenanigans 
Fix callback plugin issues
 2016-12-01 15:18:21 -05:00
Chris Church d6d5d4263a Only run ssh control persist cleanup from main process, flush after writing end marker for job event data. 2016-12-01 14:47:24 -05:00
Chris Church 6a5abd53e9 Merge pull request #4186 from cchurch/cleanup-jobs-output 
Display count of skipped/deleted for cleanup jobs
 2016-12-01 14:38:52 -05:00
Chris Church 4d372b1f90 Mock Project.playbooks for functional tests. 2016-12-01 03:18:23 -05:00
Chris Church 558d80bec2 Fix playbook validation when saving job template using a manual project. 2016-12-01 02:16:20 -05:00
Chris Church 9a0df88769 Add output of skipped/deleted to cleanup_jobs, so there is always some kind of output. 2016-12-01 00:15:00 -05:00
Chris Church efadd1a954 Return list of playbook files from the filesystem for manual projects. 2016-11-30 23:20:08 -05:00
Chris Church 6a02ca1de0 Add support for encrypting settings that are passwords. 2016-11-30 11:22:39 -05:00
Chris Church 2efe178fd4 Flake8 can suck it. 2016-11-29 21:30:40 -05:00
Chris Church 0bde7bf920 Merge pull request #4141 from cchurch/multiple-ldap-servers 
Allow specifying multiple LDAP servers.
 2016-11-29 17:07:55 -05:00
Chris Church 9c2ae43ac6 Clear cache between tests to prevent cached settings sticking around. 2016-11-29 11:50:24 -05:00
Chris Church 48391dfa5e Don't prompt for basic auth if AUTH_BASIC_ENABLED is False. 2016-11-28 23:09:14 -05:00
Chris Church 2e8faeaf0d AzureAD auth updates. Add auth backend to settings, add microsoft icon to fontcustom, add azuread support to login modal. 2016-11-28 22:12:50 -05:00
Chris Church 934da3c425 Allow specifying multiple LDAP servers. 2016-11-28 16:54:16 -05:00
Chris Church cbc52c7b69 Update elapsed in real time when job is running. 2016-11-28 14:35:37 -05:00
Chris Church 01f59b4696 Update defaults for SAML info/contact settings. 2016-11-28 13:16:29 -05:00
Chris Church 7889e07229 Use the right base class for super(). 2016-11-28 13:10:45 -05:00
Chris Church f15144807f Merge pull request #4093 from cchurch/tower-url-base-reset 
Reset TOWER_URL_BASE to the hostname used for the request
 2016-11-22 14:51:09 -05:00
Chris Church 8ba2c57b1e Merge pull request #4092 from cchurch/custom-logo-custom-login-info 
Add support for CUSTOM_LOGO and CUSTOM_LOGIN_INFO settings
 2016-11-22 14:50:59 -05:00
Chris Church eabc497f46 Merge pull request #4084 from cchurch/hide-settings-based-on-licensed-features 
Hide settings based on whether features are enabled in the license
 2016-11-22 14:50:47 -05:00
Chris Church 0b76546ea6 Merge pull request #4080 from cchurch/event-stdout-max-bytes-display 
Add configurable limit to size of stdout shown for a single job event
 2016-11-22 14:50:38 -05:00
Chris Church f007046e2b Reset TOWER_URL_BASE to the hostname used for the request when setting is deleted. 2016-11-21 16:35:53 -05:00
Chris Church a35ed0a09d Add support for CUSTOM_LOGO and CUSTOM_LOGIN_INFO settings, add support to migrate from local_settings.json and custom_console_logo.png. 2016-11-21 15:33:07 -05:00
Chris Church 5b1df83fcc Add support for hiding settings based on whether features are enabled in the license. 2016-11-21 14:15:41 -05:00
Chris Church 06510ce4b9 Merge pull request #4073 from cchurch/hide-user-settings 
Hide user settings category if no user settings are registered.
 2016-11-21 14:09:53 -05:00
Chris Church 9538ad2983 Merge pull request #4072 from cchurch/what-even-are-tuples 
No tuples for API config, mention JavaScript regular expression support.
 2016-11-21 11:35:12 -05:00
Chris Church b9eb619697 Add configurable limit to size of stdout shown for a single job event in list view. 2016-11-21 11:30:11 -05:00
Chris Church ac298ba2e2 Apply #4009 to #3910. 2016-11-20 11:02:22 -05:00
Chris Church 798c8b631d Hide user settings category if no user settings are registered. 2016-11-19 21:26:35 -05:00
Chris Church b5e5ed1fd4 No tuples for API config, mention JavaScript regular expression support. 2016-11-19 21:06:54 -05:00
Chris Church dcbf91fc4a Merge pull request #4051 from cchurch/no-more-gibberish 
Add multiprocessing RLock around job event data output
 2016-11-17 15:37:58 -05:00
Chris Church 1db697e4eb Add multiprocessing RLock around event data output to ensure only one process is writing to stdout at a time. 2016-11-17 09:09:19 -05:00
Chris Church 77a0e1445a Merge pull request #4009 from cchurch/fix-callback-url-fields 
Fix callback URL fields to update when TOWER_URL_BASE changes
 2016-11-15 18:28:44 -05:00
Chris Church fa29ce6382 Update AWX_ANSIBLE_CALLBACK_PLUGINS help text. 2016-11-15 12:36:29 -05:00
Chris Church dac208f384 Merge pull request #4010 from cchurch/job-timeout-defaults 
Add default values for job timeouts.
 2016-11-15 10:59:44 -05:00
Chris Church 21753ce49c Merge pull request #4008 from cchurch/conf-jsonfield-fixes 
Fix configure Tower in Tower to work with updated django-jsonfield.
 2016-11-15 10:57:42 -05:00
Chris Church 3eb6f55a80 Default JSONField to empty dict if field does not allow None. 2016-11-15 10:21:34 -05:00
Chris Church 443f100b5f Add default values for job timeouts. 2016-11-15 01:12:06 -05:00
Chris Church 89c629e796 Never return database values for read-only fields. 2016-11-15 00:59:10 -05:00
Chris Church e22b0f75b8 Fix social auth callback URLs to depend on TOWER_URL_BASE so they are updated when it changes. 2016-11-15 00:58:33 -05:00
Chris Church 8dc5e7725c Fix configure Tower in Tower to work with updated django-jsonfield. 2016-11-15 00:22:55 -05:00
Chris Church 90769eedbc Add AzureAD OAuth2 support. Implements #3902. 2016-11-08 10:22:44 -05:00
Chris Church 5760654671 Fix warning from v2_playbook_on_task_start with ad hoc commands. 2016-11-07 21:42:39 -05:00
Chris Church 2afb0695bf Merge pull request #3756 from cchurch/job-event-stdout 
Capture stdout associated with job and ad hoc command events.
 2016-10-29 10:25:22 -04:00
Chris Church 31faca2b4f Add option to use callback queue for job events. 2016-10-28 22:32:49 -04:00
Chris Church c43334f8f4 Update job events based on how they are used in Ansible 2.x. 2016-10-28 21:58:24 -04:00
Chris Church 908eef13f6 Renamed job event migration. 2016-10-28 21:58:24 -04:00
Chris Church 440f0539b0 Flake8 fixes. 2016-10-28 21:58:24 -04:00
Chris Church c18b6c1352 Add support for capturing stdout associated with job events and ad hoc command events. 
* New event types for stdout lines not associated with a callback event.
* New stdout, start_line, end_line and verbosity fields for job/ahc events.
* Callback plugins to wrap Ansible default/minimal stdout callbacks and embed callback event data using ANSI escape sequences.
* Callback plugin library to wrap ansible.display.Display class methods.
* Output filter to extract event data from stdout and create job/ahc events.
* Update stdout formats to strip new ANSI escape sequences.
 2016-10-28 21:58:24 -04:00
Chris Church 5e8a7eeb8a Return empty dict if no license present (or invalid key). 2016-10-18 00:22:15 -04:00
Chris Church e02d945e1d Merge pull request #3703 from cchurch/allow-file-scm-urls 
Enable support for file scheme in SCM URLs.
 2016-10-17 23:51:10 -04:00
Chris Church f988e3791c Merge pull request #3648 from cchurch/no-filter-on-password-fields 
Prevent filtering on password fields.
 2016-10-14 14:19:43 -04:00
Chris Church 58b434e08a Enable support for file scheme in SCM URLs. 2016-10-12 15:29:20 -04:00
Chris Church bedb363613 Merge pull request #3665 from cchurch/prevent-removing-license-via-system-settings 
Prevent removing license via settings
 2016-10-12 14:54:49 -04:00
Chris Church 8883738a7c Fix issue when string list settings field is null. Resolves #3683. 2016-10-12 14:47:22 -04:00
Chris Church 2488e1e3f0 Show actual settings module in use. 2016-10-12 13:40:05 -04:00
Chris Church 0992e354e3 Prevent removing license via PUT/PATCH/DELETE to /api/v1/settings/system/. 2016-10-07 14:13:51 -04:00
Chris Church 9fc30643ca Prevent filtering on password fields. 2016-10-03 16:18:41 -04:00
Chris Church 70e489d62f Save settings.LICENSE as dict instead of str. 2016-09-30 15:30:34 -04:00
Chris Church 17f70fbc21 Merge pull request #3606 from cchurch/fix-ldap-saml-defaults 
Fix default value validation for LDAP/SAML settings to prevent warnings.
 2016-09-28 11:11:46 -04:00