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] Fix issue with FLEET_CA not being used with Fleet Server in container #26529

Merged
merged 2 commits into from
Jun 28, 2021

Conversation

blakerouse
Copy link
Contributor

@blakerouse blakerouse commented Jun 28, 2021

What does this PR do?

Fixes issue where the FLEET_CA environment variable or configuration was being ignored when Fleet Server bootstrap was being used in the container.

Why is it important?

So custom generated certificate can be verified with the custom CA.

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.

Related issues

@blakerouse blakerouse added Team:Elastic-Agent Label for the Agent team backport-v7.14.0 Automated backport with mergify labels Jun 28, 2021
@blakerouse blakerouse self-assigned this Jun 28, 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 Jun 28, 2021
@blakerouse blakerouse changed the title [Elastic Agent[ Fix issue with FLEET_CA not being used with Fleet Server in container [Elastic Agent] Fix issue with FLEET_CA not being used with Fleet Server in container Jun 28, 2021
@blakerouse blakerouse marked this pull request as ready for review June 28, 2021 15:10
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@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 #26529 updated

  • Start Time: 2021-06-28T15:10:32.690+0000

  • Duration: 92 min 30 sec

  • Commit: ec38cca

Test stats 🧪

Test Results
Failed 0
Passed 6964
Skipped 16
Total 6980

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 6964
Skipped 16
Total 6980

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

@blakerouse blakerouse merged commit a8cb588 into elastic:master Jun 28, 2021
@blakerouse blakerouse deleted the fix-fleet-ca branch June 28, 2021 17:22
mergify bot pushed a commit that referenced this pull request Jun 28, 2021
…ver in container (#26529)

* Fix issue with FLEET_CA not being used with fleet server is enabled in container.

* Add changelog.

(cherry picked from commit a8cb588)

# Conflicts:
#	x-pack/elastic-agent/CHANGELOG.asciidoc
blakerouse added a commit that referenced this pull request Jun 28, 2021
…ing used with Fleet Server in container (#26540)

* [Elastic Agent] Fix issue with FLEET_CA not being used with Fleet Server in container (#26529)

* Fix issue with FLEET_CA not being used with fleet server is enabled in container.

* Add changelog.

(cherry picked from commit a8cb588)

# Conflicts:
#	x-pack/elastic-agent/CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
mdelapenya added a commit to mdelapenya/beats that referenced this pull request Jun 29, 2021
* master:
  Osquerybeat: set the raw index name to supress the timestamp suffix (elastic#26545)
  [Heartbeat] add screenshots config to synthetics (elastic#26455)
  [Elastic Agent] Use http2 to connect to Fleet Server. (elastic#26474)
  Remove all docs about  Beats central management (elastic#26399)
  update data.json for gcp billing (elastic#26506)
  Skip x-pack metricbeat tests (elastic#26537)
  [Elastic Agent] Fix issue with FLEET_CA not being used with Fleet Server in container (elastic#26529)
  Add changelog entry for  elastic#26224 (elastic#26531)
  Add inttests for the x-pack/metricbeat on a PR/branches basis (elastic#26526)
  Suppress too many errors (elastic#26224)
  Fix master's linting issue (elastic#26517)
  [libbeat] Fix encoding and file offset issues in the disk queue (elastic#26484)
  Add log_group_name_prefix config option for aws-cloudwatch input (elastic#26187)
  Update shared-deduplication.asciidoc (elastic#26492)
  Add Recorded Future support to threatintel module (elastic#26481)
v1v added a commit to v1v/beats that referenced this pull request Jun 29, 2021
…arwin-arm64

* upstream/master: (295 commits)
  Update urllib to 1.26.5. (elastic#26380)
  Update golang.org/x/crypto (elastic#26448)
  [Filebeat] Update Fortinet Ingest Pipeline (elastic#24816)
  Move parsers outside of filestream input so others can use them as well (elastic#26541)
  [Filebeat] Fix `threatintel.indicator.url.full` field not populating (elastic#26508)
  [Filebeat] Add network direction processor to Zeek and Suricata modules (elastic#24620)
  Logging code cleanup related to Nomad auto-discovery (elastic#26498)
  [Metricbeat] Add Couchbase's Sync Gateway module (elastic#25599)
  Refactor add_cloud_metadata to handle ECS fields easier (elastic#26438)
  [Elastic Agent] Improper casting of int64 (elastic#26520)
  [Elastic Agent] Enable configuring monitoring namespace (elastic#26439)
  [Heartbeat] configure permissions for synthetics config (elastic#26393)
  Osquerybeat: set the raw index name to supress the timestamp suffix (elastic#26545)
  [Heartbeat] add screenshots config to synthetics (elastic#26455)
  [Elastic Agent] Use http2 to connect to Fleet Server. (elastic#26474)
  Remove all docs about  Beats central management (elastic#26399)
  update data.json for gcp billing (elastic#26506)
  Skip x-pack metricbeat tests (elastic#26537)
  [Elastic Agent] Fix issue with FLEET_CA not being used with Fleet Server in container (elastic#26529)
  Add changelog entry for  elastic#26224 (elastic#26531)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v7.14.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.

When using Elastic Agent container command, setting FLEET_CA doesn't work if FLEET_SERVER_ENABLE is set
3 participants