External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 13:41:28 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into expunge-awx-unstable

Browse Source
This commit is contained in:
Luke Sneeringer 2014-08-25 10:51:26 -04:00
commit 55323fac57
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/helpers/EventViewer.js
View File

@ -463,7 +463,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
for (key in obj) {
h = '';
if (key !== 'host_id' && key !== 'parent' && key !== 'event' && key !== 'src' && key !== 'md5sum' &&
key !== 'stdout' && key !== 'traceback' && key !== 'stderr') {
key !== 'stdout' && key !== 'traceback' && key !== 'stderr' && key !== 'cmd' && key !=='changed' && key !== "verbose_override") {
if (!EventsViewerForm.fields[key]) {
h = parseItem(obj[key], key, key);
if (h) {

12
tools/sosreport/tower.py
View File

@ -24,7 +24,11 @@ if LooseVersion(sos.__version__) >= LooseVersion('3.0'):
dirs = [
"/etc/awx/",
"/var/log/supervisor/",
"/var/log/awx",
"/var/log/httpd",
"/var/log/apache2",
"/var/log/rabbitmq",
"/var/log/supervisor",
"/var/log/syslog",
"/var/log/udev",
"/var/log/kern*",
@ -59,7 +63,11 @@ else:
dirs = [
"/etc/awx/",
"/var/log/supervisor/",
"/var/log/awx",
"/var/log/httpd",
"/var/log/apache2",
"/var/log/rabbitmq",
"/var/log/supervisor",
"/var/log/syslog",
"/var/log/udev",
"/var/log/kern*",