summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-metrics')
-rw-r--r--app-metrics/alertmanager/alertmanager-0.24.0.ebuild2
-rw-r--r--app-metrics/blackbox_exporter/blackbox_exporter-0.21.1.ebuild2
-rw-r--r--app-metrics/collectd/collectd-5.12.0-r7.ebuild5
-rw-r--r--app-metrics/collectd/files/collectd-5.12.0-python3_11.patch33
-rw-r--r--app-metrics/node_exporter/Manifest2
-rw-r--r--app-metrics/node_exporter/files/node_exporter.initd-123
-rw-r--r--app-metrics/node_exporter/files/node_exporter.service-113
-rw-r--r--app-metrics/node_exporter/node_exporter-1.4.0.ebuild45
-rw-r--r--app-metrics/prometheus/Manifest12
-rw-r--r--app-metrics/prometheus/prometheus-2.36.2.ebuild67
-rw-r--r--app-metrics/prometheus/prometheus-2.38.0.ebuild73
-rw-r--r--app-metrics/prometheus/prometheus-2.40.4.ebuild (renamed from app-metrics/prometheus/prometheus-2.37.1.ebuild)4
-rw-r--r--app-metrics/pushgateway/Manifest6
-rw-r--r--app-metrics/pushgateway/pushgateway-1.4.2.ebuild48
-rw-r--r--app-metrics/pushgateway/pushgateway-1.5.1.ebuild (renamed from app-metrics/pushgateway/pushgateway-1.4.3.ebuild)4
-rw-r--r--app-metrics/snmp_exporter/snmp_exporter-0.20.0-r1.ebuild2
16 files changed, 132 insertions, 209 deletions
diff --git a/app-metrics/alertmanager/alertmanager-0.24.0.ebuild b/app-metrics/alertmanager/alertmanager-0.24.0.ebuild
index 0e12326bff7..3a3cce2d449 100644
--- a/app-metrics/alertmanager/alertmanager-0.24.0.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.24.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RESTRICT+=" test"
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.21.1.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.21.1.ebuild
index 702f21755fc..dca6860bceb 100644
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.21.1.ebuild
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.21.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
COMMON_DEPEND="
acct-group/blackbox_exporter
diff --git a/app-metrics/collectd/collectd-5.12.0-r7.ebuild b/app-metrics/collectd/collectd-5.12.0-r7.ebuild
index 1b25586eb8f..26990d0f468 100644
--- a/app-metrics/collectd/collectd-5.12.0-r7.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r7.ebuild
@@ -170,7 +170,10 @@ REQUIRED_USE="
collectd_plugins_smart? ( udev )
contrib? ( perl )"
-PATCHES=( "${FILESDIR}"/${PN}-5.11.0-libsigrok-0.4+.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.11.0-libsigrok-0.4+.patch
+ "${FILESDIR}"/${PN}-5.12.0-python3_11.patch
+)
# @FUNCTION: collectd_plugin_kernel_linux
# @DESCRIPTION:
diff --git a/app-metrics/collectd/files/collectd-5.12.0-python3_11.patch b/app-metrics/collectd/files/collectd-5.12.0-python3_11.patch
new file mode 100644
index 00000000000..3c057288955
--- /dev/null
+++ b/app-metrics/collectd/files/collectd-5.12.0-python3_11.patch
@@ -0,0 +1,33 @@
+From 623e95394e0e62e7f9ced2104b786d21e9c0bf53 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Wed, 21 Sep 2022 22:21:58 +0700
+Subject: [PATCH] cpython: fix build with Python 3.11
+
+Python 3.11 moves longintrepr.h into cpython sub-directory.
+However, in this version, longintrepr.h is always included.
+---
+ src/cpython.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/cpython.h b/src/cpython.h
+index 11e64fa62f..bcfa406feb 100644
+--- a/src/cpython.h
++++ b/src/cpython.h
+@@ -24,9 +24,15 @@
+ * Sven Trenkel <collectd at semidefinite.de>
+ **/
+
++#include <Python.h>
+ /* Some python versions don't include this by default. */
+-
++#if PY_VERSION_HEX < 0x030B0000
++/*
++ * Python 3.11 move longintrepr.h to cpython/longintrepr.h
++ * And it's always included
++ */
+ #include <longintrepr.h>
++#endif /* PY_VERSION_HEX < 0x030B0000 */
+
+ /* These two macros are basically Py_BEGIN_ALLOW_THREADS and
+ * Py_BEGIN_ALLOW_THREADS
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index d0c9cfabf35..b5b086e2a01 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 00000000000..6e9de80da59
--- /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 00000000000..81909b962b8
--- /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 00000000000..91cb5773c61
--- /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
+}
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index cdc4b17492d..d8aed812617 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,9 +1,3 @@
-DIST prometheus-2.36.2-assets.tar.xz 44439600 BLAKE2B 13d89a26f0603c303c9a160288cb7b4f55c5856d0230019a1b0e6a6adb1a556c200defd4cccd7e54ef699c2d6893af90f395bce748882001af13977f26323f14 SHA512 9ea5b99002d08e6a61c00737cc50ca57a3233aa170ab275930546eb4786b0845cad9d92248f5e64b8d10d8a10f3497a1c497aa773e398ee6c0d4b0a636eeca4e
-DIST prometheus-2.36.2-deps.tar.xz 253575088 BLAKE2B 7e2e3d41f69002cd46caa67517c41b7249f0c43c32a6c1ca7aa835ca86dd49fa672f423f0d1f065d356e560dbbda1327093793b7b33f1477d6605af5ec930143 SHA512 7c5c3a654b09e3bf6f04be2d7957b3be191a1df260742ef1f78204307d6e6fce2ef65d65e76f7ab289812e6ac8b80f1c2a0ed51ff987dbda04ec9a0ef21335cd
-DIST prometheus-2.36.2.tar.gz 6021280 BLAKE2B 0d60ca650913a6708bd7aebcb18d3f24f6720913b90a232acf0e89e7fea255edbfb16f400a146ce53bfb49319b42873c10f853a90c6565775984a11f2cd2563c SHA512 e232d14fe97399badcccdb30d3146161597bcd5519a28e95a0f8e21ff67fe0bf7e1e7434f6fced00a0cef1f047d09f30fa56d03e9c40556d046b53d878744f4d
-DIST prometheus-2.37.1-assets.tar.xz 43874252 BLAKE2B 462da610ea9a27005e9355949b1f9ef777f9e95abaf961c40c0a036aab3d5834967efcadb029f335725826300627fc3ffe9674434dd04d374555f44c71d81232 SHA512 6d0dc592a9685dc96dbb36f9e6cd6fe2d6c8e6e6d6d2684d90192210503c1764124ec1b4241a2dfcb03261fa138e4bbc66f514b641ad8661b3a9c890b5ee0f2f
-DIST prometheus-2.37.1-deps.tar.xz 256529272 BLAKE2B e1eaf93ddb91120b6fd18db64ee17e3b7f5ee6da4616dcf235074ce4c2cd12e93ea8cf71d428c8109f131f672048068b8751ce06d28ff29f09d5dfaa89ba1fbe SHA512 7810f186b4aa4b7e1e188f980626b83c59a9f67fd872497f4ee1e7df0c17640c3bca74250249b9a7126354fa0dd4135b052d7c5d8a13e084a916225e020e9674
-DIST prometheus-2.37.1.tar.gz 6049188 BLAKE2B f32b4d9b7e02f7edc3468d6ce650b2f03e508adaae2ee25c37a7dc1362b38afae1aa1107eaf3c64cf8d2bf77bdfae35c81895bf5b4b45db6efcfd54108f3ee36 SHA512 30114e34d8615ec6cd25663d8eb27c11aa402a4960f64b4e8c5ee9399d65913b05041deba4402761281b714743db99e5348c04ac06d85ac3a202c31224effe00
-DIST prometheus-2.38.0-assets.tar.xz 43847400 BLAKE2B 0eb92c08414d55528243b549550db626e2ce15de2399f45a4eaf9a35c724851e7df7243921b6384f2a3bf23b783b3a199a4f11db6bb73ff4289c97d2c447a939 SHA512 16d7c391c70a0950deca575eea37fbe4786632426f3b44d33716a39254dc7d64b50d3493f6159db204b56c78804d0bc274c8367feaa2261d01a6a767ec93347f
-DIST prometheus-2.38.0-deps.tar.xz 258811628 BLAKE2B 0a9f5001d4afa1b9ce5feee98a4258315669b841343a1357606c8237ea9fa681ca47e640b0e36b1bc30420afa60edbcc53f0a1205e334129e4aaaf34b92505b6 SHA512 908ea45086fde89862a8ca8614654cfd7afa27ed0df38f27fc1e9493f721fff5c7e90711281bf0bf27bf9f938f25a89fe5ab29cec2082923eeca4259c068a80b
-DIST prometheus-2.38.0.tar.gz 6057055 BLAKE2B 5cf4090d6e9b1cf918e21e1f6ee79f0b4478aa4fc28b0345c3555e684347bfbe9793661955ac406bdb4f87bdf0df2b96716d89a1ec201f7ceb5f1c3d0b7d5e7a SHA512 c2d5f5833012c88b23c9e2b3944e1ea5ecfdb0f24541a1012d46347d40b0b310fe71f71e137e6fec35ef9e12d113e8c77d07047351fa8f055c31b227c8ca40ae
+DIST prometheus-2.40.4-assets.tar.xz 45585656 BLAKE2B b187b6683c778b5e9746f1f9695e03303cf5481387bb0517afee56685edc62bbb82c515f8dfeeafeb09a74b57b540da49d1936c7ec74b3013adc7afc8f07ea5f SHA512 8a229504b66bac0ef2fa7a9caafc93fdf3e1c9aa33e892219e57a21b44355515e69a232db98ce4f5664fb98cb37cfb3ec619eb2a3ccf662474544dfdbbba580c
+DIST prometheus-2.40.4-deps.tar.xz 253189332 BLAKE2B ca2c2f3e111897ac47d71acc3046230608134c854f7af7a4c5ec1fe75dfbb61c6bf278fe00f77ecf65113b72cbd67171634a0fbf57ad09e3349a7e8f45791e33 SHA512 29bf419e45d389805b1f37256cb8a9ce9cc6cb88b3cd4a7a1681121f24158cce7aa5a949554f5344409ba4f683976866bfc766666e2a0a247996c135d2068b6f
+DIST prometheus-2.40.4.tar.gz 6156657 BLAKE2B a522b31516f5e26475afa2d59a7074b7deb2a70ffbf7cce6e3951bfeacc6dae6d8f59d1b1b591d1c59c0ac9839bc691ce315d55f7fe0a45be573e124f651764b SHA512 9b46f9f3b986929bdfe365645e43c0a3c2073b920e59cc512287f866506d7db7b83ffb2dbe24d1835fccc1b2cc781be7a373da5fb58c04521648981b19e81737
diff --git a/app-metrics/prometheus/prometheus-2.36.2.ebuild b/app-metrics/prometheus/prometheus-2.36.2.ebuild
deleted file mode 100644
index 080b48cea4f..00000000000
--- a/app-metrics/prometheus/prometheus-2.36.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_COMMIT=d7e7b8e04b5ecdc1dd153534ba376a622b72741b
-MY_PV=v${PV/_rc/-rc.}
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv"
-
-COMMON_DEPEND="acct-group/prometheus
- acct-user/prometheus"
-DEPEND="!app-metrics/prometheus-bin
- ${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-BDEPEND=">=dev-util/promu-0.3.0"
-
-RESTRICT=" test"
-
-src_prepare() {
- default
- sed -i \
- -e "s/{{.Branch}}/HEAD/" \
- -e "s/{{.Revision}}/${GIT_COMMIT}/" \
- -e "s/{{.Version}}/${PV}/" \
- .promu.yml || die
- cp -a -n "${WORKDIR}"/web/ui web || die
-}
-
-src_compile() {
- emake PROMU="${EPREFIX}"/usr/bin/promu common-build plugins
-}
-
-src_install() {
- dobin prometheus promtool
- dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
- insinto /usr/share/prometheus
- doins -r console_libraries consoles
- insinto /etc/prometheus
- doins documentation/examples/prometheus.yml
- dosym -r /usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
- dosym -r /usr/share/prometheus/consoles /etc/prometheus/consoles
-
- systemd_dounit "${FILESDIR}"/prometheus.service
- newinitd "${FILESDIR}"/prometheus.initd prometheus
- newconfd "${FILESDIR}"/prometheus.confd prometheus
- keepdir /var/log/prometheus /var/lib/prometheus
- fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
- if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
- ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
- ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
- ewarn "This release requires a clean storage directory and is not compatible with"
- ewarn "files created by previous beta releases"
- fi
-}
diff --git a/app-metrics/prometheus/prometheus-2.38.0.ebuild b/app-metrics/prometheus/prometheus-2.38.0.ebuild
deleted file mode 100644
index 7a95fdd4eb4..00000000000
--- a/app-metrics/prometheus/prometheus-2.38.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_COMMIT=818d6e60888b2a3ea363aee8a9828c7bafd73699
-MY_PV=v${PV/_rc/-rc.}
-
-# To create the assets tarball run the following:
-# git checkout <tag>
-# make assets-compress
-# tar -acf <tarball> web/ui
-
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz
- https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv"
-
-COMMON_DEPEND="acct-group/prometheus
- acct-user/prometheus"
-DEPEND="!app-metrics/prometheus-bin
- ${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-BDEPEND=">=dev-util/promu-0.3.0"
-
-RESTRICT=" test"
-
-src_prepare() {
- default
- sed -i \
- -e "s/{{.Branch}}/HEAD/" \
- -e "s/{{.Revision}}/${GIT_COMMIT}/" \
- -e "s/{{.Version}}/${PV}/" \
- .promu.yml || die
- cp -a -n "${WORKDIR}"/web/ui web || die
-}
-
-src_compile() {
- emake PROMU="${EPREFIX}"/usr/bin/promu common-build plugins
-}
-
-src_install() {
- dobin prometheus promtool
- dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
- insinto /usr/share/prometheus
- doins -r console_libraries consoles
- insinto /etc/prometheus
- doins documentation/examples/prometheus.yml
- dosym -r /usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
- dosym -r /usr/share/prometheus/consoles /etc/prometheus/consoles
-
- systemd_dounit "${FILESDIR}"/prometheus.service
- newinitd "${FILESDIR}"/prometheus.initd prometheus
- newconfd "${FILESDIR}"/prometheus.confd prometheus
- keepdir /var/log/prometheus /var/lib/prometheus
- fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
- if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
- ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
- ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
- ewarn "This release requires a clean storage directory and is not compatible with"
- ewarn "files created by previous beta releases"
- fi
-}
diff --git a/app-metrics/prometheus/prometheus-2.37.1.ebuild b/app-metrics/prometheus/prometheus-2.40.4.ebuild
index 818d7f10b09..f88dcdde421 100644
--- a/app-metrics/prometheus/prometheus-2.37.1.ebuild
+++ b/app-metrics/prometheus/prometheus-2.40.4.ebuild
@@ -3,7 +3,7 @@
EAPI=8
inherit go-module systemd
-GIT_COMMIT=1ce2197e7f9e95089bfb95cb61762b5a89a8c0da
+GIT_COMMIT=414d31aee6586a5f29e755ae059b7d7131f1c6c8
MY_PV=v${PV/_rc/-rc.}
# To create the assets tarball run the following:
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv"
+KEYWORDS="amd64 ~arm ~riscv"
COMMON_DEPEND="acct-group/prometheus
acct-user/prometheus"
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index 5f1f4524f67..8ba404f83dd 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -1,4 +1,2 @@
-DIST pushgateway-1.4.2-deps.tar.xz 28339728 BLAKE2B 6f6e351f1a50e14db8b66b1ecd63eb7e86d28956b0d5f96185daea213b81c66c3bcb4a8db3208310d5023d423668b190eae6c858823f581d90859de82e38762d SHA512 7c1a2e27773e741cfab171a55c3018893c896bcd4eca842fafbcc2ece2b9449a9ca9804176693a7602bb11e84f32dadacfcbbf6f68c0bcb20ef47937aa753275
-DIST pushgateway-1.4.2.tar.gz 4264206 BLAKE2B 966593b53184e091400d73c7aa00b147597096ca61adc71964c5ca04c5c7487dbcc4eee652bc47745bb459fa0d3a27bad4936833cd759081c8ae735319582b15 SHA512 7b1da7eecf03c4f7b493d025920e93c52333becf7da6a2d7bdd0eb6f9a2a4a5d08b00786d0796682a465d84750e2c8092cdb1c4ca59a08f15b8b586d6eaa5f1a
-DIST pushgateway-1.4.3-deps.tar.xz 23184228 BLAKE2B a16ce542df626668d94b67989107110a3c89f3d57a60cf75d4b4e7d2b3c90f81871e376358461556818ba59e088264e9d0298700ffef403b54a21fae524478bb SHA512 7c100e8f23c63783a74642cd9e6b1ab2c2a6d6641c5c0c0de00479affa37328b98e947959d0c9d258700536f19596557503777593702687a7386a4bc9c875fb3
-DIST pushgateway-1.4.3.tar.gz 4263325 BLAKE2B 3180e99d0fe883b2ce6111254c557d9e63e8b0d307b520f33093c93fd9f7ce94240823ca45f29bb1246e50d48f48c4a2195da6b0384a433fd48ecfed8eb6a370 SHA512 e41b8cf89c55569d47fae43310e88e548dfa5b598d1d282ae302844444cd1f7d64b7551763dd34aaca16c1807b232861e423caa15ced63599b95a87c78c14a98
+DIST pushgateway-1.5.1-deps.tar.xz 28913128 BLAKE2B dc7f352a4085ff365a3039501992e7678c1c8b59d3f56ecafa4fe7e50d5693c8399edede9f994c6fca8af739d33bc5cb627b1dbfe27bd0dd63539834290f816d SHA512 82f586be350b1d5f3169adee7e88c9522e34e37de1c9741a32b824d3f9e5b3bdc914177f1a1cff722de89eebe9bd6221ad6b9c29684a348cc7ba93d8cc3c05fd
+DIST pushgateway-1.5.1.tar.gz 4272543 BLAKE2B 01aeda87efdbbd6c7d0c1a8676fe0798c8d97f7638ca26eb8720412eb00d2abff5c7e73d21e1c2424bd375efa8878c85642a06196e933e44ea804e6e053adbf2 SHA512 01ebcdb85f059c330195f37f9466e2042311d8196948881f07d53f1ac4c7daedf343c14856f51db274df00b652b09eb52c735f04f774baf66559697864e1f93b
diff --git a/app-metrics/pushgateway/pushgateway-1.4.2.ebuild b/app-metrics/pushgateway/pushgateway-1.4.2.ebuild
deleted file mode 100644
index 6aadab5d3b8..00000000000
--- a/app-metrics/pushgateway/pushgateway-1.4.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module systemd
-
-GIT_COMMIT="99981d7"
-DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
-HOMEPAGE="https://github.com/prometheus/pushgateway"
-SRC_URI="
- https://github.com/prometheus/pushgateway/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz
-"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- acct-group/pushgateway
- acct-user/pushgateway
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND=">=dev-util/promu-0.3.0"
-
-src_prepare() {
- default
- sed -i -e 's|{{\.Revision}}|'${GIT_COMMIT}'|g' .promu.yml || die
-}
-
-src_compile() {
- mkdir -p bin || die
- promu build -v --prefix bin || die
-}
-
-src_install() {
- newbin "bin/${P}" "${PN}"
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
- newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}-1.service"
-}
diff --git a/app-metrics/pushgateway/pushgateway-1.4.3.ebuild b/app-metrics/pushgateway/pushgateway-1.5.1.ebuild
index bf8eb3f672b..c1a6e8e79cf 100644
--- a/app-metrics/pushgateway/pushgateway-1.4.3.ebuild
+++ b/app-metrics/pushgateway/pushgateway-1.5.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit go-module systemd
-GIT_COMMIT="f9dc1c8"
+GIT_COMMIT="7afc96c"
DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
HOMEPAGE="https://github.com/prometheus/pushgateway"
SRC_URI="
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
RDEPEND="
acct-group/pushgateway
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.20.0-r1.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.20.0-r1.ebuild
index e05f22ca158..72aee2efbde 100644
--- a/app-metrics/snmp_exporter/snmp_exporter-0.20.0-r1.ebuild
+++ b/app-metrics/snmp_exporter/snmp_exporter-0.20.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
COMMON_DEPEND="acct-group/snmp_exporter
acct-user/snmp_exporter