diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-05 15:36:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-05 15:36:44 +0000 |
| commit | 08101fd4654ffbf7ca6331427a5d895b1db0f008 (patch) | |
| tree | 464a25578777a5a8e8fee7d2fd712f69c9abc528 /tools | |
| parent | 8976263153f7fe7d294df74a49b3f5d9fbcd68ed (diff) | |
| parent | 491aff0b88bc3dac13ea9180c952854fd0a67684 (diff) | |
| download | kolla-08101fd4654ffbf7ca6331427a5d895b1db0f008.tar.gz kolla-08101fd4654ffbf7ca6331427a5d895b1db0f008.zip | |
Merge "Make Heka send logs to Elasticsearch"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/cleanup-containers | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/cleanup-containers b/tools/cleanup-containers index b5821d43e..a860c6780 100755 --- a/tools/cleanup-containers +++ b/tools/cleanup-containers @@ -33,7 +33,9 @@ else openvswitch_{vswitchd,db} \ rabbitmq{,_bootstrap} \ heka \ - swift_{account_{auditor,reaper,replicator,server},container_{auditor,replicator,server,updater},object_{auditor,expirer,replicator,server,updater},proxy_server,rsyncd} + swift_{account_{auditor,reaper,replicator,server},container_{auditor,replicator,server,updater},object_{auditor,expirer,replicator,server,updater},proxy_server,rsyncd} \ + elasticsearch \ + kibana ) ceph_osd_bootstrap=$(docker ps -a --filter "name=bootstrap_osd_*" --format "{{.Names}}") ceph_osd_containers=$(docker ps -a --filter "name=ceph_osd_*" --format "{{.Names}}") @@ -51,7 +53,8 @@ else mongodb \ haproxy_socket \ heka{,_socket} \ - kolla_logs + kolla_logs \ + elasticsearch ) fi |