From patchwork Tue Apr 28 09:29:38 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: 21701 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 ED2B227BBE4; Tue, 28 Apr 2020 10:41:30 +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 [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 21EE027BBE1 for ; Tue, 28 Apr 2020 10:41:30 +0100 (BST) Received: from localhost ([::1]:50058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTMk5-0004CC-JC for patchwork@mira.cbaines.net; Tue, 28 Apr 2020 05:41:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34408) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTMaW-0000hI-9I for guix-patches@gnu.org; Tue, 28 Apr 2020 05:35:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTMZ0-0002M1-LS for guix-patches@gnu.org; Tue, 28 Apr 2020 05:31:35 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTMZ0-0002Jb-48 for guix-patches@gnu.org; Tue, 28 Apr 2020 05:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTMZ0-00013V-0v for guix-patches@gnu.org; Tue, 28 Apr 2020 05:30:02 -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: Tue, 28 Apr 2020 09:30: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: 40925@debbugs.gnu.org Received: via spool by 40925-submit@debbugs.gnu.org id=B40925.15880661924018 (code B ref 40925); Tue, 28 Apr 2020 09:30:01 +0000 Received: (at 40925) by debbugs.gnu.org; 28 Apr 2020 09:29:52 +0000 Received: from localhost ([127.0.0.1]:38979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTMYp-00012k-ID for submit@debbugs.gnu.org; Tue, 28 Apr 2020 05:29:51 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:52048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTMYj-00012U-Re for 40925@debbugs.gnu.org; Tue, 28 Apr 2020 05:29:49 -0400 Received: by mail-wm1-f68.google.com with SMTP id x4so1937114wmj.1 for <40925@debbugs.gnu.org>; Tue, 28 Apr 2020 02:29:45 -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:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=J7hbiy4KeB13/EuCJODTPl5nIXReYabzhfCHIkTghjc=; b=HklLlNcECNhyhCCQLGpM3Ux0Vg/6br0OwOUrPVW5UHIYfJ3dOQh0DXA/sy5qH+DwdO Fo9hbpEVMX7elKY3S5svf400A9b7s82oC9HHEdjKQbMCLz593rb/r7v8WQSFAzBRViKB 5ne43tENp/KQPVx0OmgHfpH1meQeTOe0+/D1ed9q/f0b05ExRiIjR0xr8P4wXA1wvfzz B49lNYpdHyWEz/IPOX+BuI5ptvhtHM85qr7GmAWaop0CMAPPsljHvWhdKpX8BvShkWXA MtBALiyBopVoVwWuXSeoS+4+fVIXcYbEeztMY0WpYhqTfclH0LouOG0J8f+JOW2KBGWP cWEw== 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:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=J7hbiy4KeB13/EuCJODTPl5nIXReYabzhfCHIkTghjc=; b=LbaHkVImecDz3logNWjBLUajYKB5oAyfMc36CfTWgCGXq5g4qM1udgfuHAdQMHDLft o1hTTucPfARx7tSP91sRLv95L/dUB1VfdTSlPfi40BuxI3/bWJ9MdH2RxWhWvbXQofM8 idwL+ytsgBxnJwNbPxRRApkjeBWMMju4JsUB0rz0l6wRIcHcqkNHUMmGDDWyP7OVTPZQ tO9ARszw/ui+IR7FL/zoJ34HEKXTUaPi5HIjbpSLJSLkwMCGY6+MCTsNoQbbFZGdyv88 YuLG+YHJN4qiRrS8I7YISPGJYl0qXJePFbkpz3ObJzPGjk0RXUw/Ix53RkCKNYtnfrmA YbNw== X-Gm-Message-State: AGi0PuaweKMIcRVQPaCe5CgNVU6k4fVMth//DiM8F3kqTm4GkkVE1gXy lEtTPK9f+mN4VmCm0XDqp6jP0sBA/RelFTYe9UJpEmPaeDFRxuHgnNvyPDnygf2f+PtcaOkbMqs PTIGP5yiNuOrtiCpPrluHxGHRHbfS6d8c1td5KonPDd1C+n6x3wYlRKiUbyqDCYVh4DXA/x8sn8 bftn5PT66vbDo= X-Google-Smtp-Source: APiQypKM5Tuae/sw6xKqWZ0Ju6bvNK0WdBn6AqtJaqO5COa4C5iMd6xklgWe5W9kBwtqJcD8qYd+Ww== X-Received: by 2002:a1c:ab45:: with SMTP id u66mr3486608wme.152.1588066179809; Tue, 28 Apr 2020 02:29:39 -0700 (PDT) Received: from localhost (dynamic-2a01-0c22-d409-f400-e51b-6947-ed37-78cd.c22.pool.telefonica.de. [2a01:c22:d409:f400:e51b:6947:ed37:78cd]) by smtp.gmail.com with ESMTPSA id f2sm25937992wro.59.2020.04.28.02.29.38 for <40925@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 02:29:39 -0700 (PDT) Date: Tue, 28 Apr 2020 11:29:38 +0200 From: Lars-Dominik Braun Message-ID: <20200428092938.GB3395@zpidnp36> References: <20200428085719.GA3395@zpidnp36> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200428085719.GA3395@zpidnp36> 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-Received-From: 209.51.188.43 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, totally forgot to attach the patch. Here it is. Lars From 05110cd7f0af5f870daa48a1e32bff56efb2676a 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 | 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 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..5a37b14328 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,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.patch new file mode 100644 index 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