Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Introduce option to skip restoring of audit logs #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 1, 2020
Merged

Introduce option to skip restoring of audit logs #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b9989c4
Introduce configuration to skip restoring of audit logs
cainejette Mar 31, 2020
407f772
Move configuration higher in the file
cainejette Mar 31, 2020
f8d966d
Prefix configuration with GHE_ for consistency
cainejette Mar 31, 2020
9585b3b
Switch flag default
cainejette Mar 31, 2020
9089ab2
Add newline comment for consistency
cainejette Mar 31, 2020
5a4b69a
Change wording to match pages PR
cainejette Mar 31, 2020
d84080a
Merge branch 'master' into skip-audit-log-restore
cainejette Apr 1, 2020
230db23
Merge branch 'master' into skip-audit-log-restore
cainejette Apr 1, 2020
a13b7ff
Merge branch 'master' into skip-audit-log-restore
oakeyc Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions backup.config-example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ GHE_NUM_SNAPSHOTS=10
#
#GHE_RESTORE_HOST="github-standby.example.com"

# If set to 'yes', ghe-restore will omit the restore of audit logs.
#
#GHE_RESTORE_SKIP_AUDIT_LOGS=no

# When verbose output is enabled with `-v`, it's written to stdout by default. If
# you'd prefer it to be written to a separate file, set this option.
#
Expand Down
8 changes: 6 additions & 2 deletions bin/ghe-restore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,12 @@ fi
# Restore exported audit and hookshot logs to 2.12.9 and newer single nodes and
# all releases of cluster
if $CLUSTER || [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 2.12.9)" ]; then
echo "Restoring Audit logs ..."
ghe-restore-es-audit-log "$GHE_HOSTNAME" 1>&3
if [[ "$GHE_RESTORE_SKIP_AUDIT_LOGS" = "yes" ]]; then
echo "Skipping restore of audit logs."
else
echo "Restoring Audit logs ..."
ghe-restore-es-audit-log "$GHE_HOSTNAME" 1>&3
fi

echo "Restoring hookshot logs ..."
ghe-restore-es-hookshot "$GHE_HOSTNAME" 1>&3
Expand Down