25624 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ryan Petrello	860183f178	update the named URL code to properly return 404 vs 403	2020-07-22 12:15:34 -04:00
Ryan Petrello	c410f1f344	Merge pull request #4458 from ryanpetrello/fifo-cred-plugin-hang-372 ... [3.7.2] remove the usage of create_temporary_fifo from credential plugins	2020-07-14 17:21:35 -04:00
Ryan Petrello	310a0f88e5	remove the usage of create_temporary_fifo from credential plugins ... this resolves an issue that causes an endless hang on with Cyberark AIM lookups when a certificate *and* key are specified the underlying issue here is that we can't rely on the underyling Python ssl implementation to *only* read from the fifo that stores the pem data *only once*; in reality, we need to just use *actual* tempfiles for stability purposes see: https://github.com/ansible/awx/issues/6986 see: https://github.com/urllib3/urllib3/issues/1880	2020-07-14 16:24:03 -04:00
Ryan Petrello	3ef07ee5f7	Merge pull request #4447 from ryanpetrello/372-master-main-links ... fixed broken UI links	2020-07-13 15:49:11 -04:00
Gabe Muniz	1edae24644	fixed broken UI links	2020-07-13 15:36:07 -04:00
Jake McDermott	2737cded72	Merge pull request #4442 from jakemcdermott/fix-4440 ... [3.7.2] Include instance_id in host edit request	2020-07-10 09:43:50 -04:00
Jake McDermott	4f2ce90137	Include instance_id in host edit request	2020-07-10 09:39:54 -04:00
Ryan Petrello	140d9ae3ee	Merge pull request #4429 from wenottingham/label-maker ... Reintroduce label filtering	2020-07-09 09:00:57 -04:00
Ryan Petrello	7322e13436	add tests for clarified label permissions	2020-07-08 16:53:05 -04:00
Ryan Petrello	bc14e995fd	Merge pull request #4434 from ryanpetrello/jinja-injector-sandbox-validation ... prevent unsafe jinja from being saved in the first place for cred types	2020-07-07 12:47:15 -04:00
Ryan Petrello	61d3a765ee	prevent unsafe jinja from being saved in the first place for cred types ... see: https://github.com/ansible/tower-security/issues/21	2020-07-07 10:59:14 -04:00
Ryan Petrello	f943277ef0	Merge pull request #4433 from ghjm/webhook_error_detail ... Error detail in webhook and credential tests	2020-07-07 10:35:21 -04:00
Graham Mainwaring	5a96af79d4	Reduce error detail in credential lookups	2020-07-06 21:41:28 -04:00
Graham Mainwaring	b7f37d5e26	Reduce error detail in webhook notification	2020-07-06 21:17:21 -04:00
Graham Mainwaring	d14aee70a1	Don't follow redirects in credential plugins	2020-07-06 17:18:30 -04:00
Ryan Petrello	8aa11f4848	Merge pull request #4430 from ryanpetrello/jinja2-injector-sandbox ... use jinja2.sandbox for credential type injectors	2020-07-06 15:21:21 -04:00
Ryan Petrello	2f1b4d81e1	use jinja2.sandbox for credential type injectors	2020-07-06 13:50:33 -04:00
Bill Nottingham	a88f03b372	Reintroduce label filtering ... Labels are visible if you have a role on the org they are in, or on a job template they're attached to.	2020-07-06 13:50:00 -04:00
Christian Adams	f24b15dc2e	Merge pull request #4415 from ansible/i18n_release_3.7.1_translations ... UI translation strings for release_3.7.1 branch for es and nl	2020-06-19 15:25:33 -04:00
ansible-translation-bot	af199dff7a	UI translation strings for release_3.7.1 branch for es and nl	2020-06-19 10:36:21 -04:00
Jim Ladd	99b3997084	Merge pull request #4412 from jladdjr/foreman_backwards_compat_for_ssl_verify_3.7.2 ... add backwards support for ssl_verify in foreman	2020-06-18 18:25:53 -07:00
Jim Ladd	35fe255455	add backwards support for ssl_verify in foreman ... * plugin changed option name from ssl_verify to validate_cert	2020-06-18 17:02:48 -07:00
Alan Rominger	3cf4f4729d	[DO NOT PORT to AWX] Pin dev requirements (#4413)	2020-06-18 09:22:04 -04:00
Ryan Petrello	6376395c68	Merge pull request #4409 from ryanpetrello/371-host-summary-regression ... fix a regression in how job host summaries are generated	2020-06-16 17:04:22 -04:00
Ryan Petrello	eaadbe9730	fix a regression in how job host summaries are generated ... this change fixes a bug introduced in the optimization at https://github.com/ansible/awx/pull/7352 1. Create inventory with multiple hosts 2. Run a playbook with a limit to match only one host 3. Run job, verify that it only acts on the one host 4. Go to inventory host list and see that all the hosts have last_job updated to point to the job that only acted on one host.	2020-06-16 13:18:14 -04:00
Christian Adams	186c54cb14	Merge pull request #4404 from ansible/i18n_release_3.7.1_translations ... UI translation strings for release_3.7.1 branch	2020-06-15 17:10:10 -04:00
ansible-translation-bot	40eb3e43f8	UI translation strings for release_3.7.1 branch	2020-06-12 17:03:37 +00:00
Jim Ladd	e1f7a7619f	Merge pull request #4398 from jladdjr/instance_id_fallback ... Instance id fallback	2020-06-11 12:19:23 -07:00
Jim Ladd	8eee0d40dd	revert EC2_INSTANCE_ID_VAR	2020-06-11 09:52:54 -07:00
Ryan Petrello	fe221c2473	Merge pull request #4399 from shanemcd/kube-queues ... Add queue / instance group registration to heartbeat for k8s installs	2020-06-11 09:00:16 -04:00
Jim Ladd	9514adaf3a	wrap --instance-id-var in quotes	2020-06-10 13:55:54 -07:00
Shane McDonald	85deb8711c	Add queue / instance group registration to heartbeat for k8s installs ... There is some history here. https://github.com/ansible/awx/pull/7190 <- This PR was an attempt at fixing a bug notting ran into where some jobs on k8s installs would get stuck in Waiting forever. The PR mentioned above introduced a bug where there are no instance groups on a fresh k8s-based install. This is because this process currently happens in the launch scripts, before the database is up. With this patch, queue / instance group registration happens in the heartbeat, right after auto-registering the instance.	2020-06-10 16:55:27 -04:00
Jim Ladd	17eaeb28a8	update VMWARE_INSTANCE_ID_VAR ... * Favor instanceUuid * .. but fall back to instanceuuid if necessary	2020-06-10 13:30:05 -07:00
Ryan Petrello	7c1959010a	Merge pull request #4396 from jladdjr/foreman_script_should_not_use_reports_3.7.1 ... disable reports option for foreman (release_3.7.1)	2020-06-10 08:30:14 -04:00
AlanCoding	1dd9772e41	Allow use of fallback instance_ids	2020-06-09 22:51:42 -07:00
Jim Ladd	18d09f892d	disable reports option for foreman	2020-06-09 22:37:35 -07:00
Jake McDermott	ee6f03515e	Merge pull request #4340 from jakemcdermott/fix-4336 ... [3.7.1] Enable management job notications for admins	2020-06-09 16:27:07 -04:00
Jake McDermott	16f81154c0	Merge pull request #4338 from mabashian/4334-backport-v2 ... [3.7.1] Fixes bug where all_parents_must_converge was not being set for new or existing approval nodes	2020-06-09 15:36:40 -04:00
Ryan Petrello	1d7e2a82c6	Merge pull request #4393 from kdelee/backport_dont_block_log_send ... [3.7.1] don't block on log aggregator socket.send() calls	2020-06-09 14:49:43 -04:00
Ryan Petrello	b7ac5f0ffb	Merge pull request #4395 from fosterseth/fix-parents_converge_settable_api_backport ... [backport] Make all_parents_must_converge settable when creating node	2020-06-09 11:29:34 -04:00
Seth Foster	0e5f68ef53	Make all_parents_must_converge settable when creating node ... When targeting, ../workflow_job_templates/id#/workflow_nodes/ endpoint, user could not set all_parents_must_converge to true. 3.7.1 backport for awx issue #7063	2020-06-09 11:07:22 -04:00
Ryan Petrello	a057a2e056	Merge pull request #4394 from ryanpetrello/mattermost-371 ... Send content-type with mattermost notifications, fixes #7264	2020-06-09 10:35:55 -04:00
Florian Apolloner	e9e410f4f8	Send content-type with mattermost notifications, fixes #7264	2020-06-09 10:32:32 -04:00
Ryan Petrello	71cc359ccf	don't block on log aggregator socket.send() calls ... see: https://github.com/ansible/tower/issues/4391	2020-06-09 10:10:32 -04:00
Chris Meyers	37c1c33ecd	Merge pull request #4389 from chrismeyersfsu/fix-run_wsbroadcast_status_3_7_1 ... awx-manage run_wsbroadcast --status doesn't work in openshift	2020-06-08 20:18:32 -04:00
chris meyers	2f7ba75ae4	track stats by hostname not remote host/ip ... * broadcast websockets have stats tracked (i.e. connection status, number of messages total, messages per minute, etc). Previous to this change, stats were tracked by ip address, if it was defined on the instance, XOR hostname. This changeset tracks stats by hostname.	2020-06-08 16:35:17 -04:00
chris meyers	9c20b9412a	delete and re-add host when ip address changes ... * The websocket backplane interconnect is done via ip address for Kubernetes and OpenShift. On init run_wsbroadcast reads all Instances from the DB and makes a decision to use the ip address or the hostname based, with preference given to the ip address if defined. For Kubernetes and OpenShift the nodes can load the Instance before the ip_address is set. This would cause the connection to be tried by hostname rather than ip address. This changeset ensures that an ip address set after an Instance record is created will be detected and used.	2020-06-08 16:34:51 -04:00
Ryan Petrello	99c0a954e4	Merge pull request #4384 from ryanpetrello/rsyslog-chmod ... properly write rsyslog configuration as 0640	2020-06-08 14:05:18 -04:00
Jim Ladd	0a0735344e	Merge pull request #4342 from jladdjr/foreman_group_prefix_should_apply_to_all_groups_3.7.1 ... foreman: use group_prefix for all groups (release_3.7.1)	2020-06-05 15:25:22 -07:00
Jim Ladd	9ae344b772	foreman: use group_prefix for all groups ... * awx's "compatibility layer" for the foreman plugin had the group_prefix hard-coded to 'foreman_'	2020-06-05 14:44:55 -07:00