Merge lp:~abentley/juju-ci-tools/more-logs into lp:juju-ci-tools

[Aaron Bentley]

Include syslog and mongodb log when duming logs.

This branch adds syslog and mongodb.log to the list of remote logs we gather.

It does not handle this for the local provider, but this is phased out in 2.0 anyhow.

I have tested it out in AWS and got the expected files:
./abtest
./abtest/machine-1
./abtest/machine-1/cloud-init.log.gz
./abtest/machine-1/unit-dummy-sink-0.log.gz
./abtest/machine-1/machine-1.log.gz
./abtest/machine-1/cloud-init-output.log.gz
./abtest/machine-1/syslog
./abtest/machine-0
./abtest/machine-0/cloud-init.log.gz
./abtest/machine-0/unit-dummy-source-0.log.gz
./abtest/machine-0/machine-0.log.gz
./abtest/machine-0/cloud-init-output.log.gz
./abtest/machine-0/syslog
./admin
./admin/machine-0
./admin/machine-0/logsink.log.gz
./admin/machine-0/cloud-init.log.gz
./admin/machine-0/machine-0.log.gz
./admin/machine-0/cloud-init-output.log.gz
./admin/machine-0/syslog
./admin/machine-0/mongodb.log.gz

[Curtis Hovey (sinzui)]

Thank you, this looks familiar with what I wrote, except mine failed on some substrates.

review: Approve (code)

=== modified file 'deploy_stack.py'
--- deploy_stack.py	2016-04-12 20:23:46 +0000
+++ deploy_stack.py	2016-04-15 19:07:25 +0000
@@ -303,6 +303,8 @@
             '/var/log/juju/*.log',
             # TODO(gz): Also capture kvm container logs?
             '/var/lib/juju/containers/juju-*-lxc-*/',
+            '/var/log/syslog',
+            '/var/log/mongodb/mongodb.log',
         ]
 
         try:
 
=== modified file 'tests/test_deploy_stack.py'
--- tests/test_deploy_stack.py	2016-04-12 20:23:46 +0000
+++ tests/test_deploy_stack.py	2016-04-15 19:07:25 +0000
@@ -433,7 +433,10 @@
                 '10.10.0.1',
                 'sudo chmod -Rf go+r /var/log/cloud-init*.log'
                 ' /var/log/juju/*.log'
-                ' /var/lib/juju/containers/juju-*-lxc-*/'),),
+                ' /var/lib/juju/containers/juju-*-lxc-*/'
+                ' /var/log/syslog'
+                ' /var/log/mongodb/mongodb.log'
+                ),),
             cc_mock.call_args_list[0][0])
         self.assertEqual(
             (get_timeout_prefix(120) + (
@@ -445,6 +448,8 @@
                 '10.10.0.1:/var/log/cloud-init*.log',
                 '10.10.0.1:/var/log/juju/*.log',
                 '10.10.0.1:/var/lib/juju/containers/juju-*-lxc-*/',
+                '10.10.0.1:/var/log/syslog',
+                '10.10.0.1:/var/log/mongodb/mongodb.log',
                 '/foo'),),
             cc_mock.call_args_list[1][0])
 
@@ -475,7 +480,8 @@
             ["DEBUG ssh -o 'User ubuntu' -o 'UserKnownHostsFile /dev/null' "
              "-o 'StrictHostKeyChecking no' -o 'PasswordAuthentication no' "
              "10.10.0.1 'sudo chmod -Rf go+r /var/log/cloud-init*.log "
-             "/var/log/juju/*.log /var/lib/juju/containers/juju-*-lxc-*/'",
+             "/var/log/juju/*.log /var/lib/juju/containers/juju-*-lxc-*/ "
+             "/var/log/syslog /var/log/mongodb/mongodb.log'",
              'WARNING Could not allow access to the juju logs:',
              'WARNING None',
              'WARNING Could not retrieve some or all logs:',