Skip to content
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.

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

Backport of NET 1594 - Snapshot Agent Filename Should Include Consul Version / Datacenter into release/1.16.x #18638

Merged

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #18625 to be assessed for backporting due to the inclusion of the label backport/1.16.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@absolutelightning
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "070a87a90cdbb111d508e112ac8225131d7b474f", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

Adds flag -append-filename (which works on values version, dc, node and status) to consul snapshot save command.
Adding the flag -append-filename version,dc,node,status will add consul version, consul datacenter, node name and leader/follower
(status) in the file name given in the snapshot save command before the file extension.

Testing & Reproduction steps

CI
Manual Testing -
make dev
./bin/consul agent -dev

asheshvidyut@asheshvidyut-H2GX766V9T ~/test » ~/consul/bin/consul snapshot save -append-filename node,status,version,dc backup.tgz
Saved and verified snapshot to index 58
asheshvidyut@asheshvidyut-H2GX766V9T ~/test » ls
backup-1.17.0-dc1-asheshvidyut-H2GX766V9T-leader.tgz

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@github-actions github-actions bot added type/docs Documentation needs to be created/updated/clarified theme/cli Flags and documentation for the CLI interface labels Sep 1, 2023
absolutelightning and others added 2 commits September 4, 2023 12:07
…tacenter (#18625)

* init

* tests added and few fixes

* revert arg message

* changelog added

* removed var declaration

* fix CI

* fix test

* added node name and status

* updated save.mdx

* added example

* fix tense

* fix description
…b.com/hashicorp/consul into backport/NET-1594/trivially-giving-clam
@absolutelightning absolutelightning enabled auto-merge (squash) September 4, 2023 06:44
@absolutelightning absolutelightning merged commit 836b85e into release/1.16.x Sep 4, 2023
83 checks passed
@absolutelightning absolutelightning deleted the backport/NET-1594/trivially-giving-clam branch September 4, 2023 06:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/cli Flags and documentation for the CLI interface type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants