x/timmy
Code Issues Proposed changes

Add extra data for collection

Browse Source
This commit is contained in:
f3flight 2016-07-29 14:37:35 +00:00
parent 2d5b51c411
commit fb83196f79
29 changed files with 57 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rq.yaml
View File

@ -1,3 +1,11 @@
files:
__default: ['/etc/resolv.conf', '/etc/hiera', '/etc/mcollective', '/etc/astute.yaml', '/root/.ceph*', '/root/anaconda*', '/root/*.log', '/root/*.ks', '/var/lib/puppet/state/last_run_summary.yaml', '/var/run/pcap_dir', '/var/lib/cloud']
by_roles:
controller: ['/etc/apache2', '/etc/keystone', '/etc/swift']
fuel: ['/etc/astute', '/etc/dnsmasq.conf', '/etc/centos-release', '/etc/fuel_build_number', '/etc/fuel_build_id', '/etc/cobbler', '/etc/cobbler.dnsmasq.conf', '/root/*.log']
by_os_platform:
ubuntu: ['/etc/lsb-release', '/etc/network']
centos: ['/etc/redhat-release', '/etc/sysconfig']
filelists:
by_roles:
fuel: [etc-nailgun, etc-fuel]
@ -22,60 +30,60 @@ scripts:
controller: [nova-manage-vm-list]
'5.0':
by_roles:
fuel: [fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker]
controller: [nova-manage-vm-list]
'5.0.1':
by_roles:
fuel: [fuel-docker-ps, fuel-dockerctl-check, fuel-docker-db-archive]
fuel: [fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker]
controller: [nova-manage-vm-list]
'5.1':
by_roles:
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker]
controller: [nova-manage-vm-list]
'5.1.1':
by_roles:
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, fuel-docker-db-archive]
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker]
controller: [nova-manage-vm-list]
'6.0':
by_roles:
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker, docker-images]
compute: [ipset-save, ipset-list]
controller: [ipset-save, ipset-list, nova-manage-vm-list]
'6.1':
by_roles:
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check,
fuel-docker-db-archive]
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker, docker-images]
controller: [nova-manage-vm-list]
'7.0':
by_roles:
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check,
fuel-docker-db-archive]
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker, docker-images]
'8.0':
by_roles:
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check,
fuel-docker-db-archive]
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker, docker-images, fuel-bootstrap-list]
'9.0':
by_roles:
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check]
fuel: [fuel-notifications, fuel-postgres-dump, fuel-bootstrap-list, shotgun2-report]
by_roles:
fuel: [fuel-release, fuel-task-list, fuel-environment-list]
cinder: [ovs-vsctl-show, cinder-manage]
compute: [compute-iptables-nat, ovs-dump-flows, compute-iptables, ovs-ofctl-show-bridges,
ovs-vsctl-show]
controller: [rabbitmqctl-list-queues, nova-service-list, iptables-namespaces,
rabbitmqctl-cluster-status, crm-resource-status, ovs-dump-flows, neutron-agent-list,
rabbitmqctl-cluster-status, crm-resource-status, pcs-status, ovs-dump-flows, neutron-agent-list,
mysql-status, ceph-mon-status, ovs-ofctl-show-bridges, rabbitmqctl-list-connections,
ovs-vsctl-show, rabbitmqctl-report, mysql-size, rabbitmqctl-status, crm-resource-list,
cinder-manage]
mongo: [mongo-replication-status, ipa, mongo-replica-conf, mongo-status, ovs-vsctl-show]
once_by_roles:
ceph-osd: [ceph-df, ceph-osd-status, ceph-osd-tree, ceph-pg-dump, ovs-vsctl-show,
ceph-health-detail]
ceph-health-detail, ceph-health]
controller: [neutron-router-list, neutron-net-list, neutron-subnet-list, keystone-endpoint-list,
cinder-list, nova-list, keystone-tenant-list, nova-usage-list,
neutron-port-list]
by_os_platform:
ubuntu: [dmesg-t-ubuntu, packages-ubuntu]
centos: [dmesg-centos, packages-centos]
ubuntu: [dmesg-t-ubuntu, dpkg-l, apt-cache-policy]
centos: [dmesg-centos, yum-list-installed, yum-v-repolist]
__default:
[ip-ne, iptables, ipnetns, ss, ipa, iptables-nat, df-m, services-status, cpuinfo, df-i, ipro]
[ip-ne, iptables, ipnetns, ss, ipa, iptables-nat, df-m, services-status, cpuinfo, df-i, ipro, mount, sysctl-a, pvdisplay, vgdisplay, lvdisplay, lsmod, dmidecode, cat-proc-interrupts, arp-an, uname-a, ps-auxwwf, uptime, dmsetup-info, brctl-show, blkid-o-list]
# cmds:
# __default:
# test:

