Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

cli: enable loading default profiles turnkey (backport #943) #1075

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 22, 2021

This is an automatic backport of pull request #943 done by Mergify.

Cherry-pick of ae5b9fe has failed:

On branch mergify/bp/7.12.x/pr-943
Your branch is up to date with 'origin/7.12.x'.

You are currently cherry-picking commit ae5b9fe3.
  (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:
	modified:   cli/NOTICE.txt
	modified:   cli/cmd/deploy.go
	modified:   cli/cmd/run.go
	modified:   cli/cmd/stop.go
	modified:   cli/cmd/sync.go
	renamed:    e2e/_suites/fleet/configurations/kibana.config.yml -> cli/config/compose/profiles/fleet/configurations/kibana.config.yml
	modified:   cli/config/compose/profiles/fleet/docker-compose.yml
	modified:   cli/config/config.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   cli/go.mod
	deleted by us:   cli/go.sum
	both modified:   e2e/_suites/fleet/ingest_manager_test.go

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

* cli: enable loading default profiles turnkey

Fixes #933
* update NOTICE
* Fix additional lint issues in ingest_manager_test
* Cleanup comment and trace log in GetComposeFile
* Provide better trace feedback if missing docker-compose
* Update cli/config/config.go
* chore: add back traces when extracting the files from the box (#946)
* fix: use a more comprehensive initialisation method for configs
   As go init() method is not deterministic, I found that the logger init was
   not called at the right time. With change we ensure that the Init is:
   1) called first
   2) existing it the config was already populated
* chore: add back traces when extracting the files from the box

Signed-off-by: Adam Stokes <[email protected]>
Co-authored-by: Manuel de la Peña <[email protected]>
(cherry picked from commit ae5b9fe)

# Conflicts:
#	cli/go.mod
#	cli/go.sum
#	e2e/_suites/fleet/ingest_manager_test.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Apr 22, 2021
@mdelapenya mdelapenya closed this Apr 22, 2021
@mergify mergify bot deleted the mergify/bp/7.12.x/pr-943 branch April 22, 2021 09:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
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