From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 794541396D1 for ; Mon, 18 Sep 2017 10:49:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95A961FC0A7; Mon, 18 Sep 2017 10:49:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5AE2B1FC017 for ; Mon, 18 Sep 2017 10:49:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D9E433BE3E for ; Mon, 18 Sep 2017 10:49:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 161F9907B for ; Mon, 18 Sep 2017 10:49:47 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1505731760.1b7db743e9c14944f1f08739408e266bdd996550.mrueg@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/prometheus-node_exporter/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild X-VCS-Directories: net-analyzer/prometheus-node_exporter/files/ net-analyzer/prometheus-node_exporter/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 1b7db743e9c14944f1f08739408e266bdd996550 X-VCS-Branch: master Date: Mon, 18 Sep 2017 10:49:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b50bbb8e-50e4-4950-acb7-fdfbc41af636 X-Archives-Hash: 334763e9d0b90f7417f5060d2de09154 commit: 1b7db743e9c14944f1f08739408e266bdd996550 Author: Manuel Rüger gentoo org> AuthorDate: Mon Sep 18 10:49:20 2017 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Mon Sep 18 10:49:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b7db743 net-analyzer/prometheus-node_exporter: Update init scripts wrt bug 631146 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../files/prometheus-node_exporter.initd | 15 +++---- .../prometheus-node_exporter-0.14.0-r1.ebuild | 48 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd index 1f7338f964e..57202a4ce47 100644 --- a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd +++ b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd @@ -3,22 +3,17 @@ # Distributed under the terms of the GNU General Public License v2 description="Prometheus machine metrics exporter" -pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"} -user=${user:-${SVCNAME}} -group=${group:-${SVCNAME}} +pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} +user=${user:-${RC_SVCNAME}} +group=${group:-${RC_SVCNAME}} command="/usr/bin/node_exporter" command_args="${command_args:--collector.textfile.directory=/var/lib/node_exporter/}" command_background="true" start_stop_daemon_args="--user ${user} --group ${group} \ - --stdout /var/log/node_exporter/${SVCNAME}.log \ - --stderr /var/log/node_exporter/${SVCNAME}.log" + --stdout /var/log/node_exporter/${RC_SVCNAME}.log \ + --stderr /var/log/node_exporter/${RC_SVCNAME}.log" depend() { - need net after net } - -start_pre() { - checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}" -} diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild new file mode 100644 index 00000000000..48eb30aac76 --- /dev/null +++ b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit user golang-build golang-vcs-snapshot + +EGO_PN="github.com/prometheus/node_exporter" +EGIT_COMMIT="v${PV/_rc/-rc.}" +NODE_EXPORTER_COMMIT="840ba5d" +ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64" + +DESCRIPTION="Prometheus exporter for machine metrics" +HOMEPAGE="https://github.com/prometheus/prometheus" +SRC_URI="${ARCHIVE_URI}" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +DEPEND="dev-util/promu" + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} +} + +src_prepare() { + default + sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die +} + +src_compile() { + pushd src/${EGO_PN} || die + mkdir -p bin || die + GOPATH="${S}" promu build -v --prefix node_exporter || die + popd || die +} + +src_install() { + pushd src/${EGO_PN} || die + dobin node_exporter + dodoc {README,CHANGELOG,CONTRIBUTING}.md + popd || die + keepdir /var/lib/node_exporter /var/log/node_exporter + fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +}