GNU bug report logs - #32598
[PATCH] gnu: Add zabbix-agentd and zabbix-server.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 32598 in the body.
You can then email your comments to 32598 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH] gnu: Add zabbix-agentd and zabbix-server.
Date: Fri, 31 Aug 2018 05:50:33 +0300

* gnu/packages/monitoring.scm (zabbix-agentd, zabbix-server): New variables.
---
 gnu/packages/monitoring.scm | 85 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index fae62d549..7332e6883 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -29,18 +29,25 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
+  #:use-module (guix utils)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages curl)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages django)
   #:use-module (gnu packages gd)
   #:use-module (gnu packages image)
   #:use-module (gnu packages mail)
+  #:use-module (gnu packages networking)
+  #:use-module (gnu packages libevent)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
-  #:use-module (gnu packages time))
+  #:use-module (gnu packages time)
+  #:use-module (gnu packages tls))
 
 (define-public nagios
   (package
@@ -138,6 +145,82 @@ etc. via a Web interface.  Features include:
 @end itemize\n")
     (license license:gpl2)))
 
+(define-public zabbix-agentd
+  (package
+    (name "zabbix-agentd")
+    (version "3.4.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/" version
+             "/zabbix-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0qxgf6hx7ibhjmxd2sxizkjc8df4c9d31wz5hhql409ws98qf173"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "--enable-agent"
+             (string-append "--with-iconv="
+                            (assoc-ref %build-inputs "libiconv"))
+             (string-append "--with-libpcre="
+                            (assoc-ref %build-inputs "pcre")))))
+    (inputs
+     `(("libiconv" ,libiconv)
+       ("pcre" ,pcre)))
+    (home-page "https://www.zabbix.com/")
+    (synopsis "Distributed monitoring solution (client-side agent)")
+    (description "This package provides a distributed monitoring
+solution (client-side agent)")
+    (license license:gpl2)))
+
+(define-public zabbix-server
+  (package
+    (inherit zabbix-agentd)
+    (name "zabbix-server")
+    (arguments
+     (substitute-keyword-arguments
+         `(#:phases
+           (modify-phases %standard-phases
+             (add-after 'install 'install-frontend
+               (lambda* (#:key outputs #:allow-other-keys)
+                 (let* ((php (string-append (assoc-ref outputs "out")
+                                            "/share/zabbix/php"))
+                        (front-end-conf (string-append php "/conf"))
+                        (etc (string-append php "/etc")))
+                   (mkdir-p php)
+                   (copy-recursively "./frontends/php" php)
+                   (rename-file front-end-conf
+                                (string-append front-end-conf "-example"))
+                   (symlink "/etc/zabbix" front-end-conf)))))
+           ,@(package-arguments zabbix-agentd))
+       ((#:configure-flags flags)
+        `(cons* "--enable-server"
+                "--with-postgresql"
+                (string-append "--with-libevent="
+                               (assoc-ref %build-inputs "libevent"))
+                "--with-net-snmp"
+                (string-append "--with-gnutls="
+                               (assoc-ref %build-inputs "gnutls"))
+                "--with-libcurl"
+                ,flags))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("curl" ,curl)
+       ("libevent" ,libevent)
+       ("gnutls" ,gnutls)
+       ("postgresql" ,postgresql)
+       ("zlib" ,zlib)
+       ("net-snmp" ,net-snmp)
+       ("curl" ,curl)
+       ,@(package-inputs zabbix-agentd)))
+    (home-page "https://www.zabbix.com/")
+    (synopsis "Distributed monitoring solution (server-side)")
+    (description "This package provides a distributed monitoring
+solution (server-side)")
+    (license license:gpl2)))
+
 (define-public darkstat
   (package
     (name "darkstat")
-- 
2.18.0

Message #8 received at 32598 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Oleg Pykhalov <go.wigust <at> gmail.com>
Cc: 32598 <at> debbugs.gnu.org
Subject: Re: [bug#32598] [PATCH] gnu: Add zabbix-agentd and zabbix-server.
Date: Sat, 1 Sep 2018 08:53:08 -0400

[Message part 1 (text/plain, inline)]

On Fri, Aug 31, 2018 at 05:50:33AM +0300, Oleg Pykhalov wrote:
> * gnu/packages/monitoring.scm (zabbix-agentd, zabbix-server): New variables.

LGTM, thanks! Just remember to add a copyright line to the file.

[signature.asc (application/pgp-signature, inline)]

Message #13 received at 32598-done <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: Leo Famulari <leo <at> famulari.name>
Cc: 32598-done <at> debbugs.gnu.org
Subject: Re: [bug#32598] [PATCH] gnu: Add zabbix-agentd and zabbix-server.
Date: Sat, 01 Sep 2018 19:02:56 +0300

[Message part 1 (text/plain, inline)]

Hello Leo,

Thank you for review.

Leo Famulari <leo <at> famulari.name> writes:

> On Fri, Aug 31, 2018 at 05:50:33AM +0300, Oleg Pykhalov wrote:
>> * gnu/packages/monitoring.scm (zabbix-agentd, zabbix-server): New variables.
>
> LGTM, thanks! Just remember to add a copyright line to the file.

OK, pushed with changes as ead46692ec8a17ed9cf668131343d7cf1b3725e5

[Message part 2 (text/x-patch, inline)]

diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 7332e6883..a59e51a5e 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -3,7 +3,8 @@
 ;;; Copyright © 2018 Sou Bunnbu <iyzsong <at> member.fsf.org>
 ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
-;;; Copyright © 2018 Gábor Boskovits <boskovits <at> gmail.com>
+;;; Copyright © 2018 Gábor Boskovits <boskovits <at> gmail.com>w
+;;; Copyright © 2018 Oleg Pykhalov <go.wigust <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -205,7 +206,6 @@ solution (client-side agent)")
                                (assoc-ref %build-inputs "gnutls"))
                 "--with-libcurl"
                 ,flags))))
-    (build-system gnu-build-system)
     (inputs
      `(("curl" ,curl)
        ("libevent" ,libevent)
@@ -215,11 +215,9 @@ solution (client-side agent)")
        ("net-snmp" ,net-snmp)
        ("curl" ,curl)
        ,@(package-inputs zabbix-agentd)))
-    (home-page "https://www.zabbix.com/")
     (synopsis "Distributed monitoring solution (server-side)")
     (description "This package provides a distributed monitoring
-solution (server-side)")
-    (license license:gpl2)))
+solution (server-side)")))
 
 (define-public darkstat
   (package

[Message part 3 (text/plain, inline)]

Oleg.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.