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

release-17.09: ELK: 5.6.1 -> 5.6.5 & add ELK 6.1.0 #33860

Merged
merged 3 commits into from Jan 17, 2018
Merged

release-17.09: ELK: 5.6.1 -> 5.6.5 & add ELK 6.1.0 #33860

merged 3 commits into from Jan 17, 2018

Conversation

basvandijk
Copy link
Member

Motivation for this change

This is a cherry-pick of #32822 on release-17.09 which upgrades ELK-5 and adds ELK-6.

The test suite is extended to test both ELK-5 and ELK-6.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Ping @srhb.

@srhb
Copy link
Contributor

srhb commented Jan 16, 2018

@basvandijk For the record, I feel a little too green to sign off on the inclusion into 17.09 on my own. Not ignoring you. :-)
We should probably ping another ELK contributor.

@basvandijk
Copy link
Member Author

basvandijk commented Jan 16, 2018 •
edited

@srhb no problem, I understand.

@fpletz would you be able to make a decision on this?

To sum up this cherry-pick PR:

  • This PR performs bug-fix upgrades for the attributes elasticsearch5, logstash5, kibana5 and the beats (filebeat, heartbeat, metricbeat and packetbeat).

  • It adds the attributes elasticsearch6, logstash6, kibana6 and the beats (filebeat6, heartbeat6, metricbeat6 and packetbeat6).

  • Although this PR adds a new major release of the ELK stack it doesn't break backwards-compatibility because we leave the existing elasticsearch5 (and others) attributes.

  • I think it's important that we add ELK-6 to NixOS-17.09 in order for our users to get bug and security fixes. Note that the ELK project doesn't maintain old major versions like, for example, the PostgreSQL project does. So in order to fix bugs in elasticsearch-5.6.5 users need to upgrade to ELK-6.
    EDIT: I just discovered that they do release new versions in the ELK-5 line.

  • The last point begs the question why we don't just drop all the separate versions and only provide ELK-6.1.0 since that has all the bug fixes. Well, ELK-6 has some breaking changes so I want to give users the option to move to ELK-6 on their own time-scale.

@globin globin merged commit bd210da into NixOS:release-17.09 Jan 17, 2018
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
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.

None yet
4 participants
@basvandijk @srhb @globin @GrahamcOfBorg