shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 22:21:13 +03:00
Code Releases Activity
20,748 Commits 40 Branches 19 Tags 380 MiB
d11dfd0a2b
Commit Graph

20748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Petrello
d11dfd0a2b
Merge branch 'downstream' into devel 2019-04-26 08:02:04 -04:00
Ryan Petrello
27d74528c0
Merge pull request #3494 from rooftopcellist/analytics_csv 
analytics table copies formatted as csv now
 2019-04-25 14:48:59 -04:00
Ryan Petrello
0ada1e965f
Merge pull request #3508 from ryanpetrello/runner-134 
pin runner 1.3.4
 2019-04-25 10:16:05 -04:00
Ryan Petrello
2808a852eb
pin runner 1.3.4 2019-04-25 09:49:03 -04:00
Ryan Petrello
80393e9194
Merge pull request #3504 from wenottingham/im-not-going-to-be-ignored-dan 
Kill the rabbitmq sos collection from our plugin.
 2019-04-24 14:51:01 -04:00
Bill Nottingham
aa52e41c02 Kill the rabbitmq sos collection from our plugin. 
It exists in upstream sosreport, and this can cause conflicts.
 2019-04-24 14:15:17 -04:00
Ryan Petrello
d7cdec37f2
Merge pull request #3502 from ryanpetrello/metrics-license-counts 
fix a few issues with license counts in /api/v2/metrics/
 2019-04-24 12:37:03 -04:00
softwarefactory-project-zuul[bot]
f60857013e
Merge pull request #3754 from AlanCoding/gce_env_var 
Simplify gce inventory plugin injector

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-24 16:25:09 +00:00
Ryan Petrello
c9424f9af8
fix a few issues with license counts in /api/v2/metrics/ 
- switched these to gauges so people can track them over time
- fixed a typo that caused `free_instances` to always be zero
 2019-04-24 12:23:07 -04:00
Ryan Petrello
66f883befe
Merge pull request #3485 from wenottingham/aaaaaaaaaaaaaaaaaaaaaaazure 
Update Azure requirements for Ansible stable-2.8 branch.
 2019-04-24 12:05:58 -04:00
softwarefactory-project-zuul[bot]
fad0274373
Merge pull request #3686 from vismay-golwala/instance_group_delete 
[WIP] Disallow deleting controller or isolated instance groups

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-24 15:19:19 +00:00
Michael Abashian
8c715fc6e1
Merge pull request #3497 from dsesami/e2e_backport_3.5.0 
E2E testing: compatibility edit to work with diff versions of node
 2019-04-24 10:03:53 -04:00
Daniel Sami
870ebb4b43 fix to work with diff versions of node 2019-04-24 09:44:41 -04:00
softwarefactory-project-zuul[bot]
e78ef82385
Merge pull request #3758 from ryanpetrello/dot-files 
clean up some old dotfiles

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-24 13:06:20 +00:00
Matthew Jones
1eb565543c
Merge pull request #3495 from ansible/markerfiletest 
Adding a markerfile for e2e runs
 2019-04-24 09:06:03 -04:00
John Hill
082a819160
removing hyphen 2019-04-24 08:22:07 -04:00
Ryan Petrello
519d2eebcb
remove unnecessary dotfiles 2019-04-23 17:23:15 -04:00
Michael Abashian
f2ea9003a3
Merge pull request #3493 from dsesami/e2e_backport_3.5.0 
E2E backport 3.5.0
 2019-04-23 16:51:34 -04:00
Christian Adams
64ae7a6e45 analytics table copies formatted as csv now 2019-04-23 16:26:14 -04:00
softwarefactory-project-zuul[bot]
b47be3c8c7
Merge pull request #3749 from AlanCoding/simple_openstack 
Use common method for openstack OS_CLIENT_CONFIG_FILE injection

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-23 20:23:05 +00:00
John Hill
2f7ec6ff13 adding a markerfile for e2e runs 2019-04-23 16:01:45 -04:00
Daniel Sami
75065b6407 e2e stability backport for 3.5 2019-04-23 15:45:27 -04:00
softwarefactory-project-zuul[bot]
2cb6104fe4
Merge pull request #3696 from AlanCoding/django2_warnings 
Fix Django 2.0 deprecation warnings

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-23 18:09:58 +00:00
softwarefactory-project-zuul[bot]
f90f8ba9a8
Merge pull request #3755 from ansible/noretry 
Adding an option to run all the tests without a retry statement

Reviewed-by: awxbot
             https://github.com/awxbot
 2019-04-23 17:48:52 +00:00
John Hill
9733fde560
Adding an option to run all the tests without a retry statement 2019-04-23 13:18:34 -04:00
Ryan Petrello
231c76c9cb
Merge pull request #3490 from jakemcdermott/fix-3487 
handle insights credential lookups for projects
 2019-04-23 12:08:43 -04:00
Jake McDermott
311daf10b8
handle insights credential lookups for projects 
Although most scm types correspond to an scm credential lookup, insights uses its own
credential type.
 2019-04-23 11:44:03 -04:00
Bill Nottingham
4ca4563a19 Update Azure requirements for Ansible stable-2.8 branch. 2019-04-23 10:50:00 -04:00
Ryan Petrello
96183cf9c4
Merge pull request #3484 from ansible/insights-integration 
Insights integration
 2019-04-23 10:05:00 -04:00
Jeff Bradberry
0b555e938a Fix typo in the Insights inventory url 2019-04-23 09:39:08 -04:00
AlanCoding
c36dbb3448
Simplify gce inventory plugin injector 
This consumes the change made in Ansible core
https://github.com/ansible/ansible/pull/54407
which is in Ansible 2.8, allowing the plugin
injection logic to share the script logic and
to be simplified
 2019-04-23 09:33:17 -04:00
AlanCoding
adfce6edf1
Unify openstack inventory injection logic 
Remove logic specific to job runs to create a "clouds" file
  for openstack credential type

Move that logic into the collection of managed_by_tower
  injector methods, so it will be used by all job types

Modify inventory openstack injector logic to use this
  data as a base for its logic building the clouds file
 2019-04-23 07:59:47 -04:00
AlanCoding
140394fe1f
Change credential pattern for openstack inventory plugin 
See upstream docs https://github.com/ansible/ansible/pull/54532
Previously it was thought that the entry in the inventory config
file was necessary, but the upstream docs change allows us to
use the same pattern that we used to for the script.
 2019-04-22 14:32:00 -04:00
Jeff Bradberry
6ff539e6ee Update the front-end Insights urls 2019-04-22 14:17:47 -04:00
Jeff Bradberry
49ba6c6b3d Appease flake8 2019-04-22 14:17:47 -04:00
Jeff Bradberry
e2861c6c39 Fix the tests to conform to the new Insights results 2019-04-22 14:17:47 -04:00
Jeff Bradberry
6dae4a1d6d Add the host in as a parameter to the _get_insights call 2019-04-22 14:17:47 -04:00
Jeff Bradberry
e66f9241a9 Remove the platform_id from the call to _get_insights 
since it is now acquired within _get_insights.
 2019-04-22 14:17:47 -04:00
Jeff Bradberry
72da961550 Conform to the new output of the Insights system reports endpoint 2019-04-22 14:17:47 -04:00
Jeff Bradberry
4c86c5065c Fix a typo in the per-system remediations api call 2019-04-22 14:17:47 -04:00
Jeff Bradberry
80a855c57a Do some basic slugification of the remediation playbook name 2019-04-22 14:17:47 -04:00
Jeff Bradberry
11b85250e8 Update more urls 2019-04-22 14:17:47 -04:00
Jeff Bradberry
10cfac2f0e Update the error message when we can't discover the platform ID 2019-04-22 14:17:47 -04:00
Jeff Bradberry
355a83441a Guard against the case where Insights fails to find the system ID 2019-04-22 14:17:47 -04:00
Jeff Bradberry
e25adca233 Replace the old unit tests with new functional tests 2019-04-22 14:17:47 -04:00
Jeff Bradberry
7c743904b0 Removed some no longer needed imports 2019-04-22 14:17:47 -04:00
Jeff Bradberry
a97865de0c Refactor HostInsights 
for better reuse of the error handling of the Insights API calls.
 2019-04-22 14:17:47 -04:00
Jeff Bradberry
596a5173ce Modify filter_insights_api_response to take in the separate remediations 
since it is accumulated via a different API call.
 2019-04-22 14:17:47 -04:00
Jeff Bradberry
63209197dd Iterate over the pages of remediations available 2019-04-22 14:17:47 -04:00
Jeff Bradberry
af2484cd97 Update the Insights API urls to use the new url structure 2019-04-22 14:17:47 -04:00