Unverified Commit fea1100c authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #194420 from helsinki-systems/drop/elk6 

elk6: remove
parents ccf87816 8b4505a8

nixos/doc/manual/release-notes/rl-2305.section.md

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name.



- The old unsupported version 6.x of the ELK-stack and Elastic beats have been removed. Use OpenSearch instead.



- The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead.



- Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually.

nixos/tests/elk.nix

+0 −15
Original line number Diff line number Diff line
@@ -268,14 +268,6 @@ let 
    '';

  }) { inherit pkgs system; };

in {

  ELK-6 = mkElkTest "elk-6-oss" {

    name = "elk-6-oss";

    elasticsearch = pkgs.elasticsearch6-oss;

    logstash      = pkgs.logstash6-oss;

    kibana        = pkgs.kibana6-oss;

    journalbeat   = pkgs.journalbeat6;

    metricbeat    = pkgs.metricbeat6;

  };

  # We currently only package upstream binaries.

  # Feel free to package an SSPL licensed source-based package!

  # ELK-7 = mkElkTest "elk-7-oss" {
@@ -287,13 +279,6 @@ in { 
  #   metricbeat    = pkgs.metricbeat7;

  # };

  unfree = lib.dontRecurseIntoAttrs {

    ELK-6 = mkElkTest "elk-6" {

      elasticsearch = pkgs.elasticsearch6;

      logstash      = pkgs.logstash6;

      kibana        = pkgs.kibana6;

      journalbeat   = pkgs.journalbeat6;

      metricbeat    = pkgs.metricbeat6;

    };

    ELK-7 = mkElkTest "elk-7" {

      elasticsearch = pkgs.elasticsearch7;

      logstash      = pkgs.logstash7;

nixos/tests/graylog.nix

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 


    services.mongodb.enable = true;

    services.elasticsearch.enable = true;

    services.elasticsearch.package = pkgs.elasticsearch-oss;

    services.elasticsearch.extraConf = ''

      network.publish_host: 127.0.0.1

      network.bind_host: 127.0.0.1

nixos/tests/parsedmarc/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ in 
            };

          };



          services.elasticsearch.package = pkgs.elasticsearch-oss;



          environment.systemPackages = [

            (sendEmail "dmarc@localhost")

            pkgs.jq
@@ -158,8 +156,6 @@ in 
                };

              };



              services.elasticsearch.package = pkgs.elasticsearch-oss;



              environment.systemPackages = [

                pkgs.jq

              ];

pkgs/misc/logging/beats/6.x.nix

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, fetchpatch, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }:



let beat = package : extraArgs : buildGoPackage (rec {

      name = "${package}-${version}";

      version = elk6Version;



      src = fetchFromGitHub {

        owner = "elastic";

        repo = "beats";

        rev = "v${version}";

        sha256 = "1vnw9clsc10cfpjf6vxvc6m507b2q17sgsl079iwqbp4v0286il7";

      };



      goPackagePath = "github.com/elastic/beats";



      subPackages = [ package ];



      patches = [

        (fetchpatch {

          # Build fix for aarch64, possibly other systems, merged in beats 7.x https://github.com/elastic/beats/pull/9493

          url = "https://github.com/elastic/beats/commit/5d796571de1aa2a299393d2045dacc2efac41a04.diff";

          sha256 = "sha256:0b79fljbi5xd3h8iiv1m38ad0zhmj09f187asc0m9rxlqrz2l9r2";

        })

      ];



      meta = with lib; {

        homepage = "https://www.elastic.co/products/beats";

        license = licenses.asl20;

        maintainers = with maintainers; [ fadenb basvandijk dfithian ];

        platforms = platforms.linux;

      };

    } // extraArgs);

in rec {

  filebeat6   = beat "filebeat"   {meta.description = "Lightweight shipper for logfiles";};

  heartbeat6  = beat "heartbeat"  {meta.description = "Lightweight shipper for uptime monitoring";};

  metricbeat6 = beat "metricbeat" {

    meta.description = "Lightweight shipper for metrics";

    passthru.tests =

      assert metricbeat6.drvPath == nixosTests.elk.ELK-6.elkPackages.metricbeat.drvPath;

      {

        elk = nixosTests.elk.ELK-6;

      };

  };

  journalbeat6  = beat "journalbeat" {

    meta.description = ''

      Journalbeat is an open source data collector to read and forward

      journal entries from Linuxes with systemd.

    '';

    buildInputs = [ systemd.dev ];

    postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''

      patchelf --set-rpath ${libPath} "$out/bin/journalbeat"

    '';

  };

}