From patchwork Sat Nov 28 12:11:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 25405 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 5DC0427BBF9; Sat, 28 Nov 2020 12:12:09 +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 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 0ABD827BBF8 for ; Sat, 28 Nov 2020 12:12:09 +0000 (GMT) Received: from localhost ([::1]:55706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiz5E-0000DA-2Z for patchwork@mira.cbaines.net; Sat, 28 Nov 2020 07:12:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiz58-0000D1-Se for guix-patches@gnu.org; Sat, 28 Nov 2020 07:12:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kiz58-0002uE-Jp for guix-patches@gnu.org; Sat, 28 Nov 2020 07:12:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kiz58-0001Br-Cx for guix-patches@gnu.org; Sat, 28 Nov 2020 07:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44922] [PATCH 1/6] services: monitoring: Neaten up 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:02 +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.16065655164510 (code B ref 44922); Sat, 28 Nov 2020 12:12:02 +0000 Received: (at 44922) by debbugs.gnu.org; 28 Nov 2020 12:11:56 +0000 Received: from localhost ([127.0.0.1]:47041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiz52-0001Ag-Cd for submit@debbugs.gnu.org; Sat, 28 Nov 2020 07:11:56 -0500 Received: from mira.cbaines.net ([212.71.252.8]:41124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiz51-0001AT-Dn for 44922@debbugs.gnu.org; Sat, 28 Nov 2020 07:11:55 -0500 Received: from localhost (188.28.112.52.threembb.co.uk [188.28.112.52]) by mira.cbaines.net (Postfix) with ESMTPSA id D88C927BBF8 for <44922@debbugs.gnu.org>; Sat, 28 Nov 2020 12:11:53 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 14ceb0c4 for <44922@debbugs.gnu.org>; Sat, 28 Nov 2020 12:11:49 +0000 (UTC) From: Christopher Baines Date: Sat, 28 Nov 2020 12:11:44 +0000 Message-Id: <20201128121149.18639-1-mail@cbaines.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <87zh31u1q0.fsf@cbaines.net> References: <87zh31u1q0.fsf@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 Add relevant exports, as well as a comment to better indicate where the relevant code starts. * gnu/services/monitoring.scm (prometheus-node-exporter-service-type): Capitalise Prometheus. --- gnu/services/monitoring.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index da3d736ba6..92df52b5ae 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -36,8 +36,12 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-35) #:export (darkstat-configuration - prometheus-node-exporter-configuration darkstat-service-type + + prometheus-node-exporter-configuration + prometheus-node-exporter-configuration? + prometheus-node-exporter-configuration-package + prometheus-node-exporter-web-listen-address prometheus-node-exporter-service-type zabbix-server-configuration @@ -110,6 +114,11 @@ HTTP.") (service-extension shepherd-root-service-type (compose list darkstat-shepherd-service)))))) + +;;; +;;; Prometheus node exporter +;;; + (define-record-type* prometheus-node-exporter-configuration make-prometheus-node-exporter-configuration @@ -137,7 +146,7 @@ HTTP.") (name 'prometheus-node-exporter) (description "Run @command{node_exporter} to serve hardware and OS metrics to -prometheus.") +Prometheus.") (extensions (list (service-extension shepherd-root-service-type