Skip to content

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

Merged
asheshvidyut merged 12 commits intorelease/1.14.xfrom
backport/NET-1594/extremely-natural-orca
Sep 4, 2023
Merged

Backport of NET 1594 - Snapshot Agent Filename Should Include Consul Version / Datacenter into release/1.14.x#18637
asheshvidyut merged 12 commits intorelease/1.14.xfrom
backport/NET-1594/extremely-natural-orca

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

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

🚨

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

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-1594/extremely-natural-orca branch from d291256 to aacd5e2 Compare September 1, 2023 07:12
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging September 1, 2023 07:12 Inactive
@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
Copy link
Copy Markdown
Collaborator

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

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator Author

🤔 This PR has changes in the website/ directory but does not have a type/docs-cherrypick label. If the changes are for the next version, this can be ignored. If they are updates to current docs, attach the label to auto cherrypick to the stable-website branch after merging.

@vercel vercel bot temporarily deployed to Preview – consul September 1, 2023 07:24 Inactive
@asheshvidyut asheshvidyut marked this pull request as ready for review September 4, 2023 06:26
@asheshvidyut asheshvidyut requested a review from a team as a code owner September 4, 2023 06:26
@asheshvidyut asheshvidyut enabled auto-merge (squash) September 4, 2023 06:26
…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
@asheshvidyut asheshvidyut enabled auto-merge (squash) September 4, 2023 06:49
auto-merge was automatically disabled September 4, 2023 06:56

Pull request was closed

@asheshvidyut asheshvidyut reopened this Sep 4, 2023
@asheshvidyut asheshvidyut enabled auto-merge (squash) September 4, 2023 07:15
@asheshvidyut asheshvidyut removed the request for review from a team September 4, 2023 07:21
@asheshvidyut asheshvidyut merged commit 7e563ef into release/1.14.x Sep 4, 2023
@asheshvidyut asheshvidyut deleted the backport/NET-1594/extremely-natural-orca branch September 4, 2023 07:21
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