From dc563fa90201774a58b7f4af4858bf4470cba892 Mon Sep 17 00:00:00 2001 From: Manuel Rüger Date: Fri, 30 Mar 2018 16:27:17 +0200 Subject: app-metrics/node_exporter: Move package from net-analyzer/prometheus-node_exporter --- app-metrics/node_exporter/Manifest | 1 + .../node_exporter/files/node_exporter-1.initd | 19 +++++++++ .../node_exporter/files/node_exporter.confd | 2 + app-metrics/node_exporter/metadata.xml | 11 +++++ .../node_exporter/node_exporter-0.15.2.ebuild | 48 ++++++++++++++++++++++ net-analyzer/prometheus-node_exporter/Manifest | 1 - .../files/prometheus-node_exporter-1.initd | 19 --------- .../files/prometheus-node_exporter.confd | 2 - net-analyzer/prometheus-node_exporter/metadata.xml | 11 ----- .../prometheus-node_exporter-0.15.2.ebuild | 48 ---------------------- profiles/updates/1Q-2018 | 1 + 11 files changed, 82 insertions(+), 81 deletions(-) create mode 100644 app-metrics/node_exporter/Manifest create mode 100644 app-metrics/node_exporter/files/node_exporter-1.initd create mode 100644 app-metrics/node_exporter/files/node_exporter.confd create mode 100644 app-metrics/node_exporter/metadata.xml create mode 100644 app-metrics/node_exporter/node_exporter-0.15.2.ebuild delete mode 100644 net-analyzer/prometheus-node_exporter/Manifest delete mode 100644 net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd delete mode 100644 net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd delete mode 100644 net-analyzer/prometheus-node_exporter/metadata.xml delete mode 100644 net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest new file mode 100644 index 000000000000..12796da2f69d --- /dev/null +++ b/app-metrics/node_exporter/Manifest @@ -0,0 +1 @@ +DIST prometheus-node_exporter-0.15.2.tar.gz 1327204 BLAKE2B ee694771ed6d736fd4bb6a10f713f31becc930fb8225499d4b3a2a2cc7416c1816605cd8f4205dc37a2264af8d9f85e3519bc01844d252b6a70d4ee5f6308ece SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52 diff --git a/app-metrics/node_exporter/files/node_exporter-1.initd b/app-metrics/node_exporter/files/node_exporter-1.initd new file mode 100644 index 000000000000..e8268e487d2d --- /dev/null +++ b/app-metrics/node_exporter/files/node_exporter-1.initd @@ -0,0 +1,19 @@ +#!/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/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/${RC_SVCNAME}.log \ + --stderr /var/log/node_exporter/${RC_SVCNAME}.log" + +depend() { + after net +} diff --git a/app-metrics/node_exporter/files/node_exporter.confd b/app-metrics/node_exporter/files/node_exporter.confd new file mode 100644 index 000000000000..b65652001308 --- /dev/null +++ b/app-metrics/node_exporter/files/node_exporter.confd @@ -0,0 +1,2 @@ +# arguments for prometheus node exporter +command_args="--collector.textfile.directory=/var/lib/node_exporter/" diff --git a/app-metrics/node_exporter/metadata.xml b/app-metrics/node_exporter/metadata.xml new file mode 100644 index 000000000000..d758c8dfc417 --- /dev/null +++ b/app-metrics/node_exporter/metadata.xml @@ -0,0 +1,11 @@ + + + + + mrueg@gentoo.org + Manuel Rüger + + + prometheus/node_exporter + + diff --git a/app-metrics/node_exporter/node_exporter-0.15.2.ebuild b/app-metrics/node_exporter/node_exporter-0.15.2.ebuild new file mode 100644 index 000000000000..c85ca942ce7c --- /dev/null +++ b/app-metrics/node_exporter/node_exporter-0.15.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2018 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="98bc649" +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/node_exporter" +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/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}-1.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest deleted file mode 100644 index 12796da2f69d..000000000000 --- a/net-analyzer/prometheus-node_exporter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST prometheus-node_exporter-0.15.2.tar.gz 1327204 BLAKE2B ee694771ed6d736fd4bb6a10f713f31becc930fb8225499d4b3a2a2cc7416c1816605cd8f4205dc37a2264af8d9f85e3519bc01844d252b6a70d4ee5f6308ece SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52 diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd deleted file mode 100644 index e8268e487d2d..000000000000 --- a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd +++ /dev/null @@ -1,19 +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/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/${RC_SVCNAME}.log \ - --stderr /var/log/node_exporter/${RC_SVCNAME}.log" - -depend() { - after net -} diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd deleted file mode 100644 index b65652001308..000000000000 --- a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd +++ /dev/null @@ -1,2 +0,0 @@ -# arguments for prometheus node exporter -command_args="--collector.textfile.directory=/var/lib/node_exporter/" diff --git a/net-analyzer/prometheus-node_exporter/metadata.xml b/net-analyzer/prometheus-node_exporter/metadata.xml deleted file mode 100644 index d758c8dfc417..000000000000 --- a/net-analyzer/prometheus-node_exporter/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - mrueg@gentoo.org - Manuel Rüger - - - prometheus/node_exporter - - diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild deleted file mode 100644 index c85ca942ce7c..000000000000 --- a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 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="98bc649" -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/node_exporter" -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/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}-1.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018 index 49fd89ff026b..2bd65da8580e 100644 --- a/profiles/updates/1Q-2018 +++ b/profiles/updates/1Q-2018 @@ -15,3 +15,4 @@ move app-admin/prom2json app-metrics/prom2json move net-analyzer/prometheus app-metrics/prometheus move net-analyzer/prometheus-alertmanager app-metrics/alertmanager move dev-util/buildbot-prometheus app-metrics/buildbot-prometheus +move net-analyzer/prometheus-node_exporter app-metrics/node_exporter -- cgit v1.2.3-65-gdbad