diff --git a/glicid/packages/monitoring.scm b/glicid/packages/monitoring.scm index 82c00d5..0b5bc16 100644 --- a/glicid/packages/monitoring.scm +++ b/glicid/packages/monitoring.scm @@ -1,82 +1,54 @@ (define-module (glicid packages monitoring) - #:use-module (guix packages) - #:use-module (guix utils) - - #:use-module ((gnu packages monitoring) - #:prefix gnu:) - #:use-module (guix download)) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module ((gnu packages monitoring) #:prefix gnu:) + #:use-module (guix download)) (define-public zabbix-agentd - (package - (inherit gnu:zabbix-agentd) - (version "6.0.13") - (source - - (origin - (method url-fetch) - (uri (string-append - "https://cdn.zabbix.com/zabbix/sources/stable/" - (version-major+minor version) "/zabbix-" version ".tar.gz")) - (sha256 - (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy")) - (modules '((guix build utils))) - (snippet - '(substitute* '("src/zabbix_proxy/proxy.c" - "src/zabbix_server/server.c") - ;; 'fping' must be setuid, so look for it in the usual location. - (("/usr/sbin/fping6?") - "/run/setuid-programs/fping"))))) - -)) + (package + (inherit gnu:zabbix-agentd) + (version "6.0.13") + (source + (origin + (method url-fetch) + (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) + (sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy")) + (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch")) + (modules '((guix build utils))) + (snippet + '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") + (("/usr/sbin/fping6?") "/run/setuid-programs/fping"))))))) (define-public zabbix-agent2 - (package - (inherit gnu:zabbix-agent2) - (version "6.0.13") - (source - - (origin - (method url-fetch) - (uri (string-append - "https://cdn.zabbix.com/zabbix/sources/stable/" - (version-major+minor version) "/zabbix-" version ".tar.gz")) - (sha256 - (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy")) - (modules '((guix build utils))) - (snippet - '(substitute* '("src/zabbix_proxy/proxy.c" - "src/zabbix_server/server.c") - ;; 'fping' must be setuid, so look for it in the usual location. - (("/usr/sbin/fping6?") - "/run/setuid-programs/fping"))))) - -)) + (package + (inherit gnu:zabbix-agent2) + (version "6.0.13") + (source + (origin + (method url-fetch) + (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) + (sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy")) + (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch")) + (modules '((guix build utils))) + (snippet + '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") + (("/usr/sbin/fping6?") "/run/setuid-programs/fping"))))))) (define-public zabbix-server - (package - (inherit gnu:zabbix-server) - (version "6.0.13") - (source - - (origin - (method url-fetch) - (uri (string-append - "https://cdn.zabbix.com/zabbix/sources/stable/" - (version-major+minor version) "/zabbix-" version ".tar.gz")) - (sha256 - (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy")) - (modules '((guix build utils))) - (snippet - '(substitute* '("src/zabbix_proxy/proxy.c" - "src/zabbix_server/server.c") - ;; 'fping' must be setuid, so look for it in the usual location. - (("/usr/sbin/fping6?") - "/run/setuid-programs/fping"))))) - - - ) -) - + (package + (inherit gnu:zabbix-server) + (version "6.0.13") + (source + (origin + (method url-fetch) + (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) + (sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy")) + (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch")) + (modules '((guix build utils))) + (snippet + '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") + (("/usr/sbin/fping6?") "/run/setuid-programs/fping"))))))) diff --git a/glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch b/glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch new file mode 100644 index 0000000..132afe7 --- /dev/null +++ b/glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch @@ -0,0 +1,27 @@ +From 2ba64970de034357f22dd5f0fca0e588f4060fcd Mon Sep 17 00:00:00 2001 +From: JEAN-FRANCOIS GUILLAUME +Date: Fri, 3 Mar 2023 08:20:47 +0100 +Subject: [PATCH] bumping timescaledb supported version to 2.10 + +--- + include/zbxdb.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/zbxdb.h b/include/zbxdb.h +index 111d89a..4716f75 100644 +--- a/include/zbxdb.h ++++ b/include/zbxdb.h +@@ -197,8 +197,8 @@ int zbx_db_strlen_n(const char *text_loc, size_t maxlen); + #define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION 20001 + #define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION_FRIENDLY "2.0.1" + #define ZBX_TIMESCALE_MIN_VERSION_WITH_LICENSE_PARAM_SUPPORT 20000 +-#define ZBX_TIMESCALE_MAX_VERSION 20999 +-#define ZBX_TIMESCALE_MAX_VERSION_FRIENDLY "2.9" ++#define ZBX_TIMESCALE_MAX_VERSION 21000 ++#define ZBX_TIMESCALE_MAX_VERSION_FRIENDLY "2.10" + #define ZBX_TIMESCALE_LICENSE_APACHE "apache" + #define ZBX_TIMESCALE_LICENSE_APACHE_FRIENDLY "TimescaleDB Apache 2 Edition" + #define ZBX_TIMESCALE_LICENSE_COMMUNITY "timescale" +-- +2.39.2 +