jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #223592 from seberm/add-zabbix-6

Browse Source 
zabbix: Add support for zabbix v6, update v5 and v4 to latest versions
This commit is contained in:
Aaron Andersen 2023-04-05 20:28:15 -04:00 committed by GitHub
commit 65ed4dd46c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/monitoring/zabbix/agent.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, libiconv, openssl, pcre }:
import ./versions.nix ({ version, sha256 }:
import ./versions.nix ({ version, sha256, ... }:
stdenv.mkDerivation {
pname = "zabbix-agent";
inherit version;

4
pkgs/servers/monitoring/zabbix/agent2.nix
View File

@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchurl, autoreconfHook, pkg-config, libiconv, openssl, pcre, zlib }:
import ./versions.nix ({ version, sha256 }:
import ./versions.nix ({ version, sha256, vendorSha256 ? throw "unsupported version ${version} for zabbix-agent2", ... }:
buildGoModule {
pname = "zabbix-agent2";
inherit version;
@ -12,7 +12,7 @@ import ./versions.nix ({ version, sha256 }:
modRoot = "src/go";
vendorSha256 = "1417qi061xc4m55z0vz420fr7qpi24kw5yj9wq7iic92smakgkjn";
inherit vendorSha256;
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libiconv openssl pcre zlib ];

2
pkgs/servers/monitoring/zabbix/proxy.nix
View File

@ -15,7 +15,7 @@ assert sqliteSupport -> !mysqlSupport && !postgresqlSupport;
let
inherit (lib) optional optionalString;
in
import ./versions.nix ({ version, sha256 }:
import ./versions.nix ({ version, sha256, ... }:
stdenv.mkDerivation {
pname = "zabbix-proxy";
inherit version;

2
pkgs/servers/monitoring/zabbix/server.nix
View File

@ -16,7 +16,7 @@ assert postgresqlSupport -> !mysqlSupport;
let
inherit (lib) optional optionalString;
in
import ./versions.nix ({ version, sha256 }:
import ./versions.nix ({ version, sha256, ... }:
stdenv.mkDerivation {
pname = "zabbix-server";
inherit version;

15
pkgs/servers/monitoring/zabbix/versions.nix
View File

@ -1,11 +1,18 @@
generic: {
v60 = generic {
version = "6.0.14";
sha256 = "sha256-YxrVl12OBxkB/cEvlGR+mV7bTBe6nRi71wLCtZPCzlg=";
vendorSha256 = null;
};
v50 = generic {
version = "5.0.19";
sha256 = "sha256-esa7DczdaWiG8Ru9py8HlOhvhkjV8IQjMwuiJ6F5c6E=";
version = "5.0.33";
sha256 = "sha256-VimTMcnYaFXeBW3zkDRGMxmtOFgPBU2ANKXLjgtr0GE=";
vendorSha256 = "sha256-RG6tSQk3dGaoTG/LHsZkayYCHbguSNOOuAFCmpSwElQ=";
};
v40 = generic {
version = "4.0.37";
sha256 = "sha256-Wuexl8I2zA63jyTRDe8bMSP++imwSOxc4LEdUnH8jps=";
version = "4.0.44";
sha256 = "sha256-qB3hSHnPffenBC6gv/QQXJuVpj4/oN4/jt/O6QmiX+c=";
};
}

2
pkgs/servers/monitoring/zabbix/web.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, writeText }:
import ./versions.nix ({ version, sha256 }:
import ./versions.nix ({ version, sha256, ... }:
stdenv.mkDerivation rec {
pname = "zabbix-web";
inherit version;

6
pkgs/top-level/all-packages.nix
View File

@ -26048,7 +26048,6 @@ with pkgs;
zabbixFor = version: rec {
agent = (callPackages ../servers/monitoring/zabbix/agent.nix {}).${version};
agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version};
proxy-mysql = (callPackages ../servers/monitoring/zabbix/proxy.nix { mysqlSupport = true; }).${version};
proxy-pgsql = (callPackages ../servers/monitoring/zabbix/proxy.nix { postgresqlSupport = true; }).${version};
proxy-sqlite = (callPackages ../servers/monitoring/zabbix/proxy.nix { sqliteSupport = true; }).${version};
@ -26058,12 +26057,15 @@ with pkgs;
# backwards compatibility
server = server-pgsql;
} // lib.optionalAttrs ( version != "v40" ) { # agent2 is not supported in v4
agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version};
};
zabbix60 = recurseIntoAttrs (zabbixFor "v60");
zabbix50 = recurseIntoAttrs (zabbixFor "v50");
zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40");
zabbix = zabbix50;
zabbix = zabbix60;
zipkin = callPackage ../servers/monitoring/zipkin { };

1
pkgs/top-level/packages-config.nix
View File

@ -27,6 +27,7 @@
ut2004Packages
zabbix40
zabbix50
zabbix60
zeroadPackages
;