Skip to content

Cherry-pick #21884 to 7.x: Use ML_SYSTEM to detect if agent is running as a service#22049

Merged
michalpristas merged 3 commits intoelastic:7.xfrom
michalpristas:backport_21884_7.x
Oct 22, 2020
Merged

Cherry-pick #21884 to 7.x: Use ML_SYSTEM to detect if agent is running as a service#22049
michalpristas merged 3 commits intoelastic:7.xfrom
michalpristas:backport_21884_7.x

Conversation

@michalpristas
Copy link
Copy Markdown
Contributor

@michalpristas michalpristas commented Oct 21, 2020 •
edited by andresrc
Loading

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

What does this PR do?

We were using SERVICE token to detect whether or not agent is running as a service. But it turned out that in many cases this token is missing.

We decided that it would be better to use ML_SYSTEM which should be close enough to detect high elevated runs == service runs.

Why is it important?

TO make agent upgradeable even on windows.
Fixes: #21822

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
[Ingest Manager] Use ML_SYSTEM to detect if agent is running as a ser…
3d4b6f5 
…vice (elastic#21884)

[Ingest Manager] Use ML_SYSTEM to detect if agent is running as a service (elastic#21884)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 21, 2020
@michalpristas michalpristas self-assigned this Oct 21, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 21, 2020

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 21, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 21, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #22049 updated]

  • Start Time: 2020-10-21T15:50:38.047+0000

  • Duration: 38 min 11 sec

Test stats 🧪

Test Results
Failed 0
Passed 1394
Skipped 4
Total 1398

blakerouse
blakerouse approved these changes Oct 21, 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 1b74af1 into elastic:7.x Oct 22, 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