1
rq/scripts/apt-cache-policy Normal file
View File

@ -0,0 +1 @@
apt-cache policy

1
rq/scripts/arp-an Normal file
View File

@ -0,0 +1 @@
arp -an

2
rq/scripts/blkid-o-list Normal file
View File

@ -0,0 +1,2 @@
blkid -o list | perl -pe 's/[^[:print:]\r\n]//g'
# perl cleanup is necessary to workaroud corrupt output of blkid with long mount points (docker mount points have garbage in the end) - this at least prevents our Python code from crashing

1
rq/scripts/cat-proc-interrupts Normal file
View File

@ -0,0 +1 @@
cat /proc/interrupts

1
rq/scripts/ceph-health Normal file
View File

@ -0,0 +1 @@
ceph health

1
rq/scripts/ceph-s Normal file
View File

@ -0,0 +1 @@
ceph -s

1
rq/scripts/dmidecode Normal file
View File

@ -0,0 +1 @@
dmidecode

1
rq/scripts/dmsetup-info Normal file
View File

@ -0,0 +1 @@
dmsetup info -c --nameprefixes --noheadings -o blkdevname,subsystem,blkdevs_used,name,uuid

1
rq/scripts/docker-images Normal file
View File

@ -0,0 +1 @@
docker images

1
rq/scripts/dpkg-l Normal file
View File

@ -0,0 +1 @@
dpkg -l | cat

1
rq/scripts/fuel-bootstrap-list Normal file
View File

@ -0,0 +1 @@
fuel-bootstrap list

1
rq/scripts/lsmod Normal file
View File

@ -0,0 +1 @@
lsmod

1
rq/scripts/lvdisplay Normal file
View File

@ -0,0 +1 @@
lvdisplay

1
rq/scripts/mount Normal file
View File

@ -0,0 +1 @@
mount

1
rq/scripts/packages-centos
View File

@ -1 +0,0 @@
time yum list installed

1
rq/scripts/packages-ubuntu
View File

@ -1 +0,0 @@
time dpkg -l

1
rq/scripts/pcs-status Normal file
View File

@ -0,0 +1 @@
pcs status

0
rq/scripts/fuel-docker-db-archive → rq/scripts/postgres-dump-docker
View File

1
rq/scripts/ps-auxwwf Normal file
View File

@ -0,0 +1 @@
ps auxwwf

1
rq/scripts/pvdisplay Normal file
View File

@ -0,0 +1 @@
pvdisplay

1
rq/scripts/shotgun2-report Normal file
View File

@ -0,0 +1 @@
shotgun2 report

1
rq/scripts/sysctl-a Normal file
View File

@ -0,0 +1 @@
sysctl -a

1
rq/scripts/uname-a Normal file
View File

@ -0,0 +1 @@
uname -a

1
rq/scripts/uptime Normal file
View File

@ -0,0 +1 @@
uptime

1
rq/scripts/vgdisplay Normal file
View File

@ -0,0 +1 @@
vgdisplay

1
rq/scripts/yum-list-installed Normal file
View File

@ -0,0 +1 @@
yum list installed

1
rq/scripts/yum-v-repolist Normal file
View File

@ -0,0 +1 @@
yum -v repolist

20
timmy/tools.py
View File

@ -218,16 +218,16 @@ def launch_cmd(cmd, timeout, input=None, ok_codes=None):
outs = outs.decode('utf-8')
errs = errs.decode('utf-8')
errs = errs.rstrip('\n')
except:
try:
p.kill()
except:
pass
p.stdin = None
outs, errs = p.communicate()
outs = outs.decode('utf-8')
errs = errs.decode('utf-8')
errs = errs.rstrip('\n')
# except:
# try:
# p.kill()
# except:
# pass
# p.stdin = None
# outs, errs = p.communicate()
# outs = outs.decode('utf-8')
# errs = errs.decode('utf-8')
# errs = errs.rstrip('\n')
finally:
if timeout_killer:
timeout_killer.cancel()