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 kDVyGKw+wl/2RwAA0tVLHw (envelope-from ) for ; Sat, 28 Nov 2020 12:12:28 +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 kCE6FKw+wl/tZQAAB5/wlQ (envelope-from ) for ; Sat, 28 Nov 2020 12:12:28 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.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 2B6BD94011A for ; Sat, 28 Nov 2020 12:12:28 +0000 (UTC) Received: from localhost ([::1]:56760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiz5X-0000i4-63 for larch@yhetil.org; Sat, 28 Nov 2020 07:12:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiz5A-0000F4-SI for guix-patches@gnu.org; Sat, 28 Nov 2020 07:12:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kiz5A-0002uu-Kt for guix-patches@gnu.org; Sat, 28 Nov 2020 07:12:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kiz5A-0001CY-FT for guix-patches@gnu.org; Sat, 28 Nov 2020 07:12:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44922] [PATCH 5/6] monitoring: Enable the Prometheus node exporter textfile collector. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Nov 2020 12:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44922 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44922@debbugs.gnu.org Received: via spool by 44922-submit@debbugs.gnu.org id=B44922.16065655224589 (code B ref 44922); Sat, 28 Nov 2020 12:12:04 +0000 Received: (at 44922) by debbugs.gnu.org; 28 Nov 2020 12:12:02 +0000 Received: from localhost ([127.0.0.1]:47055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiz57-0001Bk-RR for submit@debbugs.gnu.org; Sat, 28 Nov 2020 07:12:02 -0500 Received: from mira.cbaines.net ([212.71.252.8]:41134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiz55-0001B4-FP for 44922@debbugs.gnu.org; Sat, 28 Nov 2020 07:11:59 -0500 Received: from localhost (188.28.112.52.threembb.co.uk [188.28.112.52]) by mira.cbaines.net (Postfix) with ESMTPSA id 57EED27BBF8 for <44922@debbugs.gnu.org>; Sat, 28 Nov 2020 12:11:58 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e0705baf for <44922@debbugs.gnu.org>; Sat, 28 Nov 2020 12:11:49 +0000 (UTC) From: Christopher Baines Date: Sat, 28 Nov 2020 12:11:48 +0000 Message-Id: <20201128121149.18639-5-mail@cbaines.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201128121149.18639-1-mail@cbaines.net> References: <87zh31u1q0.fsf@cbaines.net> <20201128121149.18639-1-mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.73 X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-TUID: nbjs2vkcXFxE * gnu/services/monitoring.scm (): Add textfile-directory. (prometheus-node-exporter-textfile-directory, prometheus-node-exporter-activation): New procedures. (prometheus-node-exporter-shepherd-service): Pass --collector.textfile.directoryto the service. (prometheus-node-exporter-service-type): Extend the activation service type. * doc/guix.texi (Prometheus Node Exporter Service): Document. --- doc/guix.texi | 5 +++++ gnu/services/monitoring.scm | 27 ++++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ed41091cae..6cd65b8739 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21913,6 +21913,11 @@ The prometheus-node-exporter package to use. @item @code{web-listen-address} (default: @code{":9100"}) Bind the web interface to the specified address. +@item @code{textfile-directory} (default: @code{"/var/lib/prometheus/node-exporter"}) +This directory can be used to export metrics specific to this machine. +Files containing metrics in the text format, with the filename ending in +@code{.prom} should be placed in this directory. + @end table @end deftp diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index 239306fa39..c4bae229b8 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -126,7 +126,9 @@ HTTP.") (package prometheus-node-exporter-configuration-package (default go-github-com-prometheus-node-exporter)) (web-listen-address prometheus-node-exporter-web-listen-address - (default ":9100"))) + (default ":9100")) + (textfile-directory prometheus-node-exporter-textfile-directory + (default "/var/lib/prometheus/node-exporter"))) (define %prometheus-node-exporter-accounts (list (user-account @@ -143,7 +145,7 @@ HTTP.") (define prometheus-node-exporter-shepherd-service (match-lambda (( $ - package web-listen-address) + package web-listen-address textfile-directory) (list (shepherd-service (documentation "Prometheus node exporter.") @@ -151,12 +153,29 @@ HTTP.") (requirement '(networking)) (start #~(make-forkexec-constructor (list #$(file-append package "/bin/node_exporter") - "--web.listen-address" #$web-listen-address) + "--web.listen-address" #$web-listen-address + #$@(if textfile-directory + (list "--collector.textfile.directory" + textfile-directory) + '())) #:user "prometheus-node-exporter" #:group "prometheus-node-exporter" #:log-file "/var/log/prometheus-node-exporter.log")) (stop #~(make-kill-destructor))))))) +(define (prometheus-node-exporter-activation config) + (with-imported-modules '((guix build utils)) + #~(let ((textfile-directory + #$(prometheus-node-exporter-textfile-directory config))) + (use-modules (guix build utils)) + + (when textfile-directory + (let ((user (getpw "prometheus-node-exporter"))) + #t + (mkdir-p textfile-directory) + (chown textfile-directory (passwd:uid user) (passwd:gid user)) + (chmod textfile-directory #o775)))))) + (define prometheus-node-exporter-service-type (service-type (name 'prometheus-node-exporter) @@ -167,6 +186,8 @@ Prometheus.") (list (service-extension account-service-type (const %prometheus-node-exporter-accounts)) + (service-extension activation-service-type + prometheus-node-exporter-activation) (service-extension shepherd-root-service-type prometheus-node-exporter-shepherd-service))) (default-value (prometheus-node-exporter-configuration)))) -- 2.29.2