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.

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

elk: 6.3.2 -> 6.5.1 #51225

Merged
merged 1 commit into from Dec 2, 2018

Conversation

@basvandijk
Copy link
Member

basvandijk commented Nov 29, 2018

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.

@basvandijk

This comment has been minimized.

Copy link
Member Author

basvandijk commented Nov 29, 2018

@GrahamcOfBorg test elk.ELK-6

@GrahamcOfBorg

This comment has been minimized.

Copy link

GrahamcOfBorg commented Nov 29, 2018

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

This comment has been minimized.

Copy link

GrahamcOfBorg commented Nov 29, 2018

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 basvandijk force-pushed the LumiGuide:elk-6.5.1 branch Nov 29, 2018

@basvandijk basvandijk requested a review from Infinisil as a code owner Nov 29, 2018

@basvandijk basvandijk force-pushed the LumiGuide:elk-6.5.1 branch Nov 29, 2018

@basvandijk

This comment has been minimized.

Copy link
Member Author

basvandijk commented Nov 29, 2018

@Mic92 care to review this?

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

This comment has been minimized.

@Mic92

Mic92 Dec 1, 2018

Contributor

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

This comment has been minimized.

@basvandijk

basvandijk Dec 1, 2018

Author Member

Done.

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

This comment has been minimized.

@Mic92

Mic92 Dec 1, 2018

Contributor

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

This comment has been minimized.

@basvandijk

basvandijk Dec 1, 2018

Author Member

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

ExecStart =
"${cfg.package}/bin/kibana" +
" --config ${cfgFile}" +
" --path.data ${cfg.dataDir}";

This comment has been minimized.

@Mic92

Mic92 Dec 1, 2018

Contributor

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

This comment has been minimized.

@basvandijk

basvandijk Dec 1, 2018

Author Member

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

@basvandijk basvandijk force-pushed the LumiGuide:elk-6.5.1 branch to fbf0efc Dec 1, 2018

@basvandijk

This comment has been minimized.

Copy link
Member Author

basvandijk commented Dec 1, 2018

@GrahamcOfBorg test elk

@basvandijk basvandijk merged commit 7035598 into NixOS:master Dec 2, 2018

9 checks passed

grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.