zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
32,968 Commits 35 Branches 71 Tags
feature_constructed-inventory
Commit Graph

32968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Corey
f49e2fe4a3 Merge pull request #13635 from marshmalien/13607-filter-host-lookup 
Filter out constructed inventory hosts from smart host filter
 2023-03-08 11:54:15 -05:00
Hao Liu
5aafbd675b Merge branch 'devel' into feature_constructed-inventory 2023-03-07 16:58:47 -05:00
Hao Liu
7cca6c4cd9 Merge pull request #13656 from TheRealHaoLiu/feature-branch-build 
Automatically build image for feature branch
 2023-03-07 16:53:55 -05:00
Hao Liu
3945db60eb Automatically build image for feature branch 
- also will now publish awx image for devel
 2023-03-07 16:24:53 -05:00
Hao Liu
252b0dda9f Merge pull request #13633 from TheRealHaoLiu/phony-dockerfile 
[fix] Dockerfile collision between awx-kube-build and docker-compose-build
 2023-03-07 15:42:58 -05:00
Martin Slemr
0a2f1622f6 Analytics: instance_info.json v1.3 (#13408) 2023-03-07 14:24:04 -03:00
Jesse Wattenbarger
00817d6b89 Merge pull request #13604 from jjwatt/jjwatt-make-foreach 
Change docker-clean build rule in Makefile
 2023-03-07 11:54:25 -05:00
Alan Rominger
06808ef4c4 Merge pull request #13608 from AlanCoding/keepalive 
Use ansible-runner change to get periodic keep-alive messages in K8S
 2023-03-06 14:34:37 -05:00
Rick Elrod
8e177a2981 Ordered m2m for Inventory/Inventory relationship (#13602) 
Including changes to our custom Ordered m2m field which previously broke
if the source and target model was the same.

Signed-off-by: Rick Elrod <rick@elrod.me>
Co-authored-by: Alan Rominger <arominge@redhat.com>
 2023-03-03 10:28:56 -06:00
Sarah Akus
80e745290d Merge pull request #13629 from marshmalien/constructed-inv-edit-form 
[constructed-inventory] Add constructed inventory edit form
 2023-03-03 11:27:04 -05:00
Hao Liu
f0c967c1b2 Merge pull request #13645 from TheRealHaoLiu/fix-websocket 
Revert "Remove trailing $ from websocket_urlpatterns to work with cus…
21.13.0 		2023-03-02 21:36:21 -05:00
Hao Liu
2ca0b7bc01 Revert "Remove trailing $ from websocket_urlpatterns to work with custom path to fix #12241" 
This reverts commit 5e28f5dca1.
 2023-03-02 21:14:53 -05:00
Jesse Wattenbarger
217dc57c24 Change docker-clean build rule in Makefile 
- Use a make foreach macro and rmi instead of grep and xargs.
 2023-03-02 14:56:12 -05:00
Alex Corey
1411d11a0e Merge pull request #13506 from AlexSCorey/13422-JTTabOnCreds 
Conditionally applies the job templates tab to credentials that can be on a JT
 2023-03-02 13:15:48 -05:00
Alex Corey
2fe1ea94bd Conditionally applies the job templates tab to credentials that can be on a JT 2023-03-02 12:57:20 -05:00
Hao Liu
a47cfc55ab Merge pull request #13574 from tomsiewert/use-compose-plugin 
Make docker-compose command configurable in Makefile
 2023-03-01 15:41:33 -05:00
Hao Liu
0eb9de02f3 Merge pull request #13627 from infamousjoeg/fix-13597-webservice_id-default 
Fixes #13597 webservice_id default value added
 2023-03-01 15:29:53 -05:00
Lila Yasin
39ee4285ce Working on running spellcheck on everything ahead of merging the shellcheck/code check CI addition. (#13453) 2023-03-01 10:19:00 -03:00
Marliana Lara
393265171a Filter constructed inventory hosts from smart inventory host lookup 2023-02-28 16:03:35 -05:00
Christian Adams
2dcda04a9e Merge pull request #13445 from stanislav-zaprudskiy/disable_instance_command 
Add `disable_instance` management command
 2023-02-28 15:37:38 -05:00
Christian Adams
52d46c88e4 External users should not be able to change their password (#13491) 
* Azure AD users should not be able to change their password

* Multiple auth changes

Moving get_external_user function into awx.sso.common
Altering get_external_user to not look at current config, just user object values
Altering how api/conf.py detects external auth config (and making reusable function in awx.sso.common)
Altering logic in api.serializers in _update_pasword to use awx.sso.common

* Adding unit tests

---------

Co-authored-by: John Westcott IV <john.westcott.iv@redhat.com>
 2023-02-28 15:44:34 -03:00
Hao Liu
c2df22e0f0 Merge pull request #13632 from TheRealHaoLiu/reshaving-the-yak 
[chore] update project_update playbook to be compliant with ansible-lint
 2023-02-28 13:17:45 -05:00
Alan Rominger
90f54b98cd Update keepalive setting help_text to be more direct 
Co-authored-by: Shane McDonald <me@shanemcd.com>
 2023-02-28 09:04:07 -05:00
Michael Abashian
b143df3183 Fix broken UI test 2023-02-28 09:04:07 -05:00
Alan Rominger
6fa22f5be2 Add UI for the new setting 2023-02-28 09:04:07 -05:00
Alan Rominger
d5de1f9d11 Make use of new keepalive messages from ansible-runner 
Make setting API configurable and process keepalive events
  when seen in the event callback

Use env var in pod spec and make it specific to K8S
 2023-02-28 09:04:07 -05:00
Hao Liu
7cca39d069 change make Dockerfile to phony 
awx-kube-build and docker-compose-build share the same Dockerfile

if u run awx-kube-build than docker-compose-build in succession the second command wont run the Dockerfile target and cause the image to be built with the incorrect Dockerfile
 2023-02-27 20:53:07 -05:00
Hao Liu
cf21eab7f4 [chore] update project_update playbook to be compliant with ansible-lint 
reshaving the yak

Co-Authored-By: Gabriel Muniz <gmuniz@redhat.com>
 2023-02-27 18:32:10 -05:00
Marliana Lara
68906849af Add constructed inventory edit form 2023-02-27 15:29:44 -05:00
Joe Garcia
98b2f51c18 fix kwargs[] to kwargs.get() 2023-02-27 11:52:44 -05:00
Joe Garcia
327352feaf Add default value to webservice_id kwarg 2023-02-27 11:26:52 -05:00
Alan Rominger
ccaace8b30 Merge pull request #13541 from npithonDR/devel 
Fix error for byweekday in schedule_rruleset
 2023-02-27 10:24:48 -05:00
Hao Liu
8e5eff2877 Merge branch 'devel' into feature_constructed-inventory 2023-02-27 08:50:30 -05:00
Hao Liu
2902b40084 Merge pull request #13623 from TheRealHaoLiu/revert-project-update-playbook 
Revert project_update.yml
 2023-02-27 08:47:24 -05:00
Hao Liu
9669b9dd2f Revert project_update.yml 
Due to problem found in testing reverting

019e6a52fe
 2023-02-27 08:23:27 -05:00
Shane McDonald
d27aada817 Merge pull request #13619 from shanemcd/non-root-path-dev-env 
Allow serving app from non-root path in dev env
 2023-02-24 09:52:34 -05:00
Shane McDonald
2fca07ee4c Allow serving app from non-root path in dev env 
Usage:

$ EXTRA_SOURCES_ANSIBLE_OPTS='-e ingress_path=/awx' make docker-compose
$ curl http://localhost:8013/awx/api/v2/ping/
 2023-02-24 09:29:17 -05:00
npithonDR
335ac636b5 Merge pull request #1 from AlanCoding/npithon 
Follow comments, split non-list objects
 2023-02-24 08:42:00 +01:00
Marliana Lara
93043bb2b5 Merge pull request #13599 from marshmalien/constructed-inv-add-form 
Add constructed inventory add form
 2023-02-23 19:15:03 -05:00
Marliana Lara
554622e770 Add constructed inventory add form 2023-02-23 15:15:57 -05:00
Marliana Lara
1101788518 Hide constructed and smart inventories in Inventory Lookup 2023-02-23 15:08:15 -05:00
Marliana Lara
6c3986e658 Merge pull request #13589 from ansible/constructedInventoryGroups 
Adds Contructed Inventory Groups and related groups
 2023-02-23 15:07:54 -05:00
Alex Corey
e985b98d61 Adds constructed inventory groups and related groups. 2023-02-23 14:03:58 -05:00
Shane McDonald
f4bcc03ac7 Merge pull request #12242 from adpavlov/12241-websocket-custom-path 
Fix websockets when application is served from a non-root path
 2023-02-23 12:25:22 -05:00
Alan Rominger
3051384f95 Follow suggestion from comment, split if NOT list 2023-02-23 12:05:32 -05:00
Alan Rominger
811ecb8673 Follow suggestion from comment, split if NOT list 2023-02-23 12:05:21 -05:00
Alexander Pavlov
5e28f5dca1 Remove trailing $ from websocket_urlpatterns to work with custom path to fix #12241 
Signed-off-by: Alexander Pavlov <alexander.pavlov@amdocs.com>
 2023-02-23 12:02:47 -05:00
Hao Liu
d088d36448 Merge pull request #13618 from TheRealHaoLiu/head-to-tail 
[fix] switch from head to tail in project update playbook when clearing project dir
 2023-02-23 11:13:03 -05:00
Hao Liu
89e41597a6 switch from head to tail 
from @relrod

`head` will close the input fd when it no longer needs it (or exits). find will try to write to the closed fd and somewhere along the way, it will receive SIGPIPE as a result. This is why `yes | head -5 ` doesn't run forever.
 2023-02-23 10:46:48 -05:00
Hao Liu
8f40c53bf2 Merge branch 'devel' into feature_constructed-inventory 2023-02-22 21:40:36 -05:00