External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-18 09:27:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #388 from tgerla/sosreport-fixes

Browse Source 
Fix up sosreport to remove some sensitive information and add some us…
This commit is contained in:
James Laska
2015-08-25 15:20:45 -04:00
parent 106718fc20 13ca614a14
commit 2e6845769a
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/sosreport/tower.py
View File

@@ -8,14 +8,16 @@ SOSREPORT_TOWER_COMMANDS = [
"ansible --version", # ansible core version "ansible --version", # ansible core version
"tower-manage --version", # tower version "tower-manage --version", # tower version
"supervisorctl status", # tower process status "supervisorctl status", # tower process status
"pip list" # pip package list "pip freeze", # pip package list
"tree -d /var/lib/awx", # show me the dirs "tree -d /var/lib/awx", # show me the dirs
"ls -ll /var/lib/awx", # check permissions "ls -ll /var/lib/awx", # check permissions
"ls -ll /etc/tower", "ls -ll /etc/tower",
"ls -ll /var/lib/awx/job_status/"
] ]
SOSREPORT_TOWER_DIRS = [ SOSREPORT_TOWER_DIRS = [
"/etc/tower/", "/etc/tower/",
"/etc/ansible/",
"/var/log/tower", "/var/log/tower",
"/var/log/httpd", "/var/log/httpd",
"/var/log/apache2", "/var/log/apache2",
@@ -30,6 +32,13 @@ SOSREPORT_TOWER_DIRS = [
"/var/log/apport.log" "/var/log/apport.log"
] ]
SOSREPORT_FORBIDDEN_PATHS = [
"/etc/tower/SECRET_KEY",
"/etc/tower/tower.key",
"/etc/tower/awx.key",
"/etc/tower/tower.cert",
"/etc/tower/awx.cert"
]
if LooseVersion(sos.__version__) >= LooseVersion('3.0'): if LooseVersion(sos.__version__) >= LooseVersion('3.0'):
from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin
@@ -43,6 +52,9 @@ if LooseVersion(sos.__version__) >= LooseVersion('3.0'):
for path in SOSREPORT_TOWER_DIRS: for path in SOSREPORT_TOWER_DIRS:
self.add_copy_spec(path) self.add_copy_spec(path)
for path in SOSREPORT_FORBIDDEN_PATHS:
self.add_forbidden_path(path)
for command in SOSREPORT_TOWER_COMMANDS: for command in SOSREPORT_TOWER_COMMANDS:
self.add_cmd_output(command) self.add_cmd_output(command)
@@ -57,6 +69,9 @@ else:
for path in SOSREPORT_TOWER_DIRS: for path in SOSREPORT_TOWER_DIRS:
self.addCopySpec(path) self.addCopySpec(path)
for path in SOSREPORT_FORBIDDEN_PATHS:
self.addForbiddenPath(path)
for command in SOSREPORT_TOWER_COMMANDS: for command in SOSREPORT_TOWER_COMMANDS:
self.collectExtOutput(command) self.collectExtOutput(command)