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

[7.17](backport #30072) [Filebeat] Fix Cisco ASA/FTD configs that used var.input syslog #30325

Merged
merged 3 commits into from
Feb 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 10, 2022

This is an automatic backport of pull request #30072 done by Mergify.
Cherry-pick of 3ddfd1f has failed:

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

You are currently cherry-picking commit 3ddfd1f063.
  (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:   CHANGELOG.next.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/module/cisco/asa/config/input.yml
	both modified:   x-pack/filebeat/module/cisco/ftd/config/input.yml

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

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 10, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 10, 2022
@botelastic
Copy link

botelastic bot commented Feb 10, 2022

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 10, 2022

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-02-14T21:23:23.188+0000

  • Duration: 108 min 53 sec

Test stats 🧪

Test Results
Failed 0
Passed 8570
Skipped 1209
Total 9779

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

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

- Add tcp option to asa, ftd & ios filesets
- Add SSL option

Closes #28821

Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>
and FTD that specified `var.input: syslog`. `syslog` was effectively an alias for the UDP
input and the alias support was removed.

This change allows `var.input: syslog` to continue working as it did before.
@andrewkroh
Copy link
Member

I had to bring in #26159 because it was missing from 7.17.

@mergify
Copy link
Contributor Author

mergify bot commented Feb 14, 2022

This pull request has not been merged yet. Could you please review and merge it @andrewkroh? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Feb 14, 2022

This pull request is now in conflicts. Could you fix it? 🙏
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.17/pr-30072 upstream/mergify/bp/7.17/pr-30072
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-30072

@andrewkroh andrewkroh merged commit fdaa153 into 7.17 Feb 15, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-30072 branch February 15, 2022 03:11
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants