Small fixes for copy-logs.sh

- Run diag commands in bash -c instead of using tee
  To try and make things a bit quieter and fix command not found
  errors.
- Only recover /var/tmp/packstack/latest, /var/tmp/packstack will
  contain a copy of the puppet modules and these take a long time
  to recover, zip and upload.
- Only recover /etc/httpd/conf.d, we don't really need the rest
- Send testrepository.subunit to the root of /logs for
  openstack health monitoring
- MySQL logs are really in /var/log/mariadb, not /var/log/mysql
- MySQL config is really in /etc/my.cnf.d, not /etc/mysql
- Also recover dstat.log for tracing resource consumption
- Use -L switch on cp to copy symlink'd contents
  (i.e /var/tmp/packstack/latest)
- Use -f switch on gzip for idempotency if/when run twice so that
  it overwrites existing logs and compresses the new logs.

Change-Id: Ia79f7dac5a33d2749e73b9a0940e33b94f2430f9

tools/copy-logs.sh

@@ -61,7 +61,7 @@ function get_diag_commands {
     for ((i = 0; i < ${#commands[@]}; i++)); do
         # filenames have underscores instead of spaces or slashes
         filename="$(echo "${commands[$i]}" |sed -e "s%[ \/]%_%g").txt"
-        $SUDO "${commands[$i]}" 2>&1 | $SUDO tee -a ${DIAG_LOGDIR}/${filename}
+        $SUDO bash -c "${commands[$i]} 2>&1 > ${DIAG_LOGDIR}/${filename}"
     done
 }
 
@@ -90,16 +90,16 @@ function get_config_and_logs {
         '/var/log/gnocchi'
         '/etc/rabbitmq/'
         '/var/log/rabbitmq'
-        '/etc/mysql'
+        '/etc/my.cnf.d'
-        '/var/log/mysql'
+        '/var/log/mariadb'
-        '/var/log/mysql.err'
+        '/etc/httpd/conf.d/'
-        '/var/log/mysql.log'
-        '/etc/httpd'
         '/var/log/httpd'
-        '/var/tmp/packstack'
+        '/var/tmp/packstack/latest'
-        '/var/log/audit'
+        '/var/tmp/packstack/latest/testrepository.subunit' # So we're copying it
-        '/var/log/secure'
+        '/var/log/audit'                                   # to the root of
+        '/var/log/secure'                                  # /logs
         '/var/log/messages'
+        '/var/log/dstat.log'
         '/etc/puppet/puppet.conf'
         '/etc/puppet/hiera.yaml'
     )
@@ -119,9 +119,9 @@ function get_config_and_logs {
             if [[ "${paths[$i]}" =~ /proc/ ]]; then
                 $SUDO cp "${paths[$i]}" ${DIAG_LOGDIR}/
             elif [[ "${paths[$i]}" =~ /var/ ]]; then
-                $SUDO cp -r "${paths[$i]}" ${LOGDIR}/
+                $SUDO cp -Lr "${paths[$i]}" ${LOGDIR}/
             elif [[ "${paths[$i]}" =~ /etc/ ]]; then
-                $SUDO cp -r "${paths[$i]}" ${CONF_LOGDIR}/
+                $SUDO cp -Lr "${paths[$i]}" ${CONF_LOGDIR}/
             fi
         fi
     done
@@ -143,7 +143,7 @@ function ensure_log_properties {
 
     echo "Compressing all text files..."
     # Compress all files
-    $FIND -iname '*.txt' -execdir gzip -9 {} \+
+    $FIND -iname '*.txt' -execdir gzip -f -9 {} \+
 
     echo "Compressed log and configuration can be found in ${LOGDIR}."
 }