1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

13518 Commits

Author SHA1 Message Date
Aaron Tan
19e3071fec Merge pull request #6997 from jangsutsr/625_enable_source_region_for_azure_inv_src
Enable source_region for azure_rm inventory source
2017-07-11 17:02:41 -04:00
Wayne Witzel III
40fcd4240f Merge pull request #6995 from wwitzel3/devel
Swap delay/save calls for schedule_deletion
2017-07-11 17:01:59 -04:00
Aaron Tan
bfec1aceb3 Enable source_region for azure_rm inventory source 2017-07-11 16:41:42 -04:00
Wayne Witzel III
0ab5124b80 call the delayed delete after the save call for Inventory 2017-07-11 16:29:10 -04:00
Chris Meyers
40aac68402 Merge pull request #6985 from chrismeyersfsu/fix-6788
rework hosts without insights creds error message
2017-07-11 15:50:57 -04:00
Chris Meyers
6a56661f4f Merge pull request #6984 from chrismeyersfsu/fix-6314
structure scan modules as dicts not arrays
2017-07-11 15:46:33 -04:00
Chris Meyers
c34a89714c rework hosts without insights creds error message 2017-07-11 14:25:12 -04:00
Ryan Petrello
5a1687c390 Merge pull request #6982 from ryanpetrello/fix-6978
filter Insights credentials from /api/v1/credentials/
2017-07-11 14:17:39 -04:00
Chris Meyers
e1a24d9849 structure scan modules as dicts not arrays 2017-07-11 14:14:48 -04:00
Michael Abashian
e5f8edacbe Merge pull request #6862 from mabashian/6427-project-inv-source
Only auto-populate inventory source project when the user selects scm type
2017-07-11 14:13:46 -04:00
Ryan Petrello
28f44c3ab0 filter Insights credentials from /api/v1/credentials/
see: #6978
see: #6088
2017-07-11 13:55:43 -04:00
Ryan Petrello
bc869284f7 Merge pull request #6968 from ryanpetrello/fix-6959
fix a few issues in credential type kind validation
2017-07-11 13:30:07 -04:00
Alan Rominger
6d251babb5 Merge pull request #6947 from AlanCoding/circular
Move circular group association validation to view
2017-07-11 12:45:29 -04:00
Michael Abashian
3623738b05 Filter out projects that have never been updated when user is creating/changing to scm inventory source 2017-07-11 11:54:34 -04:00
Ryan Petrello
90769fa501 Merge pull request #6972 from ryanpetrello/adjust-celery-autoscale
adjust the default celery_autoscale value to be a bit more conservative
2017-07-11 11:46:56 -04:00
Michael Abashian
56e3acd0d0 Merge pull request #6935 from mabashian/6563-org-admin-workflow
Organization should be required when !superuser are creating a workflow
2017-07-11 11:31:37 -04:00
Michael Abashian
81c5db0a1b Merge pull request #6956 from mabashian/5270-notification-permission-add-buttons
Changed notification ADD button to text with a link to the notification add form
2017-07-11 11:27:47 -04:00
Michael Abashian
ca72c3024f Removed project status check 2017-07-11 11:21:29 -04:00
Michael Abashian
9213eec681 Only auto-populate inventory source project when the user selects scm type from the dropdown 2017-07-11 11:21:29 -04:00
Ryan Petrello
09055f9c2f fix a few issues in credential type kind validation
- fix a typo from `network` to `net`
- properly update OPTIONS for CredentialTypes to reflect allowed `kind`
  values for POST/PUT/

see: #6959
2017-07-11 09:43:55 -04:00
Alan Rominger
586961907c Merge pull request #6969 from AlanCoding/censor_overwriting
Prevent overwriting of playbook data when censoring
2017-07-11 09:40:35 -04:00
Ryan Petrello
1d5023189e Merge pull request #6964 from ryanpetrello/fix-3508
add additional field validation to AWX_TASK_ENV
2017-07-11 09:26:56 -04:00
AlanCoding
b393a60ece prevent overwriting of playbook data when censoring 2017-07-11 08:45:55 -04:00
Alan Rominger
b8b2d8695e Merge pull request #6912 from AlanCoding/schedule_scm_inv
Allow scheduling of SCM inventory sources (with exception)
2017-07-10 21:55:16 -04:00
Alan Rominger
0c061e1a78 Merge pull request #6950 from AlanCoding/startup_sch_mod_act_st
Avoid unwanted activity stream entries on startup
2017-07-10 21:08:15 -04:00
Alan Rominger
047624a857 Merge pull request #6944 from AlanCoding/splunk_host
handle Splunk hostname case from support
2017-07-10 21:07:12 -04:00
Alan Rominger
30d7ed8c9b Merge pull request #6955 from AlanCoding/dashboard_now
Fix naive datetime in jobs dashboard graph
2017-07-10 21:02:39 -04:00
Ryan Petrello
6996b16d5a add additional field validation to AWX_TASK_ENV
AWX_TASK_ENV should only allow simple key-value assignment (since we're
using it to set environment variables).

