External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity
33,151 Commits 54 Branches 19 Tags
Commit Graph

33151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hao Liu
80ebe13841
Merge pull request #13825 from TheRealHaoLiu/fix-dependency-conflict 
Fix importlib-metadata dependency conflict
 2023-04-07 13:17:49 -04:00
Hao Liu
328880609b Fix importlib-metadata dependency conflict 
rerun requirements/updator.sh to regenerate requirements.txt fix conflict introduced by https://github.com/ansible/ansible-runner/pull/1224
 2023-04-07 11:48:34 -04:00
John Westcott IV
71c307ab8a
Merge pull request #13808 from ansible/feature_on-premise-analytics 
Proxy analytics requests through AWX API
 2023-04-07 11:46:14 -04:00
John Westcott IV
3ce68ced1e
Merge pull request #13809 from ansible/feature_usage-collection-pt2 
Enhance usage metrics collection
 2023-04-07 11:44:59 -04:00
Martin Slemr
20817789bd HostMetric task param check 2023-04-07 08:56:03 -04:00
Salma Kochay
2b63b55b34 UI test fixes for hiding subscription details 2023-04-07 08:56:03 -04:00
Salma Kochay
64923e12fc show/hide host metric subscription details 2023-04-07 08:56:03 -04:00
Martin Slemr
6d4f92e1e8 HostMetric Cleanup task 2023-04-07 08:56:03 -04:00
Martin Slemr
fff6fa7d7a Additional Licensing values 2023-04-07 08:56:03 -04:00
Martin Slemr
44db4587be Analytics upload: HostMetrics hybrid sync 2023-04-07 08:56:03 -04:00
Martin Slemr
dc0958150a Adding analytics to root API page 2023-04-07 08:54:56 -04:00
John Westcott IV
9f27436c75 Adding basic unit/funcational tests 2023-04-07 08:54:56 -04:00
John Westcott IV
e60869e653 Consoldating similar methods 2023-04-07 08:54:56 -04:00
John Westcott IV
51e19d9d0b Adding all endpoints to /api/v2/analytics/ 2023-04-07 08:54:56 -04:00
Martin Slemr
0fea29ad4d Analytics API: OPTIONS proxy and response links update 2023-04-07 08:54:56 -04:00
Martin Slemr
0a40b758c3 Analytics API: Paths, headers and Error handling 2023-04-07 08:54:56 -04:00
Martin Slemr
1191458d80 Analytics API: Basics 2023-04-07 08:54:56 -04:00
Hao Liu
c0491a7b10
Merge pull request #13816 from TheRealHaoLiu/workaround-failed-make-requirements_awx 
Temporary workaround for make requirements_awx failure and fix license test
 2023-04-07 00:07:13 -04:00
Hao Liu
14e613bc92 Fix failed license check 
psycopg2 also start with psycopg

Co-Authored-By: Gabriel Muniz <gmuniz@redhat.com>
 2023-04-06 23:35:24 -04:00
Hao Liu
98e37383c2 Temporary workaround for make requirements_awx failure 2023-04-06 22:14:51 -04:00
John Westcott IV
9e336d55e4
Merge pull request #13805 from john-westcott-iv/fix_closing_colors 
Do not add closing color tags if --no-color was specified
 2023-04-06 08:41:49 -04:00
John Westcott IV
0e68caf0f7 Do not add closing color tags if --no-color was specified 2023-04-05 12:03:15 -04:00
Hao Liu
c9c150b5a6
Merge pull request #13799 from TheRealHaoLiu/fix-supervisor-conf-file 
Fix supervisor conf file inconsistancy
 2023-04-05 11:07:05 -04:00
Hao Liu
f97605430b
Merge pull request #13804 from TheRealHaoLiu/heartbeet-logging 
Add log handler and file for heartbeet
 2023-04-05 11:06:32 -04:00
Hao Liu
454f31f6a4 Add log handler and file for heartbeet 2023-04-05 10:38:35 -04:00
Hao Liu
f62bf6a4c3 Fix supervisor conf file inconsistancy 2023-04-05 10:32:02 -04:00
John Westcott IV
a0dafbfd8c
Merge pull request #13803 from john-westcott-iv/try_and_fix_checks 
Adding import of centos repo key for dnf
 2023-04-05 10:04:55 -04:00
John Westcott IV
b5c052b2e6 Adding import of centos repo key for dnf 2023-04-05 09:38:02 -04:00
Rick Elrod
1e690fcd7f
Only use constr. inv URL when req comes from it (#13797) 
When the API request is for /inventories/id use that as the URL in the
API response. When the request is for /constructed_inventories/id use
that.

Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-04-04 15:26:52 +00:00
Lorenzo Tanganelli
479d0c2b12
add instance_groups on cli and awx.awx.role (#13784) 2023-04-04 10:09:48 -04:00
Alan Rominger
2db29e5ce2
Merge pull request #13786 from AlanCoding/refresh_refresh_refresh 
Fix docker-clean target, accounting for slashes
 2023-03-30 14:20:04 -04:00
Alan Rominger
7bb0d32be1
Fix docker-clean file, accounting for slashes 2023-03-30 13:46:15 -04:00
Hao Liu
acb22f0131
Merge pull request #13423 from ansible/feature_web-task-split 
Allow web and task container to be deployed in separate deployment on Kubernetes
 2023-03-30 12:52:22 -04:00
Rick Elrod
4f99a170be Nix websocket docs for now 
Signed-off-by: Rick Elrod <rick@elrod.me>
 2023-03-30 08:48:50 -04:00
Hao Liu
17f5c4b8e6 Modify dev make target name to clarify intention 
these make targets are for starting the different daemons within the kube/docker development environment updating the name to make it better reflect their intention

also added comments above the make target to describe what they do

note: these comments show up when run `make help`
 2023-03-30 08:47:18 -04:00
Oleksii Baranov
598f9e2a55 Add host_metrics page to the awxkit 2023-03-30 08:46:17 +02:00
Hao Liu
d33573b29c
Merge pull request #13603 from jjwatt/jjwatt-fix-clean-languages 2023-03-29 22:49:13 -04:00
Hao Liu
bc55bcf3a2 Rename SUPERVISOR_CONFIG_PATH 
previously this is used so that task running in the task container can reach into the web container to restart rsyslog

now that the web container and task container are split there's no longer a way to do that so i renamed this env var to reference where it will now do

which is pointing to the supervisor conf file of the current running container
 2023-03-29 22:09:19 -04:00
Hao Liu
6c0c1f6853 Rename launch script for launch awx web 
launch_awx.sh that this PR rename is also now only use for launching awx web container renaming to reflect it's purpose

also remove the no longer needed creation of rsyslog conf as rsyslog is no longer in the web container

Update Dockerfile.j2
 2023-03-29 22:09:19 -04:00
Hao Liu
0cc02d311f Rename supervisor.conf.j2 to be descriptive 
supervisor.conf.j2 file is the template for supervisor.conf file for the web container rename to supervisor_web.conf make it more clear that it is use for the web container
 2023-03-29 22:09:19 -04:00
jessicamack
13b9a6c5e3 Remove unused import 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-03-29 22:09:19 -04:00
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