Skip to content

[7.15](backport #26975) Add username to ASA Security negotiation log#28783

Closed
mergify[bot] wants to merge 1 commit into7.15from
mergify/bp/7.15/pr-26975
Closed

[7.15](backport #26975) Add username to ASA Security negotiation log#28783
mergify[bot] wants to merge 1 commit into7.15from
mergify/bp/7.15/pr-26975

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Nov 3, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #26975 done by Mergify.
Cherry-pick of df6fde2 has failed:

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

You are currently cherry-picking commit df6fde2525.
  (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
	modified:   x-pack/filebeat/module/cisco/shared/ingest/asa-ftd-pipeline.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/module/cisco/asa/test/additional_messages.log
	both modified:   x-pack/filebeat/module/cisco/asa/test/additional_messages.log-expected.json

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.io/

@LaZyDK
Add username to ASA Security negotiation log (#26975)
c4ea5b3 
* Add username to ASA Security negotiation log

I added the username user.name field to ASA Security negotiation log line.

* adding support for both formats

* adding changelog entry

* updating geo fields in expected output files

* reverse formatting

* reverting to older version of file

* reverting formatting again

* regenrate golden files again

* remove formatting, ready for review

* fixing missing message due to no newline

* fix dissect pattern to fit correctly

Co-authored-by: Marius Iversen <marius.iversen@elastic.co>
(cherry picked from commit df6fde2)

# Conflicts:
#	x-pack/filebeat/module/cisco/asa/test/additional_messages.log
#	x-pack/filebeat/module/cisco/asa/test/additional_messages.log-expected.json
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 3, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 3, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 3, 2021 •
edited by jenkins-beats-ci bot
Loading

💔 Build Failed

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

  • Duration: 134 min 53 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 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.

@mtojek
Copy link
Copy Markdown
Contributor

mtojek commented Nov 8, 2021

/test

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Nov 8, 2021

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.15/pr-26975 upstream/mergify/bp/7.15/pr-26975
git merge upstream/7.15
git push upstream mergify/bp/7.15/pr-26975

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 9, 2021

Pinging @elastic/siem (Team:SIEM)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 9, 2021
@jsoriano jsoriano mentioned this pull request Nov 15, 2021
Merged
@botelastic
Copy link
Copy Markdown

botelastic bot commented Dec 9, 2021

Hi!
We just realized that we haven't looked into this PR in a while. We're sorry!

We're labeling this issue as Stale to make it hit our filters and make sure we get back to it in as soon as possible. In the meantime, it'd be extremely helpful if you could take a look at it as well and confirm its relevance. A simple comment with a nice emoji will be enough :+1.
Thank you for your contribution!

@botelastic botelastic bot added the Stalled label Dec 9, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Dec 12, 2021

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

@botelastic botelastic bot removed the Stalled label Dec 12, 2021
@andrewkroh
Copy link
Copy Markdown
Member

andrewkroh commented Dec 12, 2021

7.15 is not getting any more updates.

@andrewkroh andrewkroh closed this Dec 12, 2021
@mergify mergify bot deleted the mergify/bp/7.15/pr-26975 branch December 12, 2021 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elasticmachine @mtojek @andrewkroh @LaZyDK