[PATCH] Add collectd

Lars-Dominik Braun wrote on 28 Apr 2020 10:57

Recipients:(address . guix-patches@gnu.org)

Message-ID:20200428085719.GA3395@zpidnp36

Hi,
the attached patch adds the monitoring software “collectd”. Its configurationis quite minimal right now. A lot of plugins are not enabled, because theyintroduce many external dependencies. I’m sure that can be fixed easily ifthere’s demand though.
I’ve been running the package in production for a week now without any problems(via systemd on a foreign distribution, thus no herd service).
Cheers,Lars

Lars-Dominik Braun wrote on 28 Apr 2020 11:29

Recipients:(address . 40925@debbugs.gnu.org)

Message-ID:20200428092938.GB3395@zpidnp36

Hi,
totally forgot to attach the patch. Here it is.
Lars

From 05110cd7f0af5f870daa48a1e32bff56efb2676a Mon Sep 17 00:00:00 2001From: Lars-Dominik Braun <ldb@leibniz-psychology.org>Date: Tue, 28 Apr 2020 10:50:10 +0200Subject: [PATCH] gnu: Add collectd
* gnu/packages/monitoring.scm (collectd): New variable* gnu/local.mk (dist_patch_DATA): Add new patch* gnu/packages/patches/collectd-5.11.0-noinstallvar.patch: New file--- gnu/local.mk                                  |  1 + gnu/packages/monitoring.scm                   | 45 +++++++++++++++++++ .../collectd-5.11.0-noinstallvar.patch        | 19 ++++++++ 3 files changed, 65 insertions(+) create mode 100644 gnu/packages/patches/collectd-5.11.0-noinstallvar.patch

Toggle diff (116 lines)diff --git a/gnu/local.mk b/gnu/local.mkindex 9f212434a9..dea50618b0 100644--- a/gnu/local.mk+++ b/gnu/local.mk@@ -816,6 +816,7 @@ dist_patch_DATA =						\   %D%/packages/patches/clucene-pkgconfig.patch			\   %D%/packages/patches/cmake-curl-certificates.patch		\   %D%/packages/patches/coda-use-system-libs.patch		\+  %D%/packages/patches/collectd-5.11.0-noinstallvar.patch		\   %D%/packages/patches/combinatorial-blas-awpm.patch		\   %D%/packages/patches/combinatorial-blas-io-fix.patch		\   %D%/packages/patches/containerd-test-with-go1.13.patch		\diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scmindex 8da31d6a84..5a37b14328 100644--- a/gnu/packages/monitoring.scm+++ b/gnu/packages/monitoring.scm@@ -6,6 +6,7 @@ ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>+;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; ;;; This file is part of GNU Guix. ;;;@@ -32,6 +33,7 @@   #:use-module (guix build-system gnu)   #:use-module (guix build-system go)   #:use-module (guix utils)+  #:use-module (gnu packages)   #:use-module (gnu packages admin)   #:use-module (gnu packages autotools)   #:use-module (gnu packages base)@@ -48,9 +50,11 @@   #:use-module (gnu packages libevent)   #:use-module (gnu packages pcre)   #:use-module (gnu packages perl)+  #:use-module (gnu packages pkg-config)   #:use-module (gnu packages python)   #:use-module (gnu packages python-web)   #:use-module (gnu packages python-xyz)+  #:use-module (gnu packages rrdtool)   #:use-module (gnu packages time)   #:use-module (gnu packages tls)) @@ -445,3 +449,44 @@ written in Go with pluggable metric collectors.")     (description "This package provides a file system monitor.")     (home-page "https://github.com/emcrisostomo/fswatch")     (license license:gpl3+)))++(define-public collectd+  (package+    (name "collectd")+    (version "5.11.0")+    (source (origin+              (method url-fetch)+              (uri (string-append+                    "https://storage.googleapis.com/collectd-tarballs/collectd-"+                    version+                    ".tar.bz2"))+              (sha256+               (base32+                "1cjxksxdqcqdccz1nbnc2fp6yy84qq361ynaq5q8bailds00mc9p"))+              (patches (search-patches "collectd-5.11.0-noinstallvar.patch"))))+    (build-system gnu-build-system)+    (arguments+     `(#:configure-flags (list "--localstatedir=/var" "--sysconfdir=/etc")+                         #:phases+                         (modify-phases %standard-phases+                           ;; Required because of patched sources.+                           (add-before 'configure 'autoreconf+                             (lambda _ (invoke "autoreconf" "-vfi") #t)))))+    (inputs+     `(("rrdtool" ,rrdtool)+       ("curl" ,curl)))+    (native-inputs+     `(("autoconf" ,autoconf)+       ("automake" ,automake)+       ("libtool" ,libtool)+       ("pkg-config" ,pkg-config)))+    (home-page "https://collectd.org/")+    (synopsis "Collect system and application performance metrics periodically")+    (description+     "collectd gathers metrics from various sources, e.g. the operating system,+applications, logfiles and external devices, and stores this information or+makes it available over the network. Those statistics can be used to monitor+systems, find performance bottlenecks (i.e. performance analysis) and predict+future system load (i.e. capacity planning).")+    (license '(licenses:expat licenses:gpl2))))+diff --git a/gnu/packages/patches/collectd-5.11.0-noinstallvar.patch b/gnu/packages/patches/collectd-5.11.0-noinstallvar.patchnew file mode 100644index 0000000000..a8ca142147--- /dev/null+++ b/gnu/packages/patches/collectd-5.11.0-noinstallvar.patch@@ -0,0 +1,19 @@+--- a/Makefile.am	2020-03-08 16:57:09.511535600 +0100++++ b/Makefile.am	2020-04-21 11:36:49.827182272 +0200+@@ -2376,16 +2376,6 @@+ endif+ + install-exec-hook:+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)+-	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \+-	then \+-		$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \+-	else \+-		$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \+-	fi; \+ 	$(mkinstalldirs) $(DESTDIR)$(cpkgdatadir)+ 	$(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(cpkgdatadir)/types.db;+ 	$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \-- 2.20.1

