External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-25 00:11:23 -03:30
Code Issues Packages Projects Releases Wiki Activity
33,109 Commits 55 Branches 19 Tags
Commit Graph

33109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lila
ac2f2039f5 Fix cache-clear for kube dev env 
Missing conditional for when running in kube development environment
 2023-03-29 22:09:19 -04:00
Hao Liu
c8c8ed1775 Raise ValueError when no ready and enabled task instance 2023-03-29 22:09:19 -04:00
thedoubl3j
6267469709 remove rsyslog_configurer from dispatcher as it is already being handled, add rsyslog_configurer to tower_processes 2023-03-29 22:09:19 -04:00
Lila
a1e39f71fc Removed errant comments. 2023-03-29 22:09:19 -04:00
Hao Liu
4b0acaf7a1 Add back missing rsyslog.conf file 2023-03-29 22:09:19 -04:00
Hao Liu
968267287b Catch SynchronousOnlyOperation and get setting async 
If trying to get setting from async context (in daphne) catch SynchronousOnlyOperation error and retry in a thread
 2023-03-29 22:09:19 -04:00
Hao Liu
25303ee625 Only select task instance that are ready and enabled 
When select a queue for task instance to run task only select task instance that are ready and enabled
 2023-03-29 22:09:19 -04:00
jessicamack
8c5e2237f4 import typing to fix lint issue 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-03-29 22:09:19 -04:00
jessicamack
57d009199d removed unused imports. fix exception message 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-03-29 22:09:19 -04:00
jessicamack
24cbf39a93 fix heartbeet ascii lint issue 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-03-29 22:09:19 -04:00
jessicamack
95f1ef70a7 update licenses to include new requirement 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-03-29 22:09:19 -04:00
jessicamack
680e2bcc0a remove out of date test code 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-03-29 22:09:19 -04:00
Hao Liu
cd3f7666be add get_task_queuename 
get_local_queuename will return the pod name of the instance

now that web and task are in different pods when web container queue a task it will be put into a queue without as task worker to execute the task
 2023-03-29 22:09:19 -04:00
Hao Liu
049fb4eff5 fix job relaunch error 
AttributeError: 'Settings' object has no attribute 'INSTALL_UUID'
 2023-03-29 22:09:19 -04:00
Hao Liu
7cef4e6db7 clear settings cache after changing DISABLE_LOCAL_AUTH 2023-03-29 22:09:19 -04:00
jessicamack
da004da68a make reconfigure_rsyslog a task 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-03-29 22:09:18 -04:00
jessicamack
b29f2f88d0 updated tests to be in line with clear_setting_cache changes 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-03-29 22:09:18 -04:00
jessicamack
52a8a90c0e remove changes used for dev testing 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-03-29 22:09:18 -04:00
Hao Liu
7cb890b603 minor fix-up due to merge conflict 2023-03-29 22:09:18 -04:00
Jessica Mack
78652bdd71 add functionality back to cache clear method 
Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:09:18 -04:00
Jessica Mack
29d222be83 removed rsyslog queue, updated logger level 
Signed-off-by: Jessica Mack <jmack@redhat.com>
 2023-03-29 22:09:18 -04:00
Lila Yasin
e7fa730f81 Removed some commented out code and adjusted a few loggers to make more sense contextually. (#13424) 2023-03-29 22:09:18 -04:00
Seth Foster
33f070081c Send subsystem metrics via wsrelay (#13333) 
Works by adding a dedicated producer in wsrelay that looks for
local django channels message with group "metrics". The producer
sends this to the consumer running in the web container.

The consumer running in the web container handles the message by
pushing it into the local redis instance.

The django view that handles a request at the /api/v2/metrics
endpoint will load this data from redis, format it, and return the
response.
 2023-03-29 22:09:18 -04:00
Rick Elrod
44463402a8 [wsrelay] attempt to standardize logging levels 
This needs some work, but it's a start.

Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
Rick Elrod
93c2c56612 [wsrelay] Copy the message payload before we relay 
We internally manipulate the message payload a bit (to know whether we
are originating it on the task side or the web system is originating
it). But when we get the message, we actually get a reference to the
dict containing the payload.

Other producers in wsrelay might still be acting on the message and
deciding whether or not to relay it. So we need to manipulate and send a
*copy* of the message, and leave the original alone.

Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
Rick Elrod
91bf49cdb3 Remove auto-reconnect logic from wsrelay 
We no longer need to do this from wsrelay, as it will automatically try
to reconnect when it hears the next beacon from heartbeet.

This also cleans up the logic for what we do when we want to delete a
node we previously knew about.

Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
Rick Elrod
704759d29a add wsrelay to tower-processes 
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-29 22:09:18 -04:00
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