Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b0b37569a741
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5afe978e0083
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 15, 2020

  1. Enable elasticsearch-curator on elasticsearch 7 

    The current nixpkgs use elasticsearch-curator 5.8.1. As of version 5.7.0,
elasticsearch-curator supports elasticsearch 7, thus this change enables tests
with ES 7.
    @knl
    knl committed Jan 15, 2020
    Copy the full SHA
    900e288 View commit details

  2. Merge pull request #77741 from knl/elasticsearch-curator-now-supports… 

    …-el7

Enable elasticsearch-curator on elasticsearch 7
    @basvandijk
    basvandijk authored Jan 15, 2020
    Copy the full SHA
    5afe978 View commit details
Showing with 3 additions and 5 deletions.
  1. +3 −5 nixos/tests/elk.nix
8 changes: 3 additions & 5 deletions nixos/tests/elk.nix
View file
Original file line number Diff line number Diff line change
@@ -10,8 +10,7 @@ let
esUrl = "http://localhost:9200";

mkElkTest = name : elk :
let elasticsearchGe7 = builtins.compareVersions elk.elasticsearch.version "7" >= 0;
in import ./make-test-python.nix ({
import ./make-test-python.nix ({
inherit name;
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco offline basvandijk ];
@@ -91,8 +90,7 @@ let
};

elasticsearch-curator = {
# The current version of curator (5.6) doesn't support elasticsearch >= 7.0.0.
enable = !elasticsearchGe7;
enable = true;
actionYAML = ''
---
actions:
@@ -173,7 +171,7 @@ let
one.wait_until_succeeds(
total_hits("Supercalifragilisticexpialidocious") + " | grep -v 0"
)
'' + pkgs.lib.optionalString (!elasticsearchGe7) ''
with subtest("Elasticsearch-curator works"):
one.systemctl("stop logstash")
one.systemctl("start elasticsearch-curator")