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

Indexing permissions as part of the Elastic Agent policy (bp #187) #192

Merged
merged 2 commits into from
Mar 30, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 30, 2021

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

Cherry-pick of a743bad has failed:

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

You are currently cherry-picking commit a743bad.
  (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:   cmd/fleet/schema.go
	modified:   fleet-server.yml
	modified:   internal/pkg/dl/policies.go
	modified:   internal/pkg/es/mapping.go
	modified:   internal/pkg/model/schema.go
	new file:   internal/pkg/policy/output_permissions.go
	new file:   internal/pkg/policy/output_permissions_test.go
	new file:   internal/pkg/smap/smap.go
	modified:   model/schema.json

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

* Indexing permissions as part of the Elastic Agent policy

* Delay the output key generation. Now it is dirven by the policy monitor policy updates.

(cherry picked from commit a743bad)

# Conflicts:
#	cmd/fleet/handleCheckin.go
#	cmd/fleet/handleEnroll.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Mar 30, 2021
@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 30, 2021

💚 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 #192 updated

  • Start Time: 2021-03-30T18:43:20.280+0000

  • Duration: 4 min 28 sec

  • Commit: 8953220

Test stats 🧪

Test Results
Failed 0
Passed 66
Skipped 0
Total 66

Trends 🧪

Image of Build Times

Image of Tests

@mergify
Copy link
Contributor Author

mergify bot commented Mar 30, 2021

This pull request is now in conflicts. 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/7.x/pr-187 upstream/mergify/bp/7.x/pr-187
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-187

@mergify mergify bot merged commit 2729c2e into 7.x Mar 30, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-187 branch March 30, 2021 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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