External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 00:10:09 -02:30
Code Issues Packages Projects Releases Wiki Activity
34,341 Commits 64 Branches 102 Tags
7d30dff0756f684b7234f48b8744b97bf0fdd08d
Commit Graph
34341 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rick Elrod 513f433f17 Add comment for new psycopg dep 
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
Rick Elrod 5f41003fb1 Prevent looping issue when task/web share a Redis 
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
Rick Elrod 2e0f25150c Start of heartbeet daemon 
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
Rick Elrod 4f5bc992a0 fix merge from devel - wsbroadcast -> wsrelay 
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
Rick Elrod a9e7508e92 WIP: Make wsrelay listen for pg_notify heartbeat 
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
Rick Elrod 1c2eb22956 Remove some debug code and modify logging a bit 
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
Rick Elrod a987249ca6 dedent a block that was clearly meant to be de-dented 
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
Shane McDonald ab6d56c24e initial PoC for wsrelay 
Checkpoint
 2023-03-29 22:04:43 -04:00
Jessica Mack c4ce5d0afa updated supervisor to include cache-clear 
Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:04:43 -04:00
Jessica Mack 43f4872fec these methods don't need to be class methods 
Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:04:43 -04:00
Jessica Mack cb31973d59 switched to using the built in task processing 
Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:04:43 -04:00
Jessica Mack 9f959ca3d4 removed unneeded launch file and Dockerfile change 
Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:04:43 -04:00
Jessica Mack 454d6d28e7 mock additional pg_notify use in test 
Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:04:43 -04:00
Jessica Mack 8b70fef743 removed unused import 
Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:04:43 -04:00
Jessica Mack 026b8f05d7 added launch file, docker, and supervisor changes 
Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:04:43 -04:00
Jessica Mack d8e591cd69 added cache-clear service. update dispatcher queues 
Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:04:43 -04:00
Hao Liu 38cc193aea update permission to launch_awx_rsyslog.sh permission to +x (#13399) 
Signed-off-by: Hao Liu <haoli@redhat.com>
 2023-03-29 22:04:43 -04:00
Lila Yasin 65b3e0226d Created new rsyslog launch file. (#13327) 
* Created new rsyslog launch file.
* Rsyslog conf work.
* Refining how we're calling rsyslog conf.
* Removed rsyslog so it no longer launches in the web container.
* Added the new launch_awx_rsyslog.sh to the /usr/bin
 2023-03-29 22:04:43 -04:00
jessicamack b5e04a4cb3 AWX code changes for rsyslog decoupling (#13222) 
* add management command and logging for new daemon
* switch tasks over to calling pg_notify
* add daemon to docker-compose and supervisor
* renamed handle_setting_changes and moved notify call
* removed initial rsyslog configure from dispatcher
* add logging and clear cache before reconfigure
* add notify to delete
* moved pg_notify to own function
* update tests impacted by rsyslog change
* changed over to new pg_notify method

Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:04:43 -04:00
Christian Adams c89c2892c4 Merge pull request #13749 from fosterseth/mintls13false 
Allow TLS 1.2 for Receptor connections
 2023-03-29 19:20:09 -04:00
Alan Rominger 5080a5530c Merge pull request #13448 from ansible/feature_constructed-inventory 
Allow for using Ansible's `constructed` inventory plugin to dynamically group hosts from AWX inventories
 2023-03-29 09:27:21 -04:00
Rick Elrod 77743ef406 [collection] Example for constructed inventories (#13755) 
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-28 11:20:24 -05:00
Marliana Lara f792fea048 Add more constructed inventory hint examples 2023-03-28 11:20:24 -05:00
Alan RomingerandRick Elrod 16ad27099e [constructed-inventory] Save facts on model for original host (#13700) 
* Save facts on model for original host

Redirect to original host for ansible facts

Use current inventory hosts for facts instance_id filter
Thanks for Gabe for identifying this bug

* Fix spelling of queryset

Co-authored-by: Rick Elrod <rick@elrod.me>

* Fix sign error with facts expiry - from review

---------

Co-authored-by: Rick Elrod <rick@elrod.me>
 2023-03-28 11:20:24 -05:00
Alan RomingerandRick Elrod 3f5a4cb6f1 [constructed-inventory] Backlink events to real hosts and summaries to both hosts (#13718) 
* Backlink events to real hosts and summaries to both hosts

* Prevent error when original host is deleted during job run

* No duplicate entries, review suggestion from Rick

* Change word tense in help text, dict style adjustments

From code review

Co-authored-by: Rick Elrod <rick@elrod.me>

* Back out new variable for constructed host id

---------

Co-authored-by: Rick Elrod <rick@elrod.me>
 2023-03-28 11:20:24 -05:00
Alan Rominger b88d9f4731 Force overwrite all vars for constructed inventory (#13731) 2023-03-28 11:20:24 -05:00
Alan Rominger 62b79b1959 Point constructed inventory URL to special view (#13730) 2023-03-28 11:20:24 -05:00
Alan Rominger be5a2bbe61 Fail inventory updates with unmatched limits (#13726) 2023-03-28 11:20:24 -05:00
Rick Elrod 84edbed5ec [constructed-inventory] Fix some validation for constructed inv sources (#13727) 
- When updating, we need the original object so we can make sure we
  aren't changing things we shouldn't be.
- We want to allow source_vars and limit, but not much else.
- We want to block everything else (at least, if it doesn't match what
  is in the original object...to allow the collection to work properly).
- Add two functional tests.

Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-28 11:20:24 -05:00
Alan Rominger aa631a1ba7 [constructed-inventory] Allow filtering based on facts (#13678) 
* initial functional filter-on-facts functionality

* Move facts to its own module to make interface more coherent

* Update test
 2023-03-28 11:20:24 -05:00
Alan Rominger 771b831da8 Fail constructed inventory if ANY source is unparsed 2023-03-28 11:20:24 -05:00
Alan Rominger ce4c1c11b3 Remove towervars from constructed inventory hosts (#13686) 2023-03-28 11:20:24 -05:00
Marliana Lara 054a70bda4 Filter constructed inventory hosts from smart inventory host lookup 2023-03-28 11:20:24 -05:00
Rick ElrodandAlan Rominger ab0463bf2a 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-28 11:20:24 -05:00
Marliana Lara 2bffddb5fb Add constructed inventory edit form 2023-03-28 11:20:24 -05:00
Marliana Lara d576e65858 Add constructed inventory add form 2023-03-28 11:20:24 -05:00
Marliana Lara e3d167dfd1 Hide constructed and smart inventories in Inventory Lookup 2023-03-28 11:20:24 -05:00
Alex Corey ba9533f0e2 Adds constructed inventory groups and related groups. 2023-03-28 11:20:24 -05:00
Alex Corey e7a739c3d7 Creates constructed inventory host lists by reusing, and renaming smart inventory host list components. 2023-03-28 11:20:24 -05:00
Marliana Lara ab3a9a0364 Update inventory details after inventory source sync 2023-03-28 11:20:24 -05:00
Marliana Lara 7dd1bc04c4 Add constructed inventory detail's sync button 2023-03-28 11:20:24 -05:00
Gabe Muniz 8c4e943af0 refactored to use is_valid_relation instead of post 2023-03-28 11:20:24 -05:00
Gabe Muniz 7112da9cdc Various validations for const. inv. serialization 
- prevent constructed inventory host,group,inventory_source creation
- disable deleting constructed inventory hosts
- remove the ability to add constructed inventory sources
- remove ability to add constructed inventories to constructed inventories
- block updates to constructed source type
- added tests for group/host/source creation
 2023-03-28 11:20:24 -05:00
Marliana Lara 7a74437651 Add constructed inventory CRUD and subtab routes 
* Add constructed inventory API model
 * Add constructed inventory detail view
 * Add util to switch inventory url based on "kind"
 2023-03-28 11:20:24 -05:00
Hao LiuandRick Elrod e22967d28d add constructed kind to inventory module 
- add kind 'constructed' to inventory module
- add 'input_inventories' field to inventory module

Co-authored-by: Rick Elrod <rick@elrod.me>
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-28 11:20:24 -05:00
Gabe Muniz df6bb5a8b8 Refactor original hosts, add related field 
Also rename source_inventories to input_inventories
 2023-03-28 11:20:24 -05:00
Gabe Muniz aa06940df5 force kind to readonly field and set kind to constructed in create 2023-03-28 11:20:24 -05:00
Alan Rominger 3e5467b472 [constructed-inventory] Add constructed inventory docs and do minor field updates (#13487) 
* Add constructed inventory docs and do minor field updates

Add verbosity field to the constructed views

automatically set update_on_launch for the auto-created constructed inventory source
 2023-03-28 11:20:24 -05:00
Alan Rominger c2fe06dd95 [constructed-inventory] Use control plane EE for constructed inventory and hack temporary image (#13474) 
* Use control plane EE for constructed inventory and hack temporary image

* Update page registry to work with new endpoints
 2023-03-28 11:20:24 -05:00
Gabe Muniz 510f54b904 adding limit to inventory_source collection module 2023-03-28 11:20:24 -05:00