see: #3508
2017-07-10 17:29:38 -04:00
Ryan Petrello
b79627d57c Merge pull request #6962 from ryanpetrello/fix-6959
prevent creation of custom credential types that != 'cloud || network`
2017-07-10 16:45:08 -04:00
Ryan Petrello
31829038bd prevent creation of custom credential types that != 'cloud || network`
see: #6959
2017-07-10 16:34:25 -04:00
Ryan Petrello
335ab11914 Merge pull request #6958 from ryanpetrello/fix-6534
periodically run orphaned task cleanup as part of the scheduler
2017-07-10 16:13:03 -04:00
Ryan Petrello
0e29f3617d periodically run orphaned task cleanup as part of the scheduler
Running orphaned task cleanup within its own scheduled task via
celery-beat causes a race-y lock contention between the cleanup task and
the task scheduler.  Unfortunately, the scheduler and the cleanup task
both run at similar intervals, so this race condition is fairly easy to
hit.  At best, it results in situations where the scheduler is
regularly delayed 20s; depending on timing, this can cause situations
where task execution is needlessly delayed a minute+.  At worst, it can
result in situations where the scheduler is never able to schedule
tasks.

This change implements the cleanup as a periodic block of code in the
scheduler itself that tracks its "last run" time in memcached (by
default, it performs a cleanup every 60 seconds)

see: #6534
2017-07-10 15:51:46 -04:00
Jared Tabor
5d0a51e2ef Merge pull request #6896 from jaredevantabor/vmware-source
exposing instance_filters and group_by for vmware
2017-07-10 12:30:35 -07:00
Greg Considine
1e26e790eb Merge pull request #6953 from gconsidine/ui/fix/component-browser-inconsistencies
Fix inconsistencies on inputs in Chrome vs. others
2017-07-10 14:48:11 -04:00
Jared Tabor
9bbd1be560 updating vmware popover content
for instance_filters and group_by
2017-07-10 11:18:28 -07:00
AlanCoding
e599b0fdec fix naive datetime in jobs dashboard graph 2017-07-10 13:28:54 -04:00
Michael Abashian
1813109a76 Changed notification ADD button to text with a link to the notification add form 2017-07-10 12:39:08 -04:00
Jared Tabor
f8e5e800f8 exposing instance_filters and group_by for vmware 2017-07-10 09:29:38 -07:00
Marliana Lara
35e28e9347 Merge pull request #6903 from marshmalien/copyProjectRevisionIcon
Add copy icon and update Tooltip content to project revision sha
2017-07-10 11:46:14 -04:00
gconsidine
36120b3115 Fix inconsistencies on inputs in Chrome vs. others 2017-07-10 11:27:31 -04:00
AlanCoding
11a8b53e8f Avoid unwanted activity stream entries on startup
Schedule computed fields generates a modification entry
on system startup - this change avoids that noise
2017-07-10 11:22:27 -04:00
Alan Rominger
1a46f7b451 Merge pull request #6952 from AlanCoding/314_merge_tests
Unit test fixes from 3.1.4 merge
2017-07-10 11:21:13 -04:00
AlanCoding
613b9205b8 unit test fixes from 3.1.4 merge 2017-07-10 11:09:56 -04:00
Marliana Lara
7276a3d56a Add changes related to PR review 2017-07-10 10:56:51 -04:00
gconsidine
00fb56fd91 Fix popover text reset on refresh 2017-07-10 10:56:34 -04:00
gconsidine
abb8cd1405 Fix flickering on mouseenter 2017-07-10 10:56:28 -04:00
gconsidine
a868dfb2f2 Add refresh ability to popover on text change 2017-07-10 10:56:24 -04:00
gconsidine
452950ab61 Add alternative trigger event and position support to popover 2017-07-10 10:56:20 -04:00
Marliana Lara
d8384522c2 Remove Revisions directory 2017-07-10 10:56:12 -04:00
Marliana Lara
3d5f7057c3 Add revision component to job details 2017-07-10 10:56:03 -04:00