From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id FYSdFAmxr15BMgAA0tVLHw (envelope-from ) for ; Mon, 04 May 2020 06:07:05 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id qC7nDxOxr14KKwAAB5/wlQ (envelope-from ) for ; Mon, 04 May 2020 06:07:15 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 01F38944608 for ; Mon, 4 May 2020 06:07:13 +0000 (UTC) Received: from localhost ([::1]:60734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVUG0-0000yf-QW for larch@yhetil.org; Mon, 04 May 2020 02:07:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVUFq-0000we-ER for guix-patches@gnu.org; Mon, 04 May 2020 02:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVUFq-00047F-4u for guix-patches@gnu.org; Mon, 04 May 2020 02:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jVUFp-0006tl-Vz for guix-patches@gnu.org; Mon, 04 May 2020 02:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40925] [PATCH] Add collectd Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 May 2020 06:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40925 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 40925@debbugs.gnu.org Received: via spool by 40925-submit@debbugs.gnu.org id=B40925.158857241926503 (code B ref 40925); Mon, 04 May 2020 06:07:01 +0000 Received: (at 40925) by debbugs.gnu.org; 4 May 2020 06:06:59 +0000 Received: from localhost ([127.0.0.1]:58827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVUFZ-0006tA-6I for submit@debbugs.gnu.org; Mon, 04 May 2020 02:06:58 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVUFQ-0006sp-Bw for 40925@debbugs.gnu.org; Mon, 04 May 2020 02:06:44 -0400 Received: by mail-wm1-f66.google.com with SMTP id k12so6973319wmj.3 for <40925@debbugs.gnu.org>; Sun, 03 May 2020 23:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leibniz-psychology-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=2jlhWLiLF46wrMwdcUJ7BaVZkAy/8UNY/Pu2GF3pnzw=; b=BOVsKpI/QkQ3ycq4ezvcMQSA5CvOeYLUNo8VHAXLqX+kuXbsmvIMNxustyvw6wwZjM Z49c7uFAC4GB0pzFl++cxhko23/LQSTWZ/9jzLdolJhD0DscCxbQZDV/n2Tv0Y9lh6g1 gvqk6JAbEsnajmfMb9RxzOWVYnPWtLi6ocmjNqxEuMaaDq5p7kGSFT/266CFrSwR6bs1 wWglN2rdmel8B2DiKdNG8PbgT2Xw2Al1bSE9qKGDgdByxqxs6/0uhDad9K4uK6CfHl0Q r2l5rziv0pWqtHr/8daylxKngEWqSvzgVTQBeeY5W5T6bvILPDdp2nElGUI3mouhVKkO Y4dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=2jlhWLiLF46wrMwdcUJ7BaVZkAy/8UNY/Pu2GF3pnzw=; b=ste45slWgy3/TPCdNiWZJkWGk1UwXfGr+qvSd0Dojgt5K02uiAgzI7zrlhtpYY37kx +tFeJ30oC0uWh0ndXJNGrP8K0Yt7lsApfr34DFgRGnqOoay5IuuE/F6DK3dzHXeEpmTP gZuwM6m/ojpiYqrVxlsEaYDA2tkTYCEURxQTONNILmacwxis+GRniRNKgZQWhQsEkLuw mlO7EgCoJKZb6Uww+PPDn48mpRsLWKNv7y6M5HAtGtO9T5LL+qzEEULHtALAsxRhFUUP P+zBd/fUUbGCnXA4ZUHXqC/kFZFt6wYsEGvxNOrRy/z6GxU0072Nz1Y4mHkS5babfiU+ xw4w== X-Gm-Message-State: AGi0PuY2HW/IYSThPS8p7V+aUtNTm3Xcw4c6NtuNHjn/0gi2kfmUWX6e 0J40twJldOSDGNrM6NUqJbwWdiK88vi3lCJ6tKY4CzcJIPKu1ax+3nSgL9aZL+zZcA0U9gxEMiI HrNlGlFf3LLQQmwkcAMZrnVRSf7YHAG+GYI9TyJob+OdFe5LqluXM9s0G69+4lpDqGO4f/EIMvb XaBCE= X-Google-Smtp-Source: APiQypKFJyKK0lGhlhmWseQxajqWSSNwIQTx2XzfiUGlQfby842gYEAl+4WNsNQioZ/bnOhOJbsmiA== X-Received: by 2002:a05:600c:210:: with SMTP id 16mr12105265wmi.57.1588572390342; Sun, 03 May 2020 23:06:30 -0700 (PDT) Received: from localhost (dynamic-2a01-0c22-d074-6200-788c-b06f-e777-c0da.c22.pool.telefonica.de. [2a01:c22:d074:6200:788c:b06f:e777:c0da]) by smtp.gmail.com with ESMTPSA id s6sm11619181wmh.17.2020.05.03.23.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 May 2020 23:06:29 -0700 (PDT) Date: Mon, 4 May 2020 08:06:29 +0200 From: Lars-Dominik Braun Message-ID: <20200504060629.GA3179@zpidnp36> References: <20200428085719.GA3395@zpidnp36> <20200428092938.GB3395@zpidnp36> <87wo5winax.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="pvezYHf7grwyp3Bc" Content-Disposition: inline In-Reply-To: <87wo5winax.fsf@gnu.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: -1.61 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=leibniz-psychology-org.20150623.gappssmtp.com header.s=20150623 header.b=BOVsKpI/; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [-1.61 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.49410610651606]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.14), country: US(-0.00), ip: 2001:470:142::17(-0.49)]; HAS_ATTACHMENT(0.00)[]; R_DKIM_REJECT(1.00)[leibniz-psychology-org.20150623.gappssmtp.com:s=20150623]; DWL_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; RCPT_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[leibniz-psychology-org.20150623.gappssmtp.com:-]; MAILLIST(-0.20)[mailman]; SIGNED_PGP(-2.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:+,4:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[ldb@leibniz-psychology.org,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[makefile.in:url,leibniz-psychology.org:email,collectd.org:url,storage.googleapis.com:url]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain,text/x-diff]; PREVIOUSLY_DELIVERED(0.00)[40925@debbugs.gnu.org]; DMARC_NA(0.00)[leibniz-psychology.org]; HAS_LIST_UNSUB(-0.01)[]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_COUNT_SEVEN(0.00)[9]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: 47prKgDImU7l --pvezYHf7grwyp3Bc Content-Type: multipart/mixed; boundary="UugvWAfsgieZRqgk" Content-Disposition: inline --UugvWAfsgieZRqgk Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Ludo, > Another option is to patch Makefile.in to avoid the dependency on > Autoconf/Automake/Libool + this phase. it=E2=80=99s only a native-input, so should be fine? > This is incorrect (see patch below, which also includes indentation > fixes and minor changes to the description to placate =E2=80=98guix lint= =E2=80=99.) My bad, forgot to run it :( > Also, could you add a comment stating whether it=E2=80=99s dual-licensing= or > just that there=E2=80=99s code in both licenses? Done. > A one-line comment at the top explaining what it does would be great. Done. > Otherwise LGTM. Could you send an updated patch? See attachment. I=E2=80=99ve also enabled the plugin curl_json, which depen= ds on libyajl. Cheers, Lars --UugvWAfsgieZRqgk Content-Type: text/x-diff; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-Add-collectd.patch" Content-Transfer-Encoding: quoted-printable =46rom 4f7f52ff168ba63692cf0f73e344847ef1637566 Mon Sep 17 00:00:00 2001 =46rom: Lars-Dominik Braun 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 --- 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 diff --git a/gnu/local.mk b/gnu/local.mk index 9f212434a9..dea50618b0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -816,6 +816,7 @@ dist_patch_DATA =3D \ %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.scm index 8da31d6a84..d88bbc3aa3 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -6,6 +6,7 @@ ;;; Copyright =A9 2018 G=E1bor Boskovits ;;; Copyright =A9 2018, 2019 Oleg Pykhalov ;;; Copyright =A9 2020 Alex ter Weele +;;; Copyright =A9 2020 Lars-Dominik Braun ;;; ;;; 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)) =20 (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/coll= ectd-" + 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=3D/var" "--sysconfdir=3D/e= tc") + #: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 periodic= ally") + (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 moni= tor +systems, find performance bottlenecks (i.e., performance analysis) and pre= dict +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.patch new file mode 100644 index 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 +=20 + 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= =2Edb; + $(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \ --=20 2.20.1 --UugvWAfsgieZRqgk-- --pvezYHf7grwyp3Bc Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEyk+M9DfXR4/aBV/UQhN3ARo3hEYFAl6vsOEACgkQQhN3ARo3 hEaoHwv/ZeGpGSFCY8alsX3AP8CjzW+iXP1TXd4etXSLiHES8X88oO3X8tDJuNPF ///t2U01vHiRiCv6F4yyn+FSUzQUrVBcfOHTOw7OHRmevKh6oBDPtVz37X9ZENYb Ww2Dwwx18npr3BJ9xZjI4+zo0VVd5LmqRXEHit5p3MaDppuBGPep9Xbw7P5WsXgH 1MDHE3LzhlU3Curgoei60pzs0we4tZH5qDupNiHHbo41sriQedjGqVn1zId6YGTE 0ppWnQFCjEyDlc8KVgO9RakFvgtU6JR1SxBpDKG4/+RrAwMRghlGT4hx6kpjSBZP yPfr0Dt4GTGcvjVLq7mf8if/kJ6Pl/6i4k4moCXP04QU9nzfOi19+8MUSE/GVC61 0WdKnrC/UZw7Zzp015x70bvV9oJmMqbS3rkSWiHXa0KagOkLN6XCcps36Z16wZHy n6aZdM2Dn/tGCIO8WuBgXDADJO9JtbeOz9j4Ilaul/N4xa6oODx3P93OXvRXhMw1 P/5lvZuM =WEb1 -----END PGP SIGNATURE----- --pvezYHf7grwyp3Bc--