Merge pull request #175 from github/auditlog-backup-fix

Ask for index name when using Elasticsearch _cat API

Author: dbussink

bin/ghe-backup

@@ -147,9 +147,11 @@ else
     failures="$failures redis"
 fi
 
-echo "Backing up audit log ..."
-ghe-backup-es-audit-log ||
-failures="$failures audit-log"
+if [ $GHE_VERSION_MAJOR -ge 2 ]; then
+  echo "Backing up audit log ..."
+  ghe-backup-es-audit-log ||
+  failures="$failures audit-log"
+fi
 
 echo "Backing up hookshot logs ..."
 ghe-backup-es-hookshot ||

share/github-backup-utils/ghe-backup-es-audit-log

@@ -19,14 +19,24 @@ ghe_remote_version_required "$host"
 # Make sure root backup dir exists if this is the first run
 mkdir -p "$GHE_SNAPSHOT_DIR/audit-log"
 
-indices=$(ghe-ssh "$host" 'curl -s "localhost:9201/_cat/indices/audit_log*"' | cut -d ' ' -f 3)
+if [ $GHE_VERSION_MAJOR -ge 2 ] && [ $GHE_VERSION_MINOR -ge 2 ]; then
+  es_port=9201
+else
+  es_port=9200
+fi
+
+if ! indices=$(ghe-ssh "$host" "curl -s \"localhost:$es_port/_cat/indices/audit_log*?h=index"\"); then
+  echo "Error: failed to retrieve audit log indices." 1>&2
+  exit 1
+fi
+
 current_index=audit_log-$(ghe-ssh "$host" 'date +"%Y-%m"')
 
 for index in $indices; do
   if [ -f $GHE_DATA_DIR/current/audit-log/$index.gz -a $index \< $current_index ]; then
     # Hard link any older indices since they are read only and won't change
     ln $GHE_DATA_DIR/current/audit-log/$index.gz $GHE_SNAPSHOT_DIR/audit-log/$index.gz
   else
-    ghe-ssh "$host" "/usr/local/share/enterprise/ghe-es-dump-json 'http://localhost:9201/$index'" | gzip > $GHE_SNAPSHOT_DIR/audit-log/$index.gz
+    ghe-ssh "$host" "/usr/local/share/enterprise/ghe-es-dump-json \"http://localhost:$es_port/$index\"" | gzip > $GHE_SNAPSHOT_DIR/audit-log/$index.gz
   fi
 done

test/bin/curl

@@ -3,6 +3,11 @@
 # Fake curl command stub for tests.
 set -e
 
+# Return empty list of indexes for ghe-backup-es-audit-log
+if echo "$@" | grep -q '_cat/indices/audit_log\*?h=index$'; then
+  exit 0
+fi
+
 # Write args to stdout
 echo "$@"