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

[8.5](backport #1867) Change local fleet-server connection to localhost:8221 #1915

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 8, 2022

This is an automatic backport of pull request #1867 done by Mergify.
Cherry-pick of 8c7537b has failed:

On branch mergify/bp/8.5/pr-1867
Your branch is up to date with 'origin/8.5'.

You are currently cherry-picking commit 8c7537bd4a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   changelog/fragments/1669929902-fix-local-fleet-server-port.yaml
	modified:   internal/pkg/remote/client.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/agent/cmd/enroll_cmd.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Change local fleet-server connection to localhost:8221

Fix an issue where the local fleet-server port was not properly used by
the elastic-agent when running an instance of fleet-server.

* Fix typo

* Add additional debug line in remote client

* change to certificate verfication for local port

(cherry picked from commit 8c7537b)

# Conflicts:
#	internal/pkg/agent/cmd/enroll_cmd.go
@mergify mergify bot requested a review from a team as a code owner December 8, 2022 17:21
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 8, 2022
@mergify mergify bot requested review from blakerouse and michel-laterman and removed request for a team December 8, 2022 17:21
@sonarcloud
Copy link

sonarcloud bot commented Dec 8, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@elasticmachine
Copy link
Contributor

💔 Build Failed

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

Expand to view the summary

Build stats

  • Start Time: 2022-12-08T17:21:20.186+0000

  • Duration: 13 min 34 sec

Steps errors 4

Expand to view the steps failures

Go build
  • Took 1 min 53 sec . View more details here
  • Description: mage build
Go build
  • Took 1 min 1 sec . View more details here
  • Description: mage build
Go build
  • Took 1 min 20 sec . View more details here
  • Description: mage build
Go build
  • Took 1 min 8 sec . View more details here
  • Description: mage build

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages.

  • run integration tests : Run the Elastic Agent Integration tests.

  • run end-to-end tests : Generate the packages and run the E2E Tests.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@michel-laterman
Copy link
Contributor

8.5.3 is expected to be the final 8.5 release and this is too late to go in

@mergify mergify bot deleted the mergify/bp/8.5/pr-1867 branch December 8, 2022 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants