From patchwork Sat Nov 28 12:11:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 25408 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 00CDD27BBF9; Sat, 28 Nov 2020 12:12:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,UNPARSEABLE_RELAY, 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 ESMTPS id 9191227BBF8 for ; Sat, 28 Nov 2020 12:12:17 +0000 (GMT) Received: from localhost ([::1]:56188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiz5M-0000T4-PG for patchwork@mira.cbaines.net; Sat, 28 Nov 2020 07:12:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiz5A-0000Ea-GB for guix-patches@gnu.org; Sat, 28 Nov 2020 07:12:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kiz5A-0002uk-8V 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-0001CR-2x for guix-patches@gnu.org; Sat, 28 Nov 2020 07:12:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44922] [PATCH 6/6] monitoring: Support extra options for the Prometheus node exporter. 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.16065655224575 (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]:47053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiz57-0001BX-E9 for submit@debbugs.gnu.org; Sat, 28 Nov 2020 07:12:01 -0500 Received: from mira.cbaines.net ([212.71.252.8]:41132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiz55-0001B2-BD 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 76DFD27BBFA 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 c4cea26b for <44922@debbugs.gnu.org>; Sat, 28 Nov 2020 12:11:49 +0000 (UTC) From: Christopher Baines Date: Sat, 28 Nov 2020 12:11:49 +0000 Message-Id: <20201128121149.18639-6-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 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 There are plenty of options supported that the Guix configuration record doesn't help you with, so add this field to allow users to do their own thing. * gnu/services/monitoring.scm (): Add extra-options field. (prometheus-node-exporter-shepherd-service): Handle the extra options. * doc/guix.texi (Prometheus Node Exporter Service): Document this. --- doc/guix.texi | 3 +++ gnu/services/monitoring.scm | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6cd65b8739..dc624d89ec 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21918,6 +21918,9 @@ 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. +@item @code{extra-options} (default: @code{'()}) +Extra options to pass to the Prometheus node exporter. + @end table @end deftp diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index c4bae229b8..4b6f8ed623 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -128,7 +128,9 @@ HTTP.") (web-listen-address prometheus-node-exporter-web-listen-address (default ":9100")) (textfile-directory prometheus-node-exporter-textfile-directory - (default "/var/lib/prometheus/node-exporter"))) + (default "/var/lib/prometheus/node-exporter")) + (extra-options prometheus-node-exporter-extra-options + (default '()))) (define %prometheus-node-exporter-accounts (list (user-account @@ -145,7 +147,7 @@ HTTP.") (define prometheus-node-exporter-shepherd-service (match-lambda (( $ - package web-listen-address textfile-directory) + package web-listen-address textfile-directory extra-options) (list (shepherd-service (documentation "Prometheus node exporter.") @@ -157,7 +159,8 @@ HTTP.") #$@(if textfile-directory (list "--collector.textfile.directory" textfile-directory) - '())) + '()) + #$@extra-options) #:user "prometheus-node-exporter" #:group "prometheus-node-exporter" #:log-file "/var/log/prometheus-node-exporter.log"))