Merge release 1.4.0 - Githubissues

cisagov / LME

Logging Made Easy (LME) is a no cost, open source platform that centralizes log collection, enhances threat detection, and enables real-time alerting, helping small to medium-sized organizations secure their infrastructure.

https://www.cisa.gov/resources-tools/services/logging-made-easy

Other

892 stars 72 forks source link

Merge release 1.4.0 #394

Closed cbaxley closed 3 months ago

cbaxley commented 3 months ago

🗣 Description

Fixes the merge conflicts from main to 1.4.0

💭 Motivation and context

There were some merge conflicts in 1.4.0

🧪 Testing

Run the pipeline tests

✅ Pre-approval checklist

[x] Changes are limited to a single goal AND the title reflects this in a clear human readable format
[x] Issue that this PR solves has been selected in the Development section
[x] I have read and agree to LME's CONTRIBUTING.md document.
[x] The PR adheres to LME's requirements in RELEASES.md
[x] These code changes follow cisagov code standards.
[x] All relevant repo and/or project documentation has been updated to reflect the changes in this PR.

✅ Pre-merge Checklist

[x] All tests pass
[x] PR has been tested and the documentation for testing is above
[x] Squash and merge all commits into one PR level commit

✅ Post-merge Checklist

[x] Delete the branch to keep down number of branches