Skip to content

Cherry-pick #21473 to 7.x: Prompt only when agent is already enrolled #21506

Merged
michalpristas merged 1 commit intoelastic:7.xfrom
michalpristas:backport_21473_7.x
Oct 5, 2020
Merged

Cherry-pick #21473 to 7.x: Prompt only when agent is already enrolled #21506
michalpristas merged 1 commit intoelastic:7.xfrom
michalpristas:backport_21473_7.x

Conversation

@michalpristas
Copy link
Copy Markdown
Contributor

@michalpristas michalpristas commented Oct 5, 2020

Cherry-pick of PR #21473 to 7.x branch. Original message:

What does this PR do?

Currently when you install Elastic Agent for the first time and then issue the enroll command it prompts the user "This will replace your current settings. Do you want to continue? [Y/n]" However, there are no current settings so it should not show this prompt. It should only be shown when overwriting existing settings.

Why is it important?

Fixes #20068

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@michalpristas michalpristas self-assigned this Oct 5, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 5, 2020

Pinging @elastic/ingest-management (Team:Ingest Management)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 5, 2020
@botelastic
Copy link
Copy Markdown

botelastic bot commented Oct 5, 2020

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 5, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21506 opened]

  • Start Time: 2020-10-05T07:43:35.588+0000

  • Duration: 35 min 3 sec

Test stats 🧪

Test Results
Failed 0
Passed 1384
Skipped 4
Total 1388

blakerouse
blakerouse approved these changes Oct 5, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Backport looks good.

@michalpristas michalpristas merged commit 477a33e into elastic:7.x Oct 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blakerouse blakerouse blakerouse approved these changes

Assignees

@michalpristas michalpristas

Labels

backport bug Ingest Management:beta2 Group issues for ingest management beta2

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@michalpristas @elasticmachine @blakerouse