Ludovic Courtès wrote on 1 May 2020 01:08

Re: [bug#40925] [PATCH] Add collectd

Recipients:(name . Lars-Dominik Braun)(address . ldb@leibniz-psychology.org)(address . 40925@debbugs.gnu.org)

Message-ID:87wo5winax.fsf@gnu.org

Hi,
Lars-Dominik Braun <ldb@leibniz-psychology.org> skribis:

Toggle quote (9 lines)

> From 05110cd7f0af5f870daa48a1e32bff56efb2676a Mon Sep 17 00:00:00 2001> From: Lars-Dominik Braun <ldb@leibniz-psychology.org>> Date: Tue, 28 Apr 2020 10:50:10 +0200> Subject: [PATCH] gnu: Add collectd>> * gnu/packages/monitoring.scm (collectd): New variable> * gnu/local.mk (dist_patch_DATA): Add new patch> * gnu/packages/patches/collectd-5.11.0-noinstallvar.patch: New file

[...]

Toggle quote (8 lines)

> + (arguments> + `(#:configure-flags (list "--localstatedir=/var" "--sysconfdir=/etc")> + #:phases> + (modify-phases %standard-phases> + ;; Required because of patched sources.> + (add-before 'configure 'autoreconf> + (lambda _ (invoke "autoreconf" "-vfi") #t)))))

Another option is to patch Makefile.in to avoid the dependency onAutoconf/Automake/Libool + this phase.

Toggle quote (2 lines)

> + (license '(licenses:expat licenses:gpl2))))

This is incorrect (see patch below, which also includes indentationfixes and minor changes to the description to placate ‘guix lint’.)
Also, could you add a comment stating whether it’s dual-licensing orjust that there’s code in both licenses?

Toggle quote (6 lines)

> diff --git a/gnu/packages/patches/collectd-5.11.0-noinstallvar.patch b/gnu/packages/patches/collectd-5.11.0-noinstallvar.patch> new file mode 100644> index 0000000000..a8ca142147> --- /dev/null> +++ b/gnu/packages/patches/collectd-5.11.0-noinstallvar.patch

A one-line comment at the top explaining what it does would be great.
Otherwise LGTM. Could you send an updated patch?
Thanks in advance!
Ludo’.

Ludovic Courtès wrote on 1 May 2020 01:10

Recipients:(name . Lars-Dominik Braun)(address . ldb@leibniz-psychology.org)(address . 40925@debbugs.gnu.org)

Message-ID:87sggkin8y.fsf@gnu.org

I too forgot the patch. :-)

Toggle diff (37 lines)diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scmindex 5a37b14328..7ee58f0d0c 100644--- a/gnu/packages/monitoring.scm+++ b/gnu/packages/monitoring.scm@@ -467,11 +467,11 @@ written in Go with pluggable metric collectors.")     (build-system gnu-build-system)     (arguments      `(#:configure-flags (list "--localstatedir=/var" "--sysconfdir=/etc")-                         #:phases-                         (modify-phases %standard-phases-                           ;; Required because of patched sources.-                           (add-before 'configure 'autoreconf-                             (lambda _ (invoke "autoreconf" "-vfi") #t)))))+       #:phases (modify-phases %standard-phases+                  (add-before 'configure 'autoreconf+                    (lambda _+                      ;; Required because of patched sources.+                      (invoke "autoreconf" "-vfi"))))))     (inputs      `(("rrdtool" ,rrdtool)        ("curl" ,curl)))@@ -483,10 +483,10 @@ written in Go with pluggable metric collectors.")     (home-page "https://collectd.org/")     (synopsis "Collect system and application performance metrics periodically")     (description-     "collectd gathers metrics from various sources, e.g. the operating system,-applications, logfiles and external devices, and stores this information or-makes it available over the network. Those statistics can be used to monitor-systems, find performance bottlenecks (i.e. performance analysis) and predict-future system load (i.e. capacity planning).")-    (license '(licenses:expat licenses:gpl2))))+     "collectd gathers metrics from various sources such as the operating system,+applications, log files and external devices, and stores this information or+makes it available over the network.  Those statistics can be used to monitor+systems, find performance bottlenecks (i.e., performance analysis) and predict+future system load (i.e., capacity planning).")+    (license (list license:expat license:gpl2))))

Lars-Dominik Braun wrote on 4 May 2020 08:06

Recipients:(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 40925@debbugs.gnu.org)

Message-ID:20200504060629.GA3179@zpidnp36

Hi Ludo,

Toggle quote (2 lines)

> Another option is to patch Makefile.in to avoid the dependency on> Autoconf/Automake/Libool + this phase.

it’s only a native-input, so should be fine?

Toggle quote (2 lines)

> This is incorrect (see patch below, which also includes indentation> fixes and minor changes to the description to placate ‘guix lint’.)

My bad, forgot to run it :(

Toggle quote (2 lines)

> Also, could you add a comment stating whether it’s dual-licensing or> just that there’s code in both licenses?

Done.

Toggle quote (1 lines)

> A one-line comment at the top explaining what it does would be great.

Done.

Toggle quote (1 lines)

> Otherwise LGTM. Could you send an updated patch?

See attachment. I’ve also enabled the plugin curl_json, which depends onlibyajl.
Cheers,Lars

From 4f7f52ff168ba63692cf0f73e344847ef1637566 Mon Sep 17 00:00:00 2001From: Lars-Dominik Braun <ldb@leibniz-psychology.org>Date: Tue, 28 Apr 2020 10:50:10 +0200Subject: [PATCH] gnu: Add collectd
* gnu/packages/monitoring.scm (collectd): New variable* gnu/local.mk (dist_patch_DATA): Add new patch* gnu/packages/patches/collectd-5.11.0-noinstallvar.patch: New file--- gnu/local.mk                                  |  1 + gnu/packages/monitoring.scm                   | 51 ++++++++++++++++++- .../collectd-5.11.0-noinstallvar.patch        | 21 ++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/collectd-5.11.0-noinstallvar.patch

Toggle diff (125 lines)diff --git a/gnu/local.mk b/gnu/local.mkindex 9f212434a9..dea50618b0 100644--- a/gnu/local.mk+++ b/gnu/local.mk@@ -816,6 +816,7 @@ dist_patch_DATA =						\   %D%/packages/patches/clucene-pkgconfig.patch			\   %D%/packages/patches/cmake-curl-certificates.patch		\   %D%/packages/patches/coda-use-system-libs.patch		\+  %D%/packages/patches/collectd-5.11.0-noinstallvar.patch		\   %D%/packages/patches/combinatorial-blas-awpm.patch		\   %D%/packages/patches/combinatorial-blas-io-fix.patch		\   %D%/packages/patches/containerd-test-with-go1.13.patch		\diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scmindex 8da31d6a84..d88bbc3aa3 100644--- a/gnu/packages/monitoring.scm+++ b/gnu/packages/monitoring.scm@@ -6,6 +6,7 @@ ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>+;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; ;;; This file is part of GNU Guix. ;;;@@ -32,6 +33,7 @@   #:use-module (guix build-system gnu)   #:use-module (guix build-system go)   #:use-module (guix utils)+  #:use-module (gnu packages)   #:use-module (gnu packages admin)   #:use-module (gnu packages autotools)   #:use-module (gnu packages base)@@ -48,11 +50,14 @@   #:use-module (gnu packages libevent)   #:use-module (gnu packages pcre)   #:use-module (gnu packages perl)+  #:use-module (gnu packages pkg-config)   #:use-module (gnu packages python)   #:use-module (gnu packages python-web)   #:use-module (gnu packages python-xyz)+  #:use-module (gnu packages rrdtool)   #:use-module (gnu packages time)-  #:use-module (gnu packages tls))+  #:use-module (gnu packages tls)+  #:use-module (gnu packages web))  (define-public nagios   (package@@ -445,3 +450,47 @@ written in Go with pluggable metric collectors.")     (description "This package provides a file system monitor.")     (home-page "https://github.com/emcrisostomo/fswatch")     (license license:gpl3+)))++(define-public collectd+  (package+    (name "collectd")+    (version "5.11.0")+    (source (origin+              (method url-fetch)+              (uri (string-append+                    "https://storage.googleapis.com/collectd-tarballs/collectd-"+                    version+                    ".tar.bz2"))+              (sha256+               (base32+                "1cjxksxdqcqdccz1nbnc2fp6yy84qq361ynaq5q8bailds00mc9p"))+              (patches (search-patches "collectd-5.11.0-noinstallvar.patch"))))+    (build-system gnu-build-system)+    (arguments+     `(#:configure-flags (list "--localstatedir=/var" "--sysconfdir=/etc")+       #:phases (modify-phases %standard-phases+                  (add-before 'configure 'autoreconf+                    (lambda _+                      ;; Required because of patched sources.+                      (invoke "autoreconf" "-vfi"))))))+    (inputs+     `(("rrdtool" ,rrdtool)+       ("curl" ,curl)+       ("libyajl" ,libyajl)))+    (native-inputs+     `(("autoconf" ,autoconf)+       ("automake" ,automake)+       ("libtool" ,libtool)+       ("pkg-config" ,pkg-config)))+    (home-page "https://collectd.org/")+    (synopsis "Collect system and application performance metrics periodically")+    (description+     "collectd gathers metrics from various sources such as the operating system,+applications, log files and external devices, and stores this information or+makes it available over the network.  Those statistics can be used to monitor+systems, find performance bottlenecks (i.e., performance analysis) and predict+future system load (i.e., capacity planning).")+    ;; license:expat for the daemon in src/daemon/ and some plugins,+    ;; license:gpl2 for other plugins+    (license (list license:expat license:gpl2))))+diff --git a/gnu/packages/patches/collectd-5.11.0-noinstallvar.patch b/gnu/packages/patches/collectd-5.11.0-noinstallvar.patchnew file mode 100644index 0000000000..39cd9c763e--- /dev/null+++ b/gnu/packages/patches/collectd-5.11.0-noinstallvar.patch@@ -0,0 +1,21 @@+Disable creation of /var and /etc++--- a/Makefile.am	2020-03-08 16:57:09.511535600 +0100++++ b/Makefile.am	2020-04-21 11:36:49.827182272 +0200+@@ -2376,16 +2376,6 @@+ endif+ + install-exec-hook:+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)+-	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \+-	then \+-		$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \+-	else \+-		$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \+-	fi; \+ 	$(mkinstalldirs) $(DESTDIR)$(cpkgdatadir)+ 	$(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(cpkgdatadir)/types.db;+ 	$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \-- 2.20.1

Ludovic Courtès wrote on 4 May 2020 11:52

Recipients:(name . Lars-Dominik Braun)(address . ldb@leibniz-psychology.org)(address . 40925-done@debbugs.gnu.org)

Message-ID:87mu6orpqe.fsf@gnu.org

Hi,
Lars-Dominik Braun <ldb@leibniz-psychology.org> skribis:

Toggle quote (9 lines)

> From 4f7f52ff168ba63692cf0f73e344847ef1637566 Mon Sep 17 00:00:00 2001> From: Lars-Dominik Braun <ldb@leibniz-psychology.org>> Date: Tue, 28 Apr 2020 10:50:10 +0200> Subject: [PATCH] gnu: Add collectd>> * gnu/packages/monitoring.scm (collectd): New variable> * gnu/local.mk (dist_patch_DATA): Add new patch> * gnu/packages/patches/collectd-5.11.0-noinstallvar.patch: New file

Applied, thanks!
Ludo’.

Closed

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date