Skip to content

elk: 6.3.2 -> 6.5.1 #51225

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
Merged
merged 1 commit into from
Dec 2, 2018
Merged

elk: 6.3.2 -> 6.5.1 #51225

merged 1 commit into from
Dec 2, 2018
+61 −18

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Nov 29, 2018 •
edited
Loading

Motivation for this change

Also includes the new journalbeat6 beat which is a replacement for journalbeat which is now maintained by Elastic.

Things done

The following tests succeed on my system:

  • $ nix-build nixos/tests/elk.nix -A ELK-6
  • $ NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@basvandijk basvandijk added 2.status: work-in-progress This PR isn't done 8.has: package (update) This PR updates a package to a newer version 11.by: nixpkgs-member 11.by: package-maintainer This PR was created by the maintainer of the package it changes labels Nov 29, 2018
@basvandijk basvandijk force-pushed the elk-6.5.1 branch 2 times, most recently from 5bbbdc4 to bc0620c Compare November 29, 2018 22:14
@basvandijk basvandijk removed the 2.status: work-in-progress This PR isn't done label Nov 29, 2018
@basvandijk
Copy link
Member Author

@GrahamcOfBorg test elk.ELK-6

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: tests.elk.ELK-6

Partial log (click to expand)

Cannot nix-instantiate `tests.elk.ELK-6' because:
error: while evaluating 'recursiveUpdate' at /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/lib/attrsets.nix:415:26, called from /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/lib/attrsets.nix:148:28:
while evaluating 'recursiveUpdateUntil' at /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/lib/attrsets.nix:384:37, called from /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/lib/attrsets.nix:416:5:
while evaluating 'zipAttrsWith' at /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/lib/attrsets.nix:347:21, called from /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/lib/attrsets.nix:394:8:
while evaluating 'zipAttrsWithNames' at /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/lib/attrsets.nix:332:33, called from /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/lib/attrsets.nix:347:27:
while evaluating the attribute 'elk' at /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/nixos/tests/all-tests.nix:69:3:
while evaluating 'handleTestOn' at /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/nixos/tests/all-tests.nix:19:33, called from /var/lib/gc-of-borg/nix-test-rs-28/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-28/nixos/tests/all-tests.nix:69:9:
access to path '/nix/store/v90phr2l0yjz82aqsm51mnd60723gqyv-grahamc-aarch64-community-28' is forbidden in restricted mode

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: tests.elk.ELK-6

Partial log (click to expand)

Cannot nix-instantiate `tests.elk.ELK-6' because:
error: while evaluating 'recursiveUpdate' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/lib/attrsets.nix:415:26, called from /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/lib/attrsets.nix:148:28:
while evaluating 'recursiveUpdateUntil' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/lib/attrsets.nix:384:37, called from /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/lib/attrsets.nix:416:5:
while evaluating 'zipAttrsWith' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/lib/attrsets.nix:347:21, called from /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/lib/attrsets.nix:394:8:
while evaluating 'zipAttrsWithNames' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/lib/attrsets.nix:332:33, called from /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/lib/attrsets.nix:347:27:
while evaluating the attribute 'elk' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/nixos/tests/all-tests.nix:69:3:
while evaluating 'handleTestOn' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/nixos/tests/all-tests.nix:19:33, called from /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-0-gustav.ewr1.nix.ci/nixos/tests/all-tests.nix:69:9:
access to path '/nix/store/sifi3wyg6158a16n0adb98sa55cqa7pm-builder-0-gustav.ewr1.nix.ci' is forbidden in restricted mode

@basvandijk
Copy link
Member Author

@Mic92 care to review this?

@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 29, 2018
Mic92
Mic92 reviewed Dec 1, 2018
View reviewed changes
pkgs/development/tools/misc/kibana/default.nix Outdated
# disable the version check.
postPatch = ''
sed -i 's|currentVersion === requiredVersion|true|' \
src/setup_node_env/node_version_validator.js
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer a patch here so we see when it no longer applies.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Mic92
Mic92 reviewed Dec 1, 2018
View reviewed changes
pkgs/servers/search/elasticsearch/default.nix Outdated
};

patches = [ ./es-home-6.x.patch ];

postPatch = ''
sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env
sed -i "s|ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/\*\"|ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/\*\"|" ./bin/elasticsearch-cli
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about using substituteInPlace for both? I don't spot regexes here and it should be more readable.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've implemented your suggestion and it's more readable indeed.

Mic92
Mic92 reviewed Dec 1, 2018
View reviewed changes
nixos/modules/services/search/kibana.nix
ExecStart =
"${cfg.package}/bin/kibana" +
" --config ${cfgFile}" +
" --path.data ${cfg.dataDir}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it no longer uses its working directory for storing data?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so. What I know for sure is that kibana fails if --path.data is not set.

@basvandijk
Copy link
Member Author

@GrahamcOfBorg test elk

@basvandijk basvandijk merged commit 7035598 into NixOS:master Dec 2, 2018
@betaboon betaboon mentioned this pull request Mar 20, 2019
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92

@infinisil infinisil

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 11.by: nixpkgs-member 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@basvandijk @GrahamcOfBorg @Mic92