From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7FAFA138350 for ; Mon, 27 Jan 2020 22:40:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F05BE08C0; Mon, 27 Jan 2020 22:40:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0985E08C0 for ; Mon, 27 Jan 2020 22:40:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57D5B34E4A9 for ; Mon, 27 Jan 2020 22:40:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 84E41105 for ; Mon, 27 Jan 2020 22:40:15 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1580164787.7642d0254415e907b5a4098133a1870b6301781e.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus/, app-metrics/prometheus-bin/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: app-metrics/prometheus-bin/Manifest app-metrics/prometheus-bin/files/prometheus.confd app-metrics/prometheus-bin/files/prometheus.initd app-metrics/prometheus-bin/metadata.xml app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild app-metrics/prometheus/prometheus-2.13.1.ebuild X-VCS-Directories: app-metrics/prometheus-bin/files/ app-metrics/prometheus/ app-metrics/prometheus-bin/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 7642d0254415e907b5a4098133a1870b6301781e X-VCS-Branch: master Date: Mon, 27 Jan 2020 22:40:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d01beb00-738d-45d3-a2f1-ecf020e84970 X-Archives-Hash: 5318161efb39d6d68ec93dda0b5ed908 commit: 7642d0254415e907b5a4098133a1870b6301781e Author: William Hubbs sony com> AuthorDate: Mon Jan 27 22:34:52 2020 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Jan 27 22:39:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7642d025 app-metrics/prometheus-bin: new package, binary version of prometheus This is needed because prometheus now includes nodejs and the build system uses yarn. Signed-off-by: William Hubbs gentoo.org> app-metrics/prometheus-bin/Manifest | 1 + app-metrics/prometheus-bin/files/prometheus.confd | 2 + app-metrics/prometheus-bin/files/prometheus.initd | 34 +++++++++++++++ app-metrics/prometheus-bin/metadata.xml | 8 ++++ .../prometheus-bin/prometheus-bin-2.15.2.ebuild | 48 ++++++++++++++++++++++ app-metrics/prometheus/prometheus-2.13.1.ebuild | 1 + 6 files changed, 94 insertions(+) diff --git a/app-metrics/prometheus-bin/Manifest b/app-metrics/prometheus-bin/Manifest new file mode 100644 index 00000000000..3c1cd89217c --- /dev/null +++ b/app-metrics/prometheus-bin/Manifest @@ -0,0 +1 @@ +DIST prometheus-2.15.2.linux-amd64.tar.gz 59204993 BLAKE2B 700d61063cddea02ca4445257b11b782c3b6fc84ed3d48f8d196c5602819f0d44b218d15b870281293bf0661929b02930b937e66fec34918b81cd3d010a6fa21 SHA512 a3b95fe6101d5587329d84adb18c0c261babe5a909e62ab1a39f42df28c058d311b0b2ea9ecbdad9227789ed83c0fae4a12776348999cda3a70cdc457f6d3611 diff --git a/app-metrics/prometheus-bin/files/prometheus.confd b/app-metrics/prometheus-bin/files/prometheus.confd new file mode 100644 index 00000000000..93b41b31624 --- /dev/null +++ b/app-metrics/prometheus-bin/files/prometheus.confd @@ -0,0 +1,2 @@ +# arguments for Prometheus +command_args="" diff --git a/app-metrics/prometheus-bin/files/prometheus.initd b/app-metrics/prometheus-bin/files/prometheus.initd new file mode 100644 index 00000000000..f7371f8ca06 --- /dev/null +++ b/app-metrics/prometheus-bin/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-bin/metadata.xml b/app-metrics/prometheus-bin/metadata.xml new file mode 100644 index 00000000000..c36c37139fa --- /dev/null +++ b/app-metrics/prometheus-bin/metadata.xml @@ -0,0 +1,8 @@ + + + + + williamh@gentoo.org + William Hubbs + + diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild new file mode 100644 index 00000000000..89e508d0cf5 --- /dev/null +++ b/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="prometheus monitoring system and time series database" +HOMEPAGE="http://prometheus.io" +MY_PN=${PN%%-bin} +MY_P=${MY_PN}-${PV} +SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +QA_PREBUILT=".*" +RESTRICT="strip" + +DEPEND="acct-group/prometheus + acct-user/prometheus + !app-metrics/prometheus" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}.linux-amd64" + +src_install() { + dobin prometheus promtool tsdb + insinto /usr/share/prometheus + doins -r console_libraries consoles + insinto /etc/prometheus + doins prometheus.yml + dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries + dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles + + 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 '