elk: 6.3.2 -> 6.5.1 #51225
Merged
elk: 6.3.2 -> 6.5.1 #51225
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
basvandijk
force-pushed
the
elk-6.5.1
branch
2 times, most recently
from
5bbbdc4
to
bc0620c
Compare
|
@GrahamcOfBorg test elk.ELK-6 |
|
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)
|
|
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)
|
basvandijk
force-pushed
the
elk-6.5.1
branch
from
bc0620c
to
9bc6af7
Compare
basvandijk
force-pushed
the
elk-6.5.1
branch
from
9bc6af7
to
583b58a
Compare
|
@Mic92 care to review this? |
Mic92
reviewed
Dec 1, 2018
| # disable the version check. | ||
| postPatch = '' | ||
| sed -i 's|currentVersion === requiredVersion|true|' \ | ||
| src/setup_node_env/node_version_validator.js |
There was a problem hiding this comment.
I would prefer a patch here so we see when it no longer applies.
Mic92
reviewed
Dec 1, 2018
| }; | ||
|
|
||
| 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 |
There was a problem hiding this comment.
How about using substituteInPlace for both? I don't spot regexes here and it should be more readable.
There was a problem hiding this comment.
I've implemented your suggestion and it's more readable indeed.
Mic92
reviewed
Dec 1, 2018
| ExecStart = | ||
| "${cfg.package}/bin/kibana" + | ||
| " --config ${cfgFile}" + | ||
| " --path.data ${cfg.dataDir}"; |
There was a problem hiding this comment.
So it no longer uses its working directory for storing data?
There was a problem hiding this comment.
I don't think so. What I know for sure is that kibana fails if --path.data is not set.
|
@GrahamcOfBorg test elk |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Also includes the new
journalbeat6beat which is a replacement forjournalbeatwhich 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 truesandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)