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

[8.0](backport #2111) chore: use preconfigured policy for fleet-server's default policy #2116

Merged
merged 3 commits into from
Feb 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 8, 2022

This is an automatic backport of pull request #2111 done by Mergify.
Cherry-pick of 5ed1aff has failed:

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

You are currently cherry-picking commit 5ed1aff.
  (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/config/compose/profiles/fleet/default/kibana.config.yml
	modified:   cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml
	modified:   internal/kibana/policies.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   e2e/_suites/fleet/fleet.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

)

(cherry picked from commit 5ed1aff)

# Conflicts:
#	e2e/_suites/fleet/fleet.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Feb 8, 2022
@mdelapenya
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Feb 8, 2022

refresh

✅ Pull request refreshed

@mergify
Copy link
Contributor Author

mergify bot commented Feb 8, 2022

This pull request is now in conflict. Could you fix it @mergify[bot]? 🙏
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 mergify/bp/8.0/pr-2111 upstream/mergify/bp/8.0/pr-2111
git merge upstream/8.0
git push upstream mergify/bp/8.0/pr-2111

@elasticmachine
Copy link
Contributor

elasticmachine commented Feb 8, 2022

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@mdelapenya mdelapenya removed the conflicts There is a conflict in the backported pull request label Feb 8, 2022
@mdelapenya mdelapenya merged commit 9b00e41 into 8.0 Feb 8, 2022
@mergify mergify bot deleted the mergify/bp/8.0/pr-2111 branch February 8, 2022 16:40
mdelapenya added a commit to mdelapenya/e2e-testing that referenced this pull request Feb 10, 2022
…for fleet-server's default policy (elastic#2116)"

This reverts commit 9b00e41.
mdelapenya added a commit that referenced this pull request Feb 10, 2022
…et-server's default policy (#2116)" (#2133)

This reverts commit 9b00e41.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants