External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-14 16:00:11 -02:30
Code Issues Packages Projects Releases Wiki Activity
23,918 Commits 64 Branches 102 Tags
773b976f8a6c85a0e750f3cc10f8d2d3555bda8e
Commit Graph
23918 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rebeccah 93bd1e6705 Added in validation for each of the 3 fields that should not be changed if the instance is a container group, defaults in the textarea persist with these 3 options 2019-10-23 17:15:56 -04:00
Seth Foster 58e84a40e5 Fix 500 error when creating a job schedule 
- 500 error occurs when a non-admin user attempts to add an invalid
  credential during schedule creation
- This change checks that the user can add the object to
  serializer.validated_data, instead of serializer.initial_data
- The invalid credential field is purged in .validated_data, so the
  request passes through cleanly
- Fix for awx issue #4147
 2019-10-23 14:22:07 -04:00
Jim Ladd b13009b9a3 Update unit tests 2019-10-23 10:57:18 -07:00
Jim Ladd fc941eda98 Return full webhook dict when serializing notif. 2019-10-23 10:57:18 -07:00
Jim Ladd 32deca2e92 Use correct notif. bodies when sending test notifs 
* Notification backends now handle body of notifications differently
* .. depending on their type (webhook, email, and pagerduty) are
  currently the only three notification types that use body
* email and pagerduty expect a string
* webhooks expects a dict in string format
 2019-10-23 10:57:18 -07:00
Jim Ladd ff1a618a93 Don't use i18n for NT body string 2019-10-23 10:57:18 -07:00
Keith Grant 0af79b729e fix lint errors 2019-10-23 10:57:18 -07:00
Keith Grant 76711febd1 Add notification custom message fields for workflow pause/approval 2019-10-23 10:57:18 -07:00
Jim Ladd 81e545b720 NotificationSerializer should gracefully handle webhook/pagerduty bodies 2019-10-23 10:57:18 -07:00
Jim Ladd d985b1215a In awxkit, add support for wf approval notification templates 2019-10-23 10:57:18 -07:00
Jim Ladd 157bec1777 Render WF approval notifications w/ custom templates 2019-10-23 10:57:18 -07:00
Jim Ladd 1754076a56 Refactor notification backends to use CustomNotificationBase 2019-10-23 10:57:18 -07:00
Jim Ladd d3132820a5 Render default notifications using Jinja templates 2019-10-23 10:57:18 -07:00
Jim Ladd 9f4d65891c Remove unused build_notification_message method 2019-10-23 10:57:18 -07:00
Alan Rominger 653ec0ffab RBAC relaunch 403 updates (#3835) 
* RBAC relaunch 403 updates

Addresses 2 things

1. If WFJ relaunch is attempted, and relaunch is denied
  because the WFJ had encrypted survey answers,
  a generic message was shown, this changes it to show
  a specific error message

2. Org admins are banned from relaunching a job
  if the job has encrypted survey answers

* update tests to raises access pattern

* catch PermissionDenied for user_capabilities
 2019-10-23 10:59:35 -04:00
Alan Rominger 28228a3b57 Disable activity stream and speed up host group bulk deletion (#3817) 2019-10-23 08:25:00 -04:00
Ryan Petrello e2470200da Merge pull request #3881 from ansible/k8s-cleanup 
improve cleanup of anonymous kubeconfig files
 2019-10-22 18:12:52 -04:00
Seth Foster 9c04e08b4d Fix secret lookup links when credentials are copied 
- When a credential that contains secret lookups (e.g. HashiCorp Vault
  Secret Lookup) is copied, the lookup fields are not properly copied
- This change adds the necessary fields to FIELDS_TO_PRESERVE_AT_COPY
  for both Credential and CredentialInputSource classes to ensure a
  proper copy
 2019-10-22 17:49:10 -04:00
Ryan Petrello cfd7946097 improve cleanup of anonymous kubeconfig files 2019-10-22 17:47:09 -04:00
softwarefactory-project-zuul[bot] bda1abab8d Merge pull request #5074 from shanemcd/devel 
Downstream k8s installer changes

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-10-22 20:34:20 +00:00
Shane McDonald 8356327c2b Downstream k8s installer changes 2019-10-22 15:57:40 -04:00
Alan Rominger fb67b8edf9 Add support for credential_type in tower_credential module (#3820) 
* Add support for credential_type

* Finish up credential_type parameter with tests

* make inputs mutually exclusive with other params

* Test credential type with dict input
 2019-10-22 14:39:27 -04:00
Ryan Petrello 7af2bcc9b0 Merge pull request #3878 from ansible/fix-5062 
fix a bug that breaks webhook launches when a survey is in use
 2019-10-22 13:35:30 -04:00
Ryan Petrello 8e83c86d88 Merge pull request #3879 from ansible/whoopsie 
fix a bug introduced upstream with settings.LOG_AGGREGATOR_AUDIT
 2019-10-22 13:34:37 -04:00
Alex Corey 53cf6cf17c Instance Groups Instances List styling fixes (#3846) 
* Instance Groups Instances slider renders properly, and that list wraps properly.

* Instance Groups responds properly

* assorted container groups ui fixes
updated responsiveness of instance groups and instances list
fix layout of container group form
update help text for container group form elements
update text for tech preview top bar

* update container group doclink

* list styling updates based on feedback
 2019-10-22 13:31:53 -04:00
Ryan Petrello 8701f83922 fix a bug introduced upstream with settings.LOG_AGGREGATOR_AUDIT 2019-10-22 12:17:20 -04:00
softwarefactory-project-zuul[bot] cafac2338d Merge pull request #5063 from HunterNyan/devel 
Fixed bug with python check

Reviewed-by: Shane McDonald <me@shanemcd.com>
             https://github.com/shanemcd
 2019-10-22 13:37:37 +00:00
Ryan Petrello 7344ee23ef fix a bug that breaks webhook launches when a survey is in use 
see: https://github.com/ansible/awx/issues/5062
 2019-10-22 09:08:14 -04:00
Alice Hunter e5dfc62dce Fixed bug with python check 2019-10-22 23:06:06 +11:00
Ryan Petrello a0bf3459eb Merge pull request #3877 from ansible/backport-external-log-fix 
backport a fix to external logging aggregation
 2019-10-22 07:43:35 -04:00
Martin Juhl facec0fe76 Update handlers.py 
The setFormatter tries to create the external.log file.. So we should check if LOG_AGGREGATOR_AUDIT is active here as well
 2019-10-22 07:25:01 -04:00
softwarefactory-project-zuul[bot] 11edd43af3 Merge pull request #5058 from MrMEEE/patch-1 
Only create /var/log/tower/external.log when LOG_AGGREGATOR_AUDIT is enabled

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-10-22 11:16:15 +00:00
Ryan Petrello 6fb09d73b1 Merge pull request #3801 from ansible/fix-jinja-host-name 
[3.6.0] fix jinja host name
 2019-10-22 06:54:01 -04:00
Martin Juhl 27d0111a27 Update handlers.py 2019-10-22 01:25:27 +02:00
Martin Juhl 58367811a0 Update handlers.py 
The setFormatter tries to create the external.log file.. So we should check if LOG_AGGREGATOR_AUDIT is active here as well
 2019-10-22 01:02:31 +02:00
Ryan Petrello a3519ce1df Merge pull request #3866 from ansible/reap-k8s-jobs 
reap k8s-based jobs when the dispatcher restarts
 2019-10-21 17:50:59 -04:00
Ryan Petrello 812d00f490 reap k8s-based jobs when the dispatcher restarts 2019-10-21 16:32:59 -04:00
Marliana Lara 5ac2211ef4 Merge pull request #3875 from marshmalien/5048-missing-job-details 
Handle undefined schedule value in job detail component
 2019-10-21 16:23:19 -04:00
Marliana Lara 9c9bf0ed84 Handle undefined schedule value in job detail component 2019-10-21 16:13:52 -04:00
Graham Mainwaring c013d656c8 Add UI toggle to disable public Galaxy (#3867) 2019-10-21 16:10:25 -04:00
softwarefactory-project-zuul[bot] 3277d3afe0 Merge pull request #5050 from ryanpetrello/release-8.0.0 
Bump VERSION to 8.0.0

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
8.0.0 		2019-10-21 17:26:33 +00:00
Ryan Petrello 45136b6503 Bump VERSION to 8.0.0 2019-10-21 12:29:24 -04:00
Ryan Petrello e9af6af97c Merge pull request #5047 from ryanpetrello/devel 
merge a variety of downstream bug fixes
 2019-10-21 12:27:54 -04:00
Ryan Petrello f86d647571 Merge branch 'hardening' into devel 2019-10-21 12:09:27 -04:00
Ryan Petrello f02357ca16 Merge pull request #3871 from mabashian/3865-add-buttons 
Revert 6282b5bacb
 2019-10-21 12:08:52 -04:00
mabashian e64b087e9f Revert 6282b5bacb 2019-10-21 11:55:12 -04:00
Ryan Petrello 5bb7e69a4d Merge pull request #3864 from ansible/container-launch-error 
when isolated or container jobs fail to launch, set job status to error
 2019-10-21 11:18:04 -04:00
Ryan Petrello a8aed53c10 when isolated or container jobs fail to launch, set job status to error 
a status of error makes more sense, because failed generally points to
an issue with the playbook itself, while error is more generally used
for reporting issues internal to Tower

see: https://github.com/ansible/awx/issues/4909
 2019-10-21 11:02:31 -04:00
Jake McDermott b19539069c Merge pull request #3863 from jakemcdermott/fix-3578-part-3 
Set omitted runner_on_start event line lengths to 0
 2019-10-21 10:37:09 -04:00
Evan Stork 0c0e172caf Added custom_venv_dir to local docker install, 
Signed-off-by: Evan Stork <estork@live.com>
 2019-10-19 20:45:02 -04:00