[gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus/files/, app-metrics/prometheus/
commit: deaa246528cb25b6ffbbea25849d9fb3ab3c03b7
Author: William Hubbs gentoo org>
AuthorDate: Sun Mar 26 19:56:34 2023 +
Commit: William Hubbs gentoo org>
CommitDate: Sun Mar 26 19:56:34 2023 +
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 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/
commit: 38ba05d89c82be5a7f7c0e0faa30653cd77c539d
Author: William Hubbs sony com>
AuthorDate: Tue Mar 5 20:02:39 2019 +
Commit: William Hubbs gentoo org>
CommitDate: Tue Mar 5 20:03:12 2019 +
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 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 000..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 000..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 '
