[gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus/files/, app-metrics/prometheus/

[gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus/files/, app-metrics/prometheus/

[William Hubbs]

commit:     38ba05d89c82be5a7f7c0e0faa30653cd77c539d
Author:     William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Tue Mar  5 20:02:39 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 20:03:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ba05d8

app-metrics/prometheus: 2.7.2-r1 bump to fix service script

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-metrics/prometheus/files/prometheus.initd     | 34 ++++++++++++
 app-metrics/prometheus/prometheus-2.7.2-r1.ebuild | 68 +++++++++++++++++++++++
 2 files changed, 102 insertions(+)

diff --git a/app-metrics/prometheus/files/prometheus.initd b/app-metrics/prometheus/files/prometheus.initd
new file mode 100644
index 00000000000..f7371f8ca06
--- /dev/null
+++ b/app-metrics/prometheus/files/prometheus.initd
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus monitoring system and time series database"
+pidfile=/var/run/${RC_SVCNAME}.pid
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+command_user=${user}:${group}
+
+command="/usr/bin/prometheus"
+command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
+command_background="true"
+error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+
+extra_started_commands="reload"
+
+depend() {
+	after net
+}
+
+reload() {
+	ebegin "Reloading configuration for ${RC_SVCNAME}"
+	case "$supervisor" in
+		supervise-daemon)
+		supervise-daemon ${RC_SVCNAME} --signal HUP
+		;;
+		*)
+		start-stop-daemon --signal HUP --pidfile "${pidfile}"
+		;;
+	esac
+	eend $? "Failed to reload ${RC_SVCNAME}"
+}

diff --git a/app-metrics/prometheus/prometheus-2.7.2-r1.ebuild b/app-metrics/prometheus/prometheus-2.7.2-r1.ebuild
new file mode 100644
index 00000000000..7b06b19766f
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.7.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/prometheus"
+MY_PV=v${PV/_rc/-rc.}
+PROMETHEUS_COMMIT="82f98c8"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.10
+	dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	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
+}

[gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus/files/, app-metrics/prometheus/

[William Hubbs]

commit:     deaa246528cb25b6ffbbea25849d9fb3ab3c03b7
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 19:56:34 2023 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 19:56:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deaa2465

app-metrics/prometheus: fix service script

Introduce the prometheus_args variable. Allow the continued use of
command_args in the script for now to avoid breaking systems, but
document that people should move to prometheus_args.
Also, sync most of the defaults with the systemd service.

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-metrics/prometheus/files/prometheus.confd      | 28 ++++++++++++++++++++--
 app-metrics/prometheus/files/prometheus.initd      | 12 ++++++++++
 ...s-2.43.0.ebuild => prometheus-2.43.0-r1.ebuild} |  0
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/app-metrics/prometheus/files/prometheus.confd b/app-metrics/prometheus/files/prometheus.confd
index 93b41b31624c..19a286f5677a 100644
--- a/app-metrics/prometheus/files/prometheus.confd
+++ b/app-metrics/prometheus/files/prometheus.confd
@@ -1,2 +1,26 @@
-# arguments for Prometheus
-command_args=""
+# additional arguments for Prometheus
+#
+# command_args should not be set in this file. Instead, you should set
+# prometheus_args.
+#
+# The default settings are listed below.
+# If you are not changing these settings, you do
+# not need to include them in prometheus_args.
+#
+# To migrate from using command_args to prometheus_args, drop any of the
+# default settings below that you have set the same way then switch to
+# prometheus_args.
+# 
+# The new behavior is that prometheus_args will be appended to these
+# defaults allowing anything you add to override them.
+#
+#The default settings are:
+#
+# --web.enable-lifecycle
+# --config.file=/etc/prometheus/prometheus.yml
+# --storage.tsdb.path=/var/lib/prometheus/data
+# --web.console.templates=/etc/prometheus/consoles
+# --web.console.libraries=/etc/prometheus/console_libraries
+# --web.enable-admin-api 
+#
+prometheus_args=""

diff --git a/app-metrics/prometheus/files/prometheus.initd b/app-metrics/prometheus/files/prometheus.initd
index f7371f8ca060..dc5db03ad5ea 100644
--- a/app-metrics/prometheus/files/prometheus.initd
+++ b/app-metrics/prometheus/files/prometheus.initd
@@ -9,7 +9,19 @@ group=${group:-${RC_SVCNAME}}
 command_user=${user}:${group}
 
 command="/usr/bin/prometheus"
+if [ -z "${command_args}" ]; then
+command_args="
+	--web.enable-lifecycle
+	--config.file=/etc/prometheus/prometheus.yml
+	--storage.tsdb.path=/var/lib/prometheus/data
+	--web.console.templates=/etc/prometheus/consoles
+	--web.console.libraries=/etc/prometheus/console_libraries
+	--web.listen-address=0.0.0.0:9090
+	--web.enable-admin-api 
+	${prometheus_args}"
+else
 command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
+fi
 command_background="true"
 error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
 output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log

diff --git a/app-metrics/prometheus/prometheus-2.43.0.ebuild b/app-metrics/prometheus/prometheus-2.43.0-r1.ebuild
similarity index 100%
rename from app-metrics/prometheus/prometheus-2.43.0.ebuild
rename to app-metrics/prometheus/prometheus-2.43.0-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus/files/, app-metrics/prometheus/

[William Hubbs]

commit:     4f35eca9501909c87ca6591f35e6c5fb617e5ba6
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 02:46:45 2025 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 02:46:45 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f35eca9

app-metrics/prometheus: add 3.1.0

Closes: https://bugs.gentoo.org/905861
Closes: https://bugs.gentoo.org/947414
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-metrics/prometheus/Manifest                   |  3 ++
 app-metrics/prometheus/files/prometheus-3.confd   | 25 +++++++++
 app-metrics/prometheus/files/prometheus-3.initd   | 40 ++++++++++++++
 app-metrics/prometheus/files/prometheus-3.service | 20 +++++++
 app-metrics/prometheus/prometheus-3.1.0.ebuild    | 63 +++++++++++++++++++++++
 5 files changed, 151 insertions(+)

diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index b393e94cab9f..613b21cf8c9c 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,3 +1,6 @@
 DIST prometheus-2.52.0-assets.tar.xz 40948988 BLAKE2B 6c5812c7b0470e796f9f052be4c4248ee4dcacbaeccd0aa5bb136a4775ce939870f9b366cd87ec325cd93364e69e04b1bbef461842d6fe850cd7e3d9d08fd652 SHA512 0f12548dd97a0aa19379a3090fcad7002cd2917cff59937630302edb6d9f6be49b91476111f9ef23bc3f4a009f2a9ff871e1fa78a765543fd7ac9eacd0233228
 DIST prometheus-2.52.0-deps.tar.xz 136485640 BLAKE2B aba4869ca0aa810c9651737f9089c0a5c64ec6f54f9bb1fec7e8e51fbc3042033e4935128af59cf5f9059e2815119e95b1bd8db4d1ce316f2a5af2d32913e2c4 SHA512 11c63ba8a96a8cad655d6f66accb4528d4562c21f9cec671d63120246d3a963690d0d27b0e41e3a24882e2c111b42e0f678d244ebb8a712a794f90eb9b415b5c
 DIST prometheus-2.52.0.tar.gz 6192779 BLAKE2B 488483b32ee0927f2d0aa5d7bd1f82dee39c0e8273244a0260421f1523c2555541d35d02d869d2a35b434d41ff3210ce9da4a5430ae1f5a41a9d7e250d24246f SHA512 6ad5825ee6dfe6ba82ad8f091cb1fd8bfaf323558f0171c8e16fccb070fa99865cc9e9137a60405a5ec7c90706469cefefbe25c47e47bc37c30de671981955e3
+DIST prometheus-3.1.0-assets.tar.xz 78517784 BLAKE2B df17c7a545d1efe770d70d0d250d03bc8c1887df34fedde3a785de1c03004de209c0d30287bd7abd134550afac39152c57a3e37271ca3baa5487e40b3352f300 SHA512 96293cc3395e5a3a7a7b64ee3c8372255e1cfe9986145f09656a82dfea19019fff517ffd622de9edfa93fa62bb02dac09cd1e85bec105190eae359aa0e88a1f9
+DIST prometheus-3.1.0-deps.tar.xz 126208728 BLAKE2B 36007a7ea302badaee745a49fb706f870c62c6ed9dd1ad5616ebf70e5cde05b5f7d8143c3d1a1f6bfbaca7dae1b00fb0d83347814245fe2a6db10073a85b6175 SHA512 1740230d930bf038e5d7eb1655e506bda88f2161be9d831ab06902d7559c12973367d13b05aa9c0d3f44a8f9cd9a0ac1e14a2e162da775e6f1cee4b97e0e18cf
+DIST prometheus-3.1.0.tar.gz 4973352 BLAKE2B ac8f68002f3924f79ee2a75aed8ea585fc09a9d0188e2b5e97152896717f04855124335ca6713e97c399109c6d087c1098dd2dc1485440dca775c5e34a5a52ef SHA512 9e61ba2aae62319f0da8b01a52d033f504adb5155955cc0d74bef251aa06b7a01f9df8e3347ceb1031826ec7518773423a342c6ee526b9d48577701594c973bc

diff --git a/app-metrics/prometheus/files/prometheus-3.confd b/app-metrics/prometheus/files/prometheus-3.confd
new file mode 100644
index 000000000000..48aaab780b62
--- /dev/null
+++ b/app-metrics/prometheus/files/prometheus-3.confd
@@ -0,0 +1,25 @@
+# additional arguments for Prometheus
+#
+# command_args should not be set in this file. Instead, you should set
+# prometheus_args.
+#
+# The default settings are listed below.
+# If you are not changing these settings, you do
+# not need to include them in prometheus_args.
+#
+# To migrate from using command_args to prometheus_args, drop any of the
+# default settings below that you have set the same way then switch to
+# prometheus_args.
+# 
+# The new behavior is that prometheus_args will be appended to these
+# defaults allowing anything you add to override them.
+#
+#The default settings are:
+#
+# --web.enable-lifecycle
+# --config.file=/etc/prometheus/prometheus.yml
+# --storage.tsdb.path=/var/lib/prometheus/data
+# --web.listen-address=0.0.0.0:9090
+# --web.enable-admin-api 
+#
+prometheus_args=""

diff --git a/app-metrics/prometheus/files/prometheus-3.initd b/app-metrics/prometheus/files/prometheus-3.initd
new file mode 100644
index 000000000000..4cf7e157c1e9
--- /dev/null
+++ b/app-metrics/prometheus/files/prometheus-3.initd
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus monitoring system and time series database"
+pidfile=/var/run/${RC_SVCNAME}.pid
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+command_user=${user}:${group}
+
+command="/usr/bin/prometheus"
+command_args="
+	--web.enable-lifecycle
+	--config.file=/etc/prometheus/prometheus.yml
+	--storage.tsdb.path=/var/lib/prometheus/data
+  --web.listen-address=0.0.0.0:9090
+	--web.enable-admin-api 
+	${prometheus_args}"
+command_background="true"
+error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+
+extra_started_commands="reload"
+
+depend() {
+	after net
+}
+
+reload() {
+	ebegin "Reloading configuration for ${RC_SVCNAME}"
+	case "$supervisor" in
+		supervise-daemon)
+		supervise-daemon ${RC_SVCNAME} --signal HUP
+		;;
+		*)
+		start-stop-daemon --signal HUP --pidfile "${pidfile}"
+		;;
+	esac
+	eend $? "Failed to reload ${RC_SVCNAME}"
+}

diff --git a/app-metrics/prometheus/files/prometheus-3.service b/app-metrics/prometheus/files/prometheus-3.service
new file mode 100644
index 000000000000..a3a7e5813662
--- /dev/null
+++ b/app-metrics/prometheus/files/prometheus-3.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Prometheus
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+User=prometheus
+Group=prometheus
+ExecStart=/usr/bin/prometheus \
+  --web.enable-lifecycle \
+  --config.file=/etc/prometheus/prometheus.yml \
+  --storage.tsdb.path="/var/lib/prometheus/data" \
+  --web.listen-address=0.0.0.0:9090 \
+  --web.enable-admin-api 
+
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

diff --git a/app-metrics/prometheus/prometheus-3.1.0.ebuild b/app-metrics/prometheus/prometheus-3.1.0.ebuild
new file mode 100644
index 000000000000..d5df0158a22f
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-3.1.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+GIT_COMMIT=7086161a93b262aa0949dbf2aba15a5a7b13e0a3
+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://prometheus.io"
+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 ~arm64 ~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 -u "${WORKDIR}"/web/ui web || die "cp failed"
+}
+
+src_compile() {
+	emake PROMU="${EPREFIX}"/usr/bin/promu common-build plugins
+}
+
+src_install() {
+	dobin prometheus promtool
+	dodoc -r documentation/{images,*.md} *.md docs
+	insinto /etc/prometheus
+	doins -r documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r documentation/examples
+
+	systemd_dounit "${FILESDIR}"/prometheus-3.service
+	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
+	newconfd "${FILESDIR}"/prometheus-3.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}