Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e0c7e1fd05c3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3bfabe7b5b7
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 8, 2020

  1. graylog: 3.2.5 -> 3.3.0 

    (cherry picked from commit b48ad9b)

Backport of #89617 for security and bugfixes
    Tristan Helmich (omniIT) committed Jun 8, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CED392DE0C483D00
    Learn about vigilant mode
    Copy the full SHA
    b845898 View commit details

  2. graylogPlugins: Update and add plugins 

    * graylog-auth-sso: 3.1.0 -> 3.3.0
* graylog-enterprise-integrations: init at 3.3.0
* graylog-integrations: init at 3.3.0
* graylog-pagerduty: 1.3.0 -> 2.0.0
* graylog-snmp: init at 0.3.0

(cherry picked from commit a265cd2)

Backport of #89617 for security and bugfixes (and plugin updates to stay
compatible with Graylog 3.3.0)
    Tristan Helmich (omniIT) committed Jun 8, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CED392DE0C483D00
    Learn about vigilant mode
    Copy the full SHA
    974353b View commit details

Commits on Jun 10, 2020

  1. Merge pull request #89838 from omniitgmbh/20.03_graylog_3.3.0_with_pl… 

    …ugins

[20.03] [backport] graylog: 3.2.5 -> 3.3.0 (with plugins)
    @Ma27
    Ma27 authored Jun 10, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CED392DE0C483D00
    Learn about vigilant mode
    Copy the full SHA
    d3bfabe View commit details
Showing with 56 additions and 6 deletions.
  1. +2 −2 pkgs/tools/misc/graylog/default.nix
  2. +54 −4 pkgs/tools/misc/graylog/plugins.nix
4 changes: 2 additions & 2 deletions pkgs/tools/misc/graylog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "graylog";
version = "3.2.5";
version = "3.3.0";

src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "1sbws735w0qww3nj8ai105a743nyrf1iprmcl89w5h8yirq2z1r9";
sha256 = "1ydplg2lifql5s4bh64a4lwqp1q5vrvbljhn1pnxv9vz0ab73q1k";
};

dontBuild = true;
58 changes: 54 additions & 4 deletions pkgs/tools/misc/graylog/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -38,10 +38,10 @@ in {
auth_sso = glPlugin rec {
name = "graylog-auth-sso-${version}";
pluginName = "graylog-plugin-auth-sso";
version = "3.1.0";
version = "3.3.0";
src = fetchurl {
url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "0hwgpq1j3qk0j1zgap5f1avh2nvkcscgds81x8xr0gamphgps8y2";
sha256 = "1g47hlld8vzicd47b5i9n2816rbrhv18vjq8gp765c7mdg4a2jn8";
};
meta = {
homepage = https://github.com/Graylog2/graylog-plugin-auth-sso;
@@ -61,6 +61,25 @@ in {
description = "Message filter plugin can be used to do DNS lookups for the source field in Graylog messages";
};
};
enterprise-integrations = glPlugin rec {
name = "graylog-enterprise-integrations-${version}";
pluginName = "graylog-plugin-enterprise-integrations";
version = "3.3.0";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz";
sha256 = "1480ccii3nzvm0jp1xm2iddgc789zcwbgd19201q7p3v0ph02yj8";
};
installPhase = ''
mkdir -p $out/bin
tar --strip-components=2 -xf $src
cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar
'';
meta = {
homepage = "https://docs.graylog.org/en/3.2/pages/integrations.html#enterprise";
description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)";
license = stdenv.lib.licenses.unfree;
};
};
filter-messagesize = glPlugin rec {
name = "graylog-filter-messagesize-${version}";
pluginName = "graylog-plugin-filter-messagesize";
@@ -74,6 +93,24 @@ in {
description = "Prints out all messages that have an estimated size crossing a configured threshold during processing";
};
};
integrations = glPlugin rec {
name = "graylog-integrations-${version}";
pluginName = "graylog-plugin-integrations";
version = "3.3.0";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz";
sha256 = "08cpxviwk2p4zsgbr2h3symr88rf3fjfz1kkg4iglvdc5mqf71xx";
};
installPhase = ''
mkdir -p $out/bin
tar --strip-components=2 -xf $src
cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar
'';
meta = {
homepage = https://github.com/Graylog2/graylog-plugin-integrations;
description = "A collection of open source Graylog integrations that will be released together";
};
};
internal-logs = glPlugin rec {
name = "graylog-internal-logs-${version}";
pluginName = "graylog-plugin-internal-logs";
@@ -142,10 +179,10 @@ in {
pagerduty = glPlugin rec {
name = "graylog-pagerduty-${version}";
pluginName = "graylog-plugin-pagerduty";
version = "1.3.0";
version = "2.0.0";
src = fetchurl {
url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "1g63c6rm5pkz7f0d73wb2lmk4zm430jqnhihbyq112cm4i7ymglh";
sha256 = "0xhcwfwn7c77giwjilv7k7aijnj9azrjbjgd0r3p6wdrw970f27r";
};
meta = {
homepage = https://github.com/graylog-labs/graylog-plugin-pagerduty;
@@ -178,6 +215,19 @@ in {
description = "Can notify Slack or Mattermost channels about triggered alerts in Graylog (Alarm Callback)";
};
};
snmp = glPlugin rec {
name = "graylog-snmp-${version}";
pluginName = "graylog-plugin-snmp";
version = "0.3.0";
src = fetchurl {
url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
sha256 = "1hkaklwzcsvqq45b98chwqxqdgnnbj4dg68agsll13yq4zx37qpp";
};
meta = {
homepage = https://github.com/graylog-labs/graylog-plugin-snmp;
description = "Graylog plugin to receive SNMP traps";
};
};
spaceweather = glPlugin rec {
name = "graylog-spaceweather-${version}";
pluginName = "graylog-plugin-spaceweather";