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

[Filebeat] Fix Cisco ASA/FTD configs that used var.input syslog #30072

Merged

Conversation

andrewkroh
Copy link
Member

@andrewkroh andrewkroh commented Jan 27, 2022

What does this PR do?

#26159 accidentally introduced a breaking change for existing users of Cisco ASA
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.

Why is it important?

We don't want to introduce breaking changes.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@andrewkroh andrewkroh added bug module Filebeat Filebeat Team:Security-External Integrations backport-v8.0.0 Automated backport with mergify backport-7.17 Automated backport to the 7.17 branch with mergify labels Jan 27, 2022
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jan 27, 2022
@andrewkroh andrewkroh force-pushed the bugfix/fb/cisco-asa-ftd-syslog-config branch 2 times, most recently from 15a94b1 to bc8f03b Compare January 27, 2022 19:46
@andrewkroh andrewkroh marked this pull request as ready for review January 27, 2022 19:46
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jan 27, 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-09T17:03:19.856+0000

  • Duration: 108 min 58 sec

Test stats 🧪

Test Results
Failed 0
Passed 2429
Skipped 154
Total 2583

💚 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!)

@mergify
Copy link
Contributor

mergify bot commented Feb 1, 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 bugfix/fb/cisco-asa-ftd-syslog-config upstream/bugfix/fb/cisco-asa-ftd-syslog-config
git merge upstream/master
git push upstream bugfix/fb/cisco-asa-ftd-syslog-config

@andrewkroh andrewkroh added the backport-v8.1.0 Automated backport with mergify label Feb 3, 2022
@andrewkroh
Copy link
Member Author

@Mergifyio rebase

elastic#26159 accidentally introduced a breaking change for existing users of Cisco ASA
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 andrewkroh force-pushed the bugfix/fb/cisco-asa-ftd-syslog-config branch from bc8f03b to 075eae9 Compare February 9, 2022 00:51
@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2022

rebase

✅ Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 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 bugfix/fb/cisco-asa-ftd-syslog-config upstream/bugfix/fb/cisco-asa-ftd-syslog-config
git merge upstream/main
git push upstream bugfix/fb/cisco-asa-ftd-syslog-config

@andrewkroh andrewkroh merged commit 3ddfd1f into elastic:main Feb 10, 2022
mergify bot pushed a commit that referenced this pull request Feb 10, 2022
#26159 accidentally introduced a breaking change for existing users of Cisco ASA
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.

(cherry picked from commit 3ddfd1f)

# Conflicts:
#	x-pack/filebeat/module/cisco/asa/config/input.yml
#	x-pack/filebeat/module/cisco/ftd/config/input.yml
mergify bot pushed a commit that referenced this pull request Feb 10, 2022
#26159 accidentally introduced a breaking change for existing users of Cisco ASA
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.

(cherry picked from commit 3ddfd1f)
mergify bot pushed a commit that referenced this pull request Feb 10, 2022
#26159 accidentally introduced a breaking change for existing users of Cisco ASA
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.

(cherry picked from commit 3ddfd1f)
andrewkroh added a commit that referenced this pull request Feb 10, 2022
…) (#30327)

#26159 accidentally introduced a breaking change for existing users of Cisco ASA
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.

(cherry picked from commit 3ddfd1f)

Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
andrewkroh added a commit that referenced this pull request Feb 10, 2022
… var.input syslog (#30326)

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

#26159 accidentally introduced a breaking change for existing users of Cisco ASA
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.

(cherry picked from commit 3ddfd1f)

Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
andrewkroh added a commit that referenced this pull request Feb 10, 2022
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 added a commit that referenced this pull request Feb 15, 2022
…d var.input syslog (#30325)

* [Filebeat] Enable dynamic inputs (TCP) for Cisco syslog modules (#26159)

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

Closes #28821

Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>

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

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.

Co-authored-by: Alex Resnick <adr8292@gmail.com>
Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>
Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify bug Filebeat Filebeat module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants