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.

Sign up for GitHub

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

Jump to bottom

[21.11] elk7: 7.11.1 -> 7.16.1, 6.8.3 -> 6.8.21 + add filebeat module and tests #150986

Merged
merged 6 commits into from
Dec 16, 2021
Merged

[21.11] elk7: 7.11.1 -> 7.16.1, 6.8.3 -> 6.8.21 + add filebeat module and tests #150986

merged 6 commits into from
Dec 16, 2021

Conversation

talyz
Copy link
Contributor

@talyz talyz commented Dec 16, 2021

Motivation for this change

Backport #150879 to 21.11.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

talyz added 6 commits December 16, 2021 17:17
@talyz
elk7: 7.11.1 -> 7.16.1
386506c 
(cherry picked from commit 6c5a533)
@talyz
nixosTests.elk: Improve reliability and compatibility with ELK 7.x
bd8496f 
- Use comparisons in jq instead of grepping
- Match for `.hits.total.value` if version >= 7, otherwise it always
  passes
- Make curl fail if requests fails

(cherry picked from commit 9647a42)
@talyz
nixos/filebeat: Add initial module and test
65cdf44 
Filebeat is an open source file harvester, mostly used to fetch logs
files and feed them into logstash.

This module can be used instead of journalbeat if used with
`filebeat7` and configured with the `journald` input.

(cherry picked from commit 6c9c2b4)
@talyz
python3Packages.parsedmarc.tests: Fix breakage
92b0427 
- Don't use the deprecated elasticsearch7-oss package
- Improve jq query robustness and add tracing

(cherry picked from commit b38f44c)
@talyz
elk6: 6.8.3 -> 6.8.21
d032da6 
The latest version includes a fix for CVE-2021-44228.

(cherry picked from commit b617526)
@talyz
rl-21.11: Note the addition of the filebeat service
82ecc36
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 16, 2021
@talyz talyz added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Dec 16, 2021
@talyz talyz mentioned this pull request Dec 16, 2021
Closed
@talyz talyz merged commit b448fe7 into NixOS:release-21.11 Dec 16, 2021
@talyz talyz deleted the elk-backport branch December 16, 2021 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apeschar apeschar Awaiting requested review from apeschar

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

@kalbasit kalbasit Awaiting requested review from kalbasit

@basvandijk basvandijk Awaiting requested review from basvandijk

Assignees
No one assigned
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: clean-up 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@talyz