From patchwork Mon May 4 06:06:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 21889 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 35D0B27BBE1; Mon, 4 May 2020 07:07:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 54DBE27BBE4 for ; Mon, 4 May 2020 07:07:09 +0100 (BST) Received: from localhost ([::1]:60734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVUFw-0000yf-RN for patchwork@mira.cbaines.net; Mon, 04 May 2020 02:07:08 -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-Disposition: inline In-Reply-To: <87wo5winax.fsf@gnu.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Ludo, > 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? > 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 :( > Also, could you add a comment stating whether it’s dual-licensing or > just that there’s 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’ve also enabled the plugin curl_json, which depends on libyajl. Cheers, Lars From 4f7f52ff168ba63692cf0f73e344847ef1637566 Mon Sep 17 00:00:00 2001 From: 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 = \ %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 © 2018 Gábor Boskovits ;;; Copyright © 2018, 2019 Oleg Pykhalov ;;; Copyright © 2020 Alex ter Weele +;;; Copyright © 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)) (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.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 + + 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