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.

Sign up for GitHub

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

Jump to bottom

[Ingest Manager] Keep http and logging config during enroll #25132

Merged
merged 9 commits into from
Apr 20, 2021
Merged

[Ingest Manager] Keep http and logging config during enroll #25132

merged 9 commits into from
Apr 20, 2021

Conversation

michalpristas
Copy link
Contributor

@michalpristas michalpristas commented Apr 19, 2021 •
edited
Loading

What does this PR do?

At the moment all configuration is discarded when agent enrolls to fleet.
This PR enables persistence of settings for logging and http (exposing metrics).
Without this cloud is not able to set http endpoint and collect metrics from agent and processes

Why is it important?

Cloud

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 added enhancement needs_backport PR is waiting to be backported to other branches. Team:Ingest Management Team:Elastic-Agent Label for the Agent team labels Apr 19, 2021
@michalpristas michalpristas self-assigned this Apr 19, 2021
@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@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 19, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 19, 2021 •
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 #25132 updated

  • Start Time: 2021-04-20T07:57:33.978+0000

  • Duration: 50 min 14 sec

  • Commit: 5d76900

Test stats 🧪

Test Results
Failed 0
Passed 6788
Skipped 16
Total 6804

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 6788
Skipped 16
Total 6804

@ruflin ruflin mentioned this pull request Apr 19, 2021
Closed
@simitt simitt mentioned this pull request Apr 19, 2021
Closed
kvch
kvch reviewed Apr 19, 2021
View reviewed changes
x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go Outdated
return nil, err
}

persistantMap := make(map[string]interface{})
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: persistent

@mergify
Copy link
Contributor

mergify bot commented Apr 19, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b feat/keep-http upstream/feat/keep-http
git merge upstream/master
git push upstream feat/keep-http

simitt
simitt approved these changes Apr 20, 2021
View reviewed changes
Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

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

tested that through yesterday and changes looked good.

@michalpristas michalpristas merged commit 2fb65dc into elastic:master Apr 20, 2021
michalpristas added a commit to michalpristas/beats that referenced this pull request Apr 20, 2021
@michalpristas
[Ingest Manager] Keep http and logging config during enroll (elastic#…
bb19180 
…25132)

[Ingest Manager] Keep http and logging config during enroll (elastic#25132)
@michalpristas michalpristas mentioned this pull request Apr 20, 2021
Merged
6 tasks
michalpristas added a commit that referenced this pull request Apr 20, 2021
@michalpristas
[Ingest Manager] Keep http and logging config during enroll (#25132) (#…
291bbee 
…25168)

[Ingest Manager] Keep http and logging config during enroll (#25132)
v1v added a commit to v1v/beats that referenced this pull request Apr 20, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/customise…
2d9fb4d 
…-github-pr-comment-template

* upstream/master:
  [Ingest Manager] Keep http and logging config during enroll (elastic#25132)
  Refactor kubernetes autodiscover to avoid skipping short-living pods (elastic#24742)
  [libbeat] New decode xml wineventlog processor (elastic#25115)
  Add svc to agent k8s clusterRole (elastic#25146)
  Add awsfargate module to collect container logs from Amazon ECS on Fargate (elastic#25041)
  [Filebeat][Cisco ASA] log enhancement and performance (elastic#24744)
  Watch kubernetes namespaces for autodiscover metadata for pods (elastic#25117)
  Cyberark Privileged Access Security module (elastic#24803)
  [Elastic Agent] Log the container command output with LOGS_PATH (elastic#25150)
  Fix for tests after `device...` field has been removed (elastic#25141)
  [Ingest Manager] Restart process on output change (elastic#24907)
  Set --insecure in container when FLEET_SERVER_ENABLE and FLEET_INSECURE set. (elastic#25137)
  [filebeat] Update documentation / changelog / beta warnings for the syslog input (elastic#25047)
  Add support for ignore_inactive in filestream input (elastic#25036)
  Fix bug with annotations dedot config on k8s not used (elastic#25111)
v1v added a commit to v1v/beats that referenced this pull request Apr 22, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/pin-testi…
82ffbd4 
…ng-versions-stack

* upstream/master: (28 commits)
  Add support for parsers in filestream input (elastic#24763)
  Skip flaky test TestFilestreamTruncate (elastic#25218)
  backport: Add 7.13 branch (elastic#25189)
  Update decode_json_fields.asciidoc (elastic#25056)
  [Elastic Agent] Fix status and inspect command to work inside running container (elastic#25204)
  Check native environment before starting (elastic#25186)
  Change event.code and winlog.event_id type (elastic#25176)
  [Ingest Manager] Proxy processes/elastic-agent to stats (elastic#25193)
  Update mergify backporting to 7.x and 7.13 (elastic#25196)
  [Heartbeat]: ensure synthetics version co* [Heartbeat]: ensure synthetics version compatability for suites  * address review and fix notice  * fix lowercase struct  * fix version conflict and rebase  * update go.* stuff to master  * fix notice.txt  * move validate inside sourcempatability for suites (elastic#24777)
  [Filebeat] Ensure Kibana audit `event.category` and `event.type` are still processed as strings. (elastic#25101)
  Update replace.asciidoc (elastic#25055)
  Fix nil panic when overwriting metadata (elastic#24741)
  [Filebeat] Add Malware Bazaar to Threat Intel Module (elastic#24570)
  Fix k8s svc selectors mapping (elastic#25169)
  [Ingest Manager] Make agent retry values for bootstraping configurable (elastic#25163)
  [Metricbeat] Remove elasticsearc.index.created from the SM code (elastic#25113)
  [Ingest Manager] Keep http and logging config during enroll (elastic#25132)
  Refactor kubernetes autodiscover to avoid skipping short-living pods (elastic#24742)
  [libbeat] New decode xml wineventlog processor (elastic#25115)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simitt simitt simitt approved these changes

@kvch kvch kvch approved these changes

Assignees

@michalpristas michalpristas

Labels
enhancement needs_backport PR is waiting to be backported to other branches. Team:Elastic-Agent Label for the Agent team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@michalpristas @elasticmachine @kvch @simitt