Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/prometheus-node_exporter/, ...
Date: Mon, 05 Jun 2017 15:24:50
Message-Id: 1496676245.4bc00c61a80e4fb21fa62b702797c9976366b923.mrueg@gentoo
1 commit: 4bc00c61a80e4fb21fa62b702797c9976366b923
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 5 15:24:05 2017 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 5 15:24:05 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc00c61
7
8 net-analyzer/prometheus-node_exporter: Version bump to 0.14.0
9
10 * Rename to node_exporter
11 * Rename user/group to prometheus-node_exporter
12 * Store textfiles in /var/node_exporter/textfiles
13
14 Package-Manager: Portage-2.3.6, Repoman-2.3.2
15
16 net-analyzer/prometheus-node_exporter/Manifest | 1 +
17 .../files/prometheus-node_exporter.confd | 2 +-
18 .../files/prometheus-node_exporter.initd | 14 +++----
19 .../prometheus-node_exporter-0.14.0.ebuild | 48 ++++++++++++++++++++++
20 4 files changed, 57 insertions(+), 8 deletions(-)
21
22 diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
23 index 20d2caed2d6..13c74cd4e9c 100644
24 --- a/net-analyzer/prometheus-node_exporter/Manifest
25 +++ b/net-analyzer/prometheus-node_exporter/Manifest
26 @@ -1,2 +1,3 @@
27 +DIST prometheus-node_exporter-0.14.0.tar.gz 1086402 SHA256 312d7e1c07d6a7548f2f116b983da87f7b3a7630f9332eb41c306fd71b2e6ec1 SHA512 28b1c3a17b0065f7005636f0751e535f9455675f7c17546a584fb709f43f2608e4854fe4e7f0e3790b89eff21016b41dccb0a96f16eae466de1040b57c4b1c98 WHIRLPOOL 176eb95a76fefb388817fa27f0b43fca9b1ed235d39e73e97254ef829025d7493f710ce0ef2cf11b00ffa509c08f7b12664cdff38939a5ea62eb79e7991c0bd3
28 DIST prometheus-node_exporter-0.14.0_rc1.tar.gz 1054858 SHA256 bcc2c544e1bac46d6768d4ddb59ec08fa4dfda2f370145c44dc80adff8a35b17 SHA512 1b54ddb48984408909a7112c411cb4dee9c8fc05fc3fabd1e1d9a4ff5c2e85b2d5dedd9c70027b2b4df7539d8b0e8d1958bb5e05f9a1abd08ad3e09d6c59b321 WHIRLPOOL d5b253ec6d67415eb0c82794f75f4d1d659fecb9d880429ef5c021bbe45ccef1304a6823c545b78175dbb01c37b06120008b9c92f44e9a6defa83bcfe2df4549
29 DIST prometheus-node_exporter-0.14.0_rc2.tar.gz 1084859 SHA256 e5d8a3245668e8a7453a86c929e04d2200a5730a497618715ef14f4642bdf364 SHA512 17800439eddb85bb8ec1e3fd5c1054610e41c419f5ec159a2f989d3d76ad5077350911773d866353912fc23bb12c0565f6f0a74e24825ab1c628723867a4a6ac WHIRLPOOL e4ce1c854d79bc6500bc04527a4b1dc3f7489ed34e0f2705cb2b9ddb7049aacb4dd0c13929d286ff80ca076662d78f08a77b42f2a3edcbb9b84e75b79613a6e7
30
31 diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd
32 index 2ada24d5cab..da59867f7e6 100644
33 --- a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd
34 +++ b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd
35 @@ -1,2 +1,2 @@
36 # arguments for docker-registry
37 -command_args="--collector.textfile.directory=/etc/prometheus-exporter"
38 +command_args="--collector.textfile.directory=/var/node_exporter/"
39
40 diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd
41 index 36dd35f9358..2009f854c6e 100644
42 --- a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd
43 +++ b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd
44 @@ -1,18 +1,18 @@
45 #!/sbin/openrc-run
46 -# Copyright 2016 Gentoo Foundation
47 +# Copyright 2016-2017 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49
50 description="Prometheus machine metrics exporter"
51 pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
52 -user=${user:-prometheus-exporter}
53 -group=${group:-prometheus-exporter}
54 +user=${user:-${SVCNAME}}
55 +group=${group:-${SVCNAME}}
56
57 -command="/usr/bin/prometheus-node_exporter"
58 -command_args="${command_args:--collector.textfile.directory=/etc/prometheus-exporter}"
59 +command="/usr/bin/node_exporter"
60 +command_args="${command_args:--collector.textfile.directory=/var/node_exporter/}"
61 command_background="true"
62 start_stop_daemon_args="--user ${user} --group ${group} \
63 - --stdout /var/log/prometheus-exporter/${SVCNAME}.log \
64 - --stderr /var/log/prometheus-exporter/${SVCNAME}.log"
65 + --stdout /var/log/node_exporter/${SVCNAME}.log \
66 + --stderr /var/log/node_exporter/${SVCNAME}.log"
67
68 depend() {
69 need net
70
71 diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0.ebuild
72 new file mode 100644
73 index 00000000000..7632511c4c1
74 --- /dev/null
75 +++ b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0.ebuild
76 @@ -0,0 +1,48 @@
77 +# Copyright 1999-2017 Gentoo Foundation
78 +# Distributed under the terms of the GNU General Public License v2
79 +
80 +EAPI=6
81 +inherit user golang-build golang-vcs-snapshot
82 +
83 +EGO_PN="github.com/prometheus/node_exporter"
84 +EGIT_COMMIT="v${PV/_rc/-rc.}"
85 +NODE_EXPORTER_COMMIT="840ba5d"
86 +ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
87 +KEYWORDS="~amd64"
88 +
89 +DESCRIPTION="Prometheus exporter for machine metrics"
90 +HOMEPAGE="https://github.com/prometheus/prometheus"
91 +SRC_URI="${ARCHIVE_URI}"
92 +LICENSE="Apache-2.0"
93 +SLOT="0"
94 +IUSE=""
95 +
96 +DEPEND="dev-util/promu"
97 +
98 +pkg_setup() {
99 + enewgroup ${PN}
100 + enewuser ${PN} -1 -1 -1 ${PN}
101 +}
102 +
103 +src_prepare() {
104 + default
105 + sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
106 +}
107 +
108 +src_compile() {
109 + pushd src/${EGO_PN} || die
110 + mkdir -p bin || die
111 + GOPATH="${S}" promu build -v --prefix node_exporter || die
112 + popd || die
113 +}
114 +
115 +src_install() {
116 + pushd src/${EGO_PN} || die
117 + dobin node_exporter
118 + dodoc {README,CHANGELOG,CONTRIBUTING}.md
119 + popd || die
120 + keepdir /var/node_exporter /var/log/node_exporter
121 + fowners ${PN}:${PN} /var/node_exporter /var/log/node_exporter
122 + newinitd "${FILESDIR}"/${PN}.initd ${PN}
123 + newconfd "${FILESDIR}"/${PN}.confd ${PN}
124 +}