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

🍒 Merge changes from PR #293 to release-v1.6.0 #295

Merged
merged 3 commits into from
Oct 7, 2024

Conversation

ocrvs-bot
Copy link
Collaborator

Automated PR to merge changes from develop to release-v1.6.0

I failed to cherry-pick the changes automatically because of the following:

Auto-merging package.json
[auto-pr-release-v1.6.0-293-5981 62d29e32] fix misconfigured alerts between Kibana ndjson & Elastalert
Author: Riku Rouvila <[email protected]>
Date: Mon Oct 7 13:52:25 2024 +0300
4 files changed, 580 insertions(+), 9 deletions(-)
create mode 100644 tests/verify-elastalert-kibana-alerts-match.test.ts
Auto-merging .github/workflows/auto-pr-to-release.yml
CONFLICT (content): Merge conflict in .github/workflows/auto-pr-to-release.yml
error: could not apply 036170a2... update auto-pr workflow

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-293-5981:auto-pr-release-v1.6.0-293-5981
git fetch origin fix-kibana-elastalert-configuration:fix-kibana-elastalert-configuration

git checkout auto-pr-release-v1.6.0-293-5981
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick c559e445 036170a2 366f92a6

@rikukissa rikukissa force-pushed the auto-pr-release-v1.6.0-293-5981 branch from 79a5809 to 77a9a7a Compare October 7, 2024 12:42
@rikukissa rikukissa merged commit ad3ba02 into release-v1.6.0 Oct 7, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants