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

Add --fleet-server-service-token. Rename --fleet-server to --fleet-server-es. #25083

Merged
merged 2 commits into from
Apr 14, 2021

Conversation

blakerouse
Copy link
Contributor

@blakerouse blakerouse commented Apr 14, 2021

What does this PR do?

Adds a new --fleet-server-service-token flag to the install and enroll command. Adds a new FLEET_SERVER_SERVICE_TOKEN to container command.

This also renames the --fleet-server to --fleet-server-es for the install and enroll command. The previous --fleet-server flag was confusing based on the name. This does not affect the container command.

When providing the --fleet-server-service-token the username and password from the --fleet-server-es are not required and are ignored if both are provided.

Why is it important?

To support the addition of service tokens this is required to allow the install, enroll and the container to authenticate with service tokens.

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.

How to test this PR locally

$ sudo ./elastic-agent install --fleet-server-es http://localhost:9200 --fleet-server-service-token ${token}

@blakerouse blakerouse added Team:Elastic-Agent Label for the Agent team backport-v7.13.0 Automated backport with mergify labels Apr 14, 2021
@blakerouse blakerouse self-assigned this Apr 14, 2021
@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 Apr 14, 2021
@blakerouse blakerouse marked this pull request as ready for review April 14, 2021 14:33
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

Copy link
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

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

lgtm

@mostlyjason
Copy link

@hbharding @dedemorton FYI this will affect the docs, and our future UI

@elasticmachine
Copy link
Collaborator

💚 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 #25083 opened

  • Start Time: 2021-04-14T14:35:39.667+0000

  • Duration: 64 min 21 sec

  • Commit: 1ddaf27

Test stats 🧪

Test Results
Failed 0
Passed 6740
Skipped 16
Total 6756

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6740
Skipped 16
Total 6756

@blakerouse blakerouse merged commit f84ee64 into elastic:master Apr 14, 2021
@blakerouse blakerouse deleted the fleet-server-service-tokens branch April 14, 2021 19:16
mergify bot pushed a commit that referenced this pull request Apr 14, 2021
…rver-es. (#25083)

* Add --fleet-server-service-token. Rename --fleet-server to --fleet-server-es.

* Add changelog.

(cherry picked from commit f84ee64)
blakerouse added a commit that referenced this pull request Apr 14, 2021
…rver-es. (#25083) (#25094)

* Add --fleet-server-service-token. Rename --fleet-server to --fleet-server-es.

* Add changelog.

(cherry picked from commit f84ee64)

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
v1v added a commit to v1v/beats that referenced this pull request Apr 15, 2021
* upstream/master:
  packer cache support for the 7.x and 7.latestMinor branches (elastic#25091)
  Remove EventFetcher and EventsFetcher interface (elastic#25093)
  Update go-structform to 0.0.8 (elastic#25051)
  Update copy_fields.asciidoc (elastic#25053)
  [elastic-agent] ensure container is backwards compatible (elastic#25092)
  Add --fleet-server-service-token. Rename --fleet-server to --fleet-server-es. (elastic#25083)
  Add cgroup.cpuacct percentages (elastic#25057)
  Add tests for truncated and symlinked files in filestream input (elastic#24425)
  Fix panic when Hearbeat monitor initialization fails twice (elastic#25073)
  [Filebeat][httpjson] Change append transform to initiate new fields as a slice (elastic#25074)
  Osquerybeat: Result values type translation (elastic#25012)
  Update Osquerybeat spec to get it downloading from the correct artifactory path (elastic#25076)
  Fix changelog (elastic#25079)
  Strip Azure EventHub connection string in debug logs (elastic#25066)
  Change googlecloud to gcp in field names (elastic#25038)
  Bump stack version to 7.12.0 for testing (elastic#24957)
  packer-cache: cache the existing docker images on ARM and some more (elastic#25068)
  Disable logstash TestFetch flaky test (elastic#25044)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v7.13.0 Automated backport with mergify Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants