GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-30 06:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

zabbix 6.0.18 with timescaledb 2.11

Browse source
This commit is contained in:
Jean-François GUILLAUME 2023-06-22 13:00:12 +02:00
parent 36a80b638c
commit 6ac9dd0382
Signed by: Jean-François GUILLAUME
GPG key ID: 38751DAE145EFB5A
3 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
glicid/packages/monitoring.scm
View file

@ -8,12 +8,12 @@
(define-public zabbix-agentd (define-public zabbix-agentd
(package (package
(inherit gnu:zabbix-agentd) (inherit gnu:zabbix-agentd)
(version "6.0.14") (version "6.0.18")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 "0n6fqa9vbhh2syxii7ds2x6dnplrgrj98by1zl0ij1wfbnbxa6k3")) (sha256 (base32 "17mx8wp5l4dm3fjdnr8zmbrjgwx66b21jfjs7047g9a9glsqmr76"))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch")) (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -24,12 +24,12 @@
(define-public zabbix-agent2 (define-public zabbix-agent2
(package (package
(inherit gnu:zabbix-agent2) (inherit gnu:zabbix-agent2)
(version "6.0.14") (version "6.0.18")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 "0n6fqa9vbhh2syxii7ds2x6dnplrgrj98by1zl0ij1wfbnbxa6k3")) (sha256 (base32 "17mx8wp5l4dm3fjdnr8zmbrjgwx66b21jfjs7047g9a9glsqmr76"))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch")) (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -40,14 +40,16 @@
(define-public zabbix-server (define-public zabbix-server
(package (package
(inherit gnu:zabbix-server) (inherit gnu:zabbix-server)
(version "6.0.14") (version "6.0.18")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 "0n6fqa9vbhh2syxii7ds2x6dnplrgrj98by1zl0ij1wfbnbxa6k3")) (sha256 (base32 "17mx8wp5l4dm3fjdnr8zmbrjgwx66b21jfjs7047g9a9glsqmr76"))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch")) (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
(("/usr/sbin/fping6?") "/run/setuid-programs/fping"))))))) (("/usr/sbin/fping6?") "/run/setuid-programs/fping")))))))
zabbix-server

27
glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch
View file

@ -1,27 +0,0 @@
From 2ba64970de034357f22dd5f0fca0e588f4060fcd Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
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

26
glicid/packages/patches/glicid-zabbix-timescaledb-2.11.patch Normal file
View file

@ -0,0 +1,26 @@
From 71456293658f2a9aa61cf6bab4280d4439f92c42 Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Thu, 22 Jun 2023 12:57:19 +0200
Subject: [PATCH] bumping timescaledb supported version to 2.11
---
include/zbx_dbversion_constants.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/zbx_dbversion_constants.h b/include/zbx_dbversion_constants.h
index f143012..0adbd54 100644
--- a/include/zbx_dbversion_constants.h
+++ b/include/zbx_dbversion_constants.h
@@ -66,8 +66,8 @@
#define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION 20001
#define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION_STR "2.0.1"
#define ZBX_TIMESCALE_MIN_VERSION_WITH_LICENSE_PARAM_SUPPORT 20000
-#define ZBX_TIMESCALE_MAX_VERSION 21099
-#define ZBX_TIMESCALE_MAX_VERSION_STR "2.10"
+#define ZBX_TIMESCALE_MAX_VERSION 21199
+#define ZBX_TIMESCALE_MAX_VERSION_STR "2.11"
#define ZBX_TIMESCALE_LICENSE_APACHE "apache"
#define ZBX_TIMESCALE_LICENSE_APACHE_STR "TimescaleDB Apache 2 Edition"
#define ZBX_TIMESCALE_LICENSE_COMMUNITY "timescale"
--
2.40.1