diff --git a/awx/ui/static/js/helpers/EventViewer.js b/awx/ui/static/js/helpers/EventViewer.js index 56aedb5b63..255802cb92 100644 --- a/awx/ui/static/js/helpers/EventViewer.js +++ b/awx/ui/static/js/helpers/EventViewer.js @@ -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) { diff --git a/tools/sosreport/tower.py b/tools/sosreport/tower.py index 3cbdb78f09..fc5b2c3d26 100644 --- a/tools/sosreport/tower.py +++ b/tools/sosreport/tower.py @@ -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*",