* [gentoo-commits] repo/gentoo:master commit in: app-metrics/node_exporter/, app-metrics/node_exporter/files/
@ 2022-10-14 17:20 William Hubbs
0 siblings, 0 replies; 5+ messages in thread
From: William Hubbs @ 2022-10-14 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 57815e3bae0ad8bb6658fd2754732cc51f52a430
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 17:18:28 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 17:19:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57815e3b
app-metrics/node_exporter: add 1.4.0
Closes: https://bugs.gentoo.org/876241
Closes: https://github.com/gentoo/gentoo/27701
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-metrics/node_exporter/Manifest | 2 +
.../node_exporter/files/node_exporter.initd-1 | 23 +++++++++++
.../node_exporter/files/node_exporter.service-1 | 13 +++++++
.../node_exporter/node_exporter-1.4.0.ebuild | 45 ++++++++++++++++++++++
4 files changed, 83 insertions(+)
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index d0c9cfabf358..b5b086e2a012 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,2 +1,4 @@
DIST node_exporter-1.3.1-deps.tar.xz 110247608 BLAKE2B 0c3cbea40927a2f780aea4113846a95fb24e79a03f53d880ec0cb4ad805e94dd2cd48402ad08673835e4bce2f06548a452dfb3a9f6f53b5d2d7b0a24048de5be SHA512 d7f7976f8ca3825876f8d246c58dccb6973edcb2e7a572c690b9ca8c8d7935bc0f225ab0285eacbaa93767b6f4181324b168338765a35a7e3112c32f926a3c8a
DIST node_exporter-1.3.1.tar.gz 299038 BLAKE2B 8c4b562fab36632f6a4bcfc0c7bc65484bd9d44b16691a3d531c3e163ab17bf0fe81712d5ea3115460144be246599fc3430a80dd2244981333f0e1e5b2384c80 SHA512 cd73ca3551b0b52307d8b76aff29bf497609a1729203da9898270d1441d3358e8d9ba907bb8a75b5934ed64a8cf6b360385b1b2d0a3de55e0e149e0f819e0a1f
+DIST node_exporter-1.4.0-deps.tar.xz 24623388 BLAKE2B 76ea5392f3f4ee2d76706d77625a0b1708f0a09d11dde1fc7511f62625cf7d2e26117eb8ed77c495d4e1d7aa98c62dfbaffc7310c415d831a670360705789975 SHA512 9e64c1d51bd47cb6a8caa5fd6f22846c266ebb86c79e5f8ab363e847c614fca4044e7c388691870e61a8f017f08c2b5bcada56c8390bdf9877e71ccdbd646ad9
+DIST node_exporter-1.4.0.tar.gz 325743 BLAKE2B df6af555035c70930a610790e8d5eee87ca12cd27308ed95edf875da8615b61dde805d960d6262587322abecb721695bd42b1c078a7bcc40b24053cfce86015d SHA512 ebb4f9662ba995130b96e108050571119da368a8195e50896a19aab04d7cb40d60f9ae81052a0de08f571886cfb4150bf006a7b67a3d3683f2d04b5f43d61e7a
diff --git a/app-metrics/node_exporter/files/node_exporter.initd-1 b/app-metrics/node_exporter/files/node_exporter.initd-1
new file mode 100644
index 000000000000..6e9de80da590
--- /dev/null
+++ b/app-metrics/node_exporter/files/node_exporter.initd-1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus machine metrics exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/sbin/node_exporter"
+command_args="${command_args:---collector.textfile.directory=/var/lib/node_exporter/}"
+command_background="true"
+command_user="${user}:${group}"
+output_log="/var/log/node_exporter/${RC_SVCNAME}.log"
+error_log="/var/log/node_exporter/${RC_SVCNAME}.log"
+
+depend() {
+ after net
+}
+
+start_pre() {
+ checkpath -q -d -m 0755 -o ${user}:${group} /var/log/node_exporter
+}
diff --git a/app-metrics/node_exporter/files/node_exporter.service-1 b/app-metrics/node_exporter/files/node_exporter.service-1
new file mode 100644
index 000000000000..81909b962b87
--- /dev/null
+++ b/app-metrics/node_exporter/files/node_exporter.service-1
@@ -0,0 +1,13 @@
+[Unit]
+Description=Node Exporter
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+User=node_exporter
+Group=node_exporter
+Type=simple
+ExecStart=/usr/sbin/node_exporter --collector.textfile.directory=/var/lib/node_exporter/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/node_exporter/node_exporter-1.4.0.ebuild b/app-metrics/node_exporter/node_exporter-1.4.0.ebuild
new file mode 100644
index 000000000000..91cb5773c610
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-1.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+MY_PV="v${PV/_rc/-rc.}"
+NODE_EXPORTER_COMMIT=7da1321761b3b8dfc9e496e1a60e6a476fec6018
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+COMMON_DEPEND="acct-group/node_exporter
+ acct-user/node_exporter"
+DEPEND=">=dev-util/promu-0.3.0
+ ${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu.yml || die
+ sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu-cgo.yml || die
+}
+
+src_compile() {
+ mkdir -p bin || die
+ promu build -v --prefix node_exporter || die
+}
+
+src_install() {
+ dosbin node_exporter/node_exporter
+ dodoc {README,CHANGELOG,CONTRIBUTING}.md
+ systemd_newunit "${FILESDIR}"/node_exporter.service-1 node_exporter.service
+ newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ keepdir /var/lib/node_exporter /var/log/node_exporter
+ fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-metrics/node_exporter/, app-metrics/node_exporter/files/
@ 2023-11-23 12:39 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-11-23 12:39 UTC (permalink / raw
To: gentoo-commits
commit: a16385bedc505baf806146be2a00411c2a513c70
Author: Rahil Bhimjiani <rahil3108 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 16:49:02 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 23 12:38:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a16385be
app-metrics/node_exporter: drop 1.3.1, 1.4.0 & cleanup
As 1.5.0 has been stable for quite a while.
[sam: Maintainer timeout after pings on IRC and in the bug.]
Signed-off-by: Rahil Bhimjiani <rahil3108 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33147
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-metrics/node_exporter/Manifest | 4 --
.../node_exporter/files/node_exporter.initd | 23 ----------
.../node_exporter/files/node_exporter.service | 13 ------
.../node_exporter/node_exporter-1.3.1.ebuild | 47 --------------------
.../node_exporter/node_exporter-1.4.0.ebuild | 51 ----------------------
5 files changed, 138 deletions(-)
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index 147b0122a53c..9578314e6978 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,7 +1,3 @@
-DIST node_exporter-1.3.1-deps.tar.xz 110247608 BLAKE2B 0c3cbea40927a2f780aea4113846a95fb24e79a03f53d880ec0cb4ad805e94dd2cd48402ad08673835e4bce2f06548a452dfb3a9f6f53b5d2d7b0a24048de5be SHA512 d7f7976f8ca3825876f8d246c58dccb6973edcb2e7a572c690b9ca8c8d7935bc0f225ab0285eacbaa93767b6f4181324b168338765a35a7e3112c32f926a3c8a
-DIST node_exporter-1.3.1.tar.gz 299038 BLAKE2B 8c4b562fab36632f6a4bcfc0c7bc65484bd9d44b16691a3d531c3e163ab17bf0fe81712d5ea3115460144be246599fc3430a80dd2244981333f0e1e5b2384c80 SHA512 cd73ca3551b0b52307d8b76aff29bf497609a1729203da9898270d1441d3358e8d9ba907bb8a75b5934ed64a8cf6b360385b1b2d0a3de55e0e149e0f819e0a1f
-DIST node_exporter-1.4.0-deps.tar.xz 24623388 BLAKE2B 76ea5392f3f4ee2d76706d77625a0b1708f0a09d11dde1fc7511f62625cf7d2e26117eb8ed77c495d4e1d7aa98c62dfbaffc7310c415d831a670360705789975 SHA512 9e64c1d51bd47cb6a8caa5fd6f22846c266ebb86c79e5f8ab363e847c614fca4044e7c388691870e61a8f017f08c2b5bcada56c8390bdf9877e71ccdbd646ad9
-DIST node_exporter-1.4.0.tar.gz 325743 BLAKE2B df6af555035c70930a610790e8d5eee87ca12cd27308ed95edf875da8615b61dde805d960d6262587322abecb721695bd42b1c078a7bcc40b24053cfce86015d SHA512 ebb4f9662ba995130b96e108050571119da368a8195e50896a19aab04d7cb40d60f9ae81052a0de08f571886cfb4150bf006a7b67a3d3683f2d04b5f43d61e7a
DIST node_exporter-1.5.0-deps.tar.xz 25558844 BLAKE2B fd862394c4e9456af395af4a1a8fb5c9504b96fcfa5170027903edadcf29935ffa389a945a8306e59e8d373b238481090e61dca4d9b037d890e8df05a5c8ede7 SHA512 5141beabd6f6af57014d2095271ea7c9a7e6087d9939cf6fc4a89908df0a5b87267f469987d47b20a48411d5a01a1317c53bfad8138dcfa6aa80c0a9f3822aa7
DIST node_exporter-1.5.0.tar.gz 329004 BLAKE2B 650e176ce15be980f9a3534f3246b577390d6d557b0ac7aa5341f3c91390bed829c4c3c3f60a4c108c814945134dc83639e12a13f416471e9c791ec88ed8a7bd SHA512 5b6d1da70a3458a1de270bcaf6ab177bd41c8b7031e67a4691b0b79931d15f0e22dbe1533f1ff0474496fcf4433bbd4b3473b8c0063f8891456960d7b6f56e15
DIST node_exporter-1.7.0-deps.tar.xz 26490120 BLAKE2B 3177aa96a50eefaeafad73b293144772443428b8c1b90210230e3e508a678f5515aebec1c51661d47a1e021cd03c8febe9aa948cc3d955eff2b2f272a539b6af SHA512 9fe19ad0fc375f4846fddb7618de5b34ddad583b5c6b09d896c099c3218976fd337c11765699a713c66bbaa834b6cfcaee960b1b1d4014be263b99b897fb1e1c
diff --git a/app-metrics/node_exporter/files/node_exporter.initd b/app-metrics/node_exporter/files/node_exporter.initd
deleted file mode 100644
index 3ccddf757a89..000000000000
--- a/app-metrics/node_exporter/files/node_exporter.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus machine metrics exporter"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/sbin/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/${RC_SVCNAME}.log \
- --stderr /var/log/node_exporter/${RC_SVCNAME}.log"
-
-depend() {
- after net
-}
-
-start_pre() {
- checkpath -q -d -m 0755 -o ${user}:${group} /var/log/node_exporter
-}
diff --git a/app-metrics/node_exporter/files/node_exporter.service b/app-metrics/node_exporter/files/node_exporter.service
deleted file mode 100644
index 20eac483fc8a..000000000000
--- a/app-metrics/node_exporter/files/node_exporter.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Node Exporter
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-User=node_exporter
-Group=node_exporter
-Type=simple
-ExecStart=/usr/sbin/node_exporter
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-metrics/node_exporter/node_exporter-1.3.1.ebuild b/app-metrics/node_exporter/node_exporter-1.3.1.ebuild
deleted file mode 100644
index 983e6beeaca1..000000000000
--- a/app-metrics/node_exporter/node_exporter-1.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-MY_PV="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT=a2321e7
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="selinux"
-
-CDEPEND="acct-group/node_exporter
- acct-user/node_exporter"
-DEPEND=">=dev-util/promu-0.3.0
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-node_exporter )"
-
-S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu.yml || die
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu-cgo.yml || die
-}
-
-src_compile() {
- mkdir -p bin || die
- promu build -v --prefix node_exporter || die
-}
-
-src_install() {
- dosbin node_exporter/node_exporter
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- systemd_dounit "${FILESDIR}"/node_exporter.service
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- keepdir /var/lib/node_exporter /var/log/node_exporter
- fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-}
diff --git a/app-metrics/node_exporter/node_exporter-1.4.0.ebuild b/app-metrics/node_exporter/node_exporter-1.4.0.ebuild
deleted file mode 100644
index 2017364f299d..000000000000
--- a/app-metrics/node_exporter/node_exporter-1.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-MY_PV="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT=7da1321761b3b8dfc9e496e1a60e6a476fec6018
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="selinux"
-
-COMMON_DEPEND="acct-group/node_exporter
- acct-user/node_exporter"
-DEPEND=">=dev-util/promu-0.3.0
- ${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-node_exporter )"
-
-S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu.yml || die
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu-cgo.yml || die
-}
-
-src_compile() {
- mkdir -p bin || die
- promu build -v --prefix node_exporter || die
-}
-
-src_test() {
- emake test-flags= test
-}
-
-src_install() {
- dosbin node_exporter/node_exporter
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- systemd_newunit "${FILESDIR}"/node_exporter.service-1 node_exporter.service
- newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- keepdir /var/lib/node_exporter /var/log/node_exporter
- fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-metrics/node_exporter/, app-metrics/node_exporter/files/
@ 2024-02-23 12:54 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2024-02-23 12:54 UTC (permalink / raw
To: gentoo-commits
commit: bfc0f694b28056d165b0be6c7d1a645dc921c28b
Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Wed Jan 10 20:14:50 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 12:53:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfc0f694
app-metrics/node_exporter: drop 1.5.0
Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-metrics/node_exporter/Manifest | 2 -
.../node_exporter/files/node_exporter.service-1 | 13 ------
.../node_exporter/node_exporter-1.5.0.ebuild | 51 ----------------------
3 files changed, 66 deletions(-)
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index 9578314e6978..2957bf62ecd8 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,4 +1,2 @@
-DIST node_exporter-1.5.0-deps.tar.xz 25558844 BLAKE2B fd862394c4e9456af395af4a1a8fb5c9504b96fcfa5170027903edadcf29935ffa389a945a8306e59e8d373b238481090e61dca4d9b037d890e8df05a5c8ede7 SHA512 5141beabd6f6af57014d2095271ea7c9a7e6087d9939cf6fc4a89908df0a5b87267f469987d47b20a48411d5a01a1317c53bfad8138dcfa6aa80c0a9f3822aa7
-DIST node_exporter-1.5.0.tar.gz 329004 BLAKE2B 650e176ce15be980f9a3534f3246b577390d6d557b0ac7aa5341f3c91390bed829c4c3c3f60a4c108c814945134dc83639e12a13f416471e9c791ec88ed8a7bd SHA512 5b6d1da70a3458a1de270bcaf6ab177bd41c8b7031e67a4691b0b79931d15f0e22dbe1533f1ff0474496fcf4433bbd4b3473b8c0063f8891456960d7b6f56e15
DIST node_exporter-1.7.0-deps.tar.xz 26490120 BLAKE2B 3177aa96a50eefaeafad73b293144772443428b8c1b90210230e3e508a678f5515aebec1c51661d47a1e021cd03c8febe9aa948cc3d955eff2b2f272a539b6af SHA512 9fe19ad0fc375f4846fddb7618de5b34ddad583b5c6b09d896c099c3218976fd337c11765699a713c66bbaa834b6cfcaee960b1b1d4014be263b99b897fb1e1c
DIST node_exporter-1.7.0.tar.gz 328830 BLAKE2B 5f6b8101637bc0df605ea84446f905fcf8abeb68d0f2eda1e172b12aae4cffcfef54996f8725ad458671947c72a48fbbd73d4d401d8fd001e9e9d75f248230fc SHA512 4cd38b81cb54ca620a57c642a88b89d6d1ae36a752fff5f065c8848ea02066a211c6feb955bea4e311f7baafffee30a74670efe1cf4dac113c9bf7d154a1067b
diff --git a/app-metrics/node_exporter/files/node_exporter.service-1 b/app-metrics/node_exporter/files/node_exporter.service-1
deleted file mode 100644
index 81909b962b87..000000000000
--- a/app-metrics/node_exporter/files/node_exporter.service-1
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Node Exporter
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-User=node_exporter
-Group=node_exporter
-Type=simple
-ExecStart=/usr/sbin/node_exporter --collector.textfile.directory=/var/lib/node_exporter/
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-metrics/node_exporter/node_exporter-1.5.0.ebuild b/app-metrics/node_exporter/node_exporter-1.5.0.ebuild
deleted file mode 100644
index 9070a0c9c072..000000000000
--- a/app-metrics/node_exporter/node_exporter-1.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-MY_PV="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT=1b48970ffcf5630534fb00bb0687d73c66d1c959
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="selinux"
-
-COMMON_DEPEND="acct-group/node_exporter
- acct-user/node_exporter"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-node_exporter )"
-BDEPEND=">=dev-util/promu-0.3.0"
-
-S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu.yml || die
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu-cgo.yml || die
-}
-
-src_compile() {
- mkdir -p bin || die
- promu build -v --prefix node_exporter || die
-}
-
-src_test() {
- emake test-flags= test
-}
-
-src_install() {
- dosbin node_exporter/node_exporter
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- systemd_newunit "${FILESDIR}"/node_exporter.service-1 node_exporter.service
- newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- keepdir /var/lib/node_exporter /var/log/node_exporter
- fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-metrics/node_exporter/, app-metrics/node_exporter/files/
@ 2024-03-16 9:09 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2024-03-16 9:09 UTC (permalink / raw
To: gentoo-commits
commit: 5e9eb52e406f20e90540b3f4f782ed29eb1977a0
Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Tue Feb 13 18:01:01 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 09:07:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e9eb52e
app-metrics/node_exporter: add 1.7.0-r1
* Remove the patch, staying close to upstream. Adjust conf.d and
systemd.service exec args accordingly
* update 9999 ebuild to code style of 1.7.0
* Fix ordering of src_prepare
Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/35308
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/node_exporter-1.7.0.service | 2 +-
.../node_exporter/files/node_exporter.confd | 2 +-
...r-9999.ebuild => node_exporter-1.7.0-r1.ebuild} | 29 +++++++++++-----------
.../node_exporter/node_exporter-9999.ebuild | 29 +++++++++++-----------
4 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/app-metrics/node_exporter/files/node_exporter-1.7.0.service b/app-metrics/node_exporter/files/node_exporter-1.7.0.service
index e704c809b8e5..b1723196b9db 100644
--- a/app-metrics/node_exporter/files/node_exporter-1.7.0.service
+++ b/app-metrics/node_exporter/files/node_exporter-1.7.0.service
@@ -9,7 +9,7 @@ User=node_exporter
Group=node_exporter
Restart=on-failure
Type=exec
-ExecStart=/usr/sbin/node_exporter
+ExecStart=/usr/sbin/node_exporter --collector.textfile.directory=/var/lib/node_exporter
ExecReload=/usr/bin/kill -HUP $MAINPID
TimeoutStopSec=20s
SendSIGKILL=no
diff --git a/app-metrics/node_exporter/files/node_exporter.confd b/app-metrics/node_exporter/files/node_exporter.confd
index b65652001308..2feccf6346e4 100644
--- a/app-metrics/node_exporter/files/node_exporter.confd
+++ b/app-metrics/node_exporter/files/node_exporter.confd
@@ -1,2 +1,2 @@
# arguments for prometheus node exporter
-command_args="--collector.textfile.directory=/var/lib/node_exporter/"
+command_args="--collector.textfile.directory=/var/lib/node_exporter/ --collector.textfile.directory=/var/lib/node_exporter"
diff --git a/app-metrics/node_exporter/node_exporter-9999.ebuild b/app-metrics/node_exporter/node_exporter-1.7.0-r1.ebuild
similarity index 83%
copy from app-metrics/node_exporter/node_exporter-9999.ebuild
copy to app-metrics/node_exporter/node_exporter-1.7.0-r1.ebuild
index e02032dc5f61..9e3f1d237576 100644
--- a/app-metrics/node_exporter/node_exporter-9999.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,22 +24,15 @@ LICENSE+=" BSD BSD-2 MIT"
SLOT="0"
IUSE="selinux systemd"
-RDEPEND="
+COMMON_DEPEND="
acct-group/node_exporter
acct-user/node_exporter
selinux? ( sec-policy/selinux-node_exporter )
systemd? ( sys-apps/systemd )
"
-DEPEND="${RDEPEND}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
BDEPEND=">=dev-util/promu-0.3.0"
-PATCHES=(
- "${FILESDIR}"/01-default-settings-1.7.0.patch
-)
-
-src_prepare() {
- default
- use !systemd && { sed -i -e "s|defaultEnabled|defaultDisabled|g;" collector/systemd_linux.go || die; }
-}
src_unpack() {
if [[ ${PV} == 9999* ]]; then
@@ -50,7 +43,16 @@ src_unpack() {
fi
}
+src_prepare() {
+ default
+ use systemd && { sed -i -e "s|defaultDisabled|defaultEnabled|g;" collector/systemd_linux.go || die; }
+}
+
src_compile() {
+ if use x86; then
+ #917577 pie breaks build on x86
+ GOFLAGS=${GOFLAGS//-buildmode=pie}
+ fi
promu build -v || die
./"${PN}" --help-man > "${PN}".1 || die
}
@@ -61,6 +63,8 @@ src_test() {
src_install() {
dosbin "${PN}"
+ dodoc example-rules.yml *.md
+ doman "${PN}".1
systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
@@ -68,7 +72,4 @@ src_install() {
newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
keepdir /var/lib/node_exporter /var/log/node_exporter
fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-
- doman "${PN}".1
- dodoc example-rules.yml *.md
}
diff --git a/app-metrics/node_exporter/node_exporter-9999.ebuild b/app-metrics/node_exporter/node_exporter-9999.ebuild
index e02032dc5f61..9e3f1d237576 100644
--- a/app-metrics/node_exporter/node_exporter-9999.ebuild
+++ b/app-metrics/node_exporter/node_exporter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,22 +24,15 @@ LICENSE+=" BSD BSD-2 MIT"
SLOT="0"
IUSE="selinux systemd"
-RDEPEND="
+COMMON_DEPEND="
acct-group/node_exporter
acct-user/node_exporter
selinux? ( sec-policy/selinux-node_exporter )
systemd? ( sys-apps/systemd )
"
-DEPEND="${RDEPEND}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
BDEPEND=">=dev-util/promu-0.3.0"
-PATCHES=(
- "${FILESDIR}"/01-default-settings-1.7.0.patch
-)
-
-src_prepare() {
- default
- use !systemd && { sed -i -e "s|defaultEnabled|defaultDisabled|g;" collector/systemd_linux.go || die; }
-}
src_unpack() {
if [[ ${PV} == 9999* ]]; then
@@ -50,7 +43,16 @@ src_unpack() {
fi
}
+src_prepare() {
+ default
+ use systemd && { sed -i -e "s|defaultDisabled|defaultEnabled|g;" collector/systemd_linux.go || die; }
+}
+
src_compile() {
+ if use x86; then
+ #917577 pie breaks build on x86
+ GOFLAGS=${GOFLAGS//-buildmode=pie}
+ fi
promu build -v || die
./"${PN}" --help-man > "${PN}".1 || die
}
@@ -61,6 +63,8 @@ src_test() {
src_install() {
dosbin "${PN}"
+ dodoc example-rules.yml *.md
+ doman "${PN}".1
systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
@@ -68,7 +72,4 @@ src_install() {
newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
keepdir /var/lib/node_exporter /var/log/node_exporter
fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-
- doman "${PN}".1
- dodoc example-rules.yml *.md
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-metrics/node_exporter/, app-metrics/node_exporter/files/
@ 2024-03-25 2:54 Zac Medico
0 siblings, 0 replies; 5+ messages in thread
From: Zac Medico @ 2024-03-25 2:54 UTC (permalink / raw
To: gentoo-commits
commit: 93b6d4d786d44bb144e4b766181a46a28f0c8e19
Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Mon Mar 18 20:01:35 2024 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 02:54:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93b6d4d7
app-metrics/node_exporter: fix 1.7.0-r1 and rev-bump to r2
I can't remember how did this happen. Maybe I blindly just added args to
.service unit and confd without checking if it was needed.
Closes: https://bugs.gentoo.org/927237
Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/35822
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-metrics/node_exporter/files/node_exporter.confd | 2 +-
.../{node_exporter-1.7.0-r1.ebuild => node_exporter-1.7.0-r2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-metrics/node_exporter/files/node_exporter.confd b/app-metrics/node_exporter/files/node_exporter.confd
index 2feccf6346e4..b65652001308 100644
--- a/app-metrics/node_exporter/files/node_exporter.confd
+++ b/app-metrics/node_exporter/files/node_exporter.confd
@@ -1,2 +1,2 @@
# arguments for prometheus node exporter
-command_args="--collector.textfile.directory=/var/lib/node_exporter/ --collector.textfile.directory=/var/lib/node_exporter"
+command_args="--collector.textfile.directory=/var/lib/node_exporter/"
diff --git a/app-metrics/node_exporter/node_exporter-1.7.0-r1.ebuild b/app-metrics/node_exporter/node_exporter-1.7.0-r2.ebuild
similarity index 100%
rename from app-metrics/node_exporter/node_exporter-1.7.0-r1.ebuild
rename to app-metrics/node_exporter/node_exporter-1.7.0-r2.ebuild
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-25 2:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-14 17:20 [gentoo-commits] repo/gentoo:master commit in: app-metrics/node_exporter/, app-metrics/node_exporter/files/ William Hubbs
-- strict thread matches above, loose matches on Subject: below --
2023-11-23 12:39 Sam James
2024-02-23 12:54 Joonas Niilola
2024-03-16 9:09 Joonas Niilola
2024-03-25 2:54 Zac Medico
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox