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

[elastic-agent] Use fleet.url for container cmd #25026

Merged
merged 1 commit into from
Apr 13, 2021

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Apr 12, 2021

What does this PR do?

When running the elastic-agent container command with fleet-server.enable:true and providing --url, --fleet-server-cert and --fleet-server-cert-key, the container returns a setup error, claiming that url is not set.
This PR ensures that the URL is also set for fleet server setup.

Previous related: #24904

Why is it important?

This is important as otherwise no certificate and cert-key could ever be configured for the Fleet Server. When only Fleet Server and Elastic-Agent communicate with each other, certificates are created on-the-fly and communication is secured. But one also needs to be able to use a secure connection and certificates e.g. from a proxy to the Fleet Server.

Apply fleet server URL on startup if given.
@simitt simitt added v7.13.0 Team:Fleet Label for the Fleet team labels Apr 12, 2021
@simitt simitt requested a review from blakerouse April 12, 2021 16:16
@elasticmachine
Copy link
Collaborator

Pinging @elastic/fleet (Team:Fleet)

@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 12, 2021
@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 #25026 opened

  • Start Time: 2021-04-12T16:17:22.958+0000

  • Duration: 55 min 53 sec

  • Commit: 3a7083d

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

@simitt
Copy link
Contributor Author

simitt commented Apr 13, 2021

@blakerouse could you please review this, the cloud proxy changes are blocked until this is in the snapshot.

Copy link
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.

+1

@simitt simitt merged commit e8afb8d into elastic:master Apr 13, 2021
@simitt simitt added the backport-v7.13.0 Automated backport with mergify label Apr 13, 2021
mergify bot pushed a commit that referenced this pull request Apr 13, 2021
Apply fleet server URL on startup if given.

(cherry picked from commit e8afb8d)
simitt added a commit that referenced this pull request Apr 13, 2021
Apply fleet server URL on startup if given.

(cherry picked from commit e8afb8d)

Co-authored-by: Silvia Mitter <[email protected]>
v1v added a commit to v1v/beats that referenced this pull request Apr 14, 2021
* upstream/master: (308 commits)
  [winlogbeat] Add support for sysmon v13 events 24 and 25 (elastic#24945)
  mergify: add backport label (elastic#25050)
  Add pod.ip in k8s metadata (elastic#25037)
  [elastic-agent] Use fleet.url for container cmd (elastic#25026)
  disable TestXPackEnabled flaky test in logstash metricbeat module (elastic#25034)
  Leverege leader election in agent  k8s manifests (elastic#25016)
  libbeat/publisher/pipeline: expand monitoring (elastic#24700)
  libbeat: fix decode_json_fields config validation (elastic#24862)
  Remove make docs-preview instructions (elastic#25001)
  [Filebeat] Fix IPtables pipeline (elastic#24928)
  [DOCS] cd into correct directory before invoking mage. (elastic#17679)
  Add -buildmode=pie for supported platform (elastic#24964)
  Add agent's direcotry in k8s manifest generator (elastic#24987)
  [mergify] assign the original author (elastic#25007)
  Fix AWS module flaky tests (elastic#24852)
  [filebeat] Use fail_on_template_error on google_workspace and okta pagination (elastic#24967)
  Updated config to match defaults (elastic#25004)
  [Filebeat] Fix hardcoded amazonaws.com endpoint (elastic#24861)
  Add cloud.service.name to add_cloud_metadata (elastic#24993)
  [Ingest Manager] Expose processes and their metrics (elastic#24788)
  ...
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:Fleet Label for the Fleet team v7.13.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants