* [gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/files/, www-apps/grafana-bin/
@ 2016-06-22 10:36 Patrick Lauer
0 siblings, 0 replies; 4+ messages in thread
From: Patrick Lauer @ 2016-06-22 10:36 UTC (permalink / raw
To: gentoo-commits
commit: 205ce93dbf7723999974f0e8e6e4d6f60147a87a
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 10:34:05 2016 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 10:35:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205ce93d
www-apps/grafana-bin: Initial import, ebuild borrowed from Adjust overlay
Package-Manager: portage-2.3.0_rc1
www-apps/grafana-bin/Manifest | 1 +
www-apps/grafana-bin/files/grafana.confd | 7 ++++
www-apps/grafana-bin/files/grafana.initd | 34 ++++++++++++++++++
www-apps/grafana-bin/grafana-bin-3.0.4.ebuild | 51 +++++++++++++++++++++++++++
www-apps/grafana-bin/metadata.xml | 7 ++++
5 files changed, 100 insertions(+)
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
new file mode 100644
index 0000000..ada2638
--- /dev/null
+++ b/www-apps/grafana-bin/Manifest
@@ -0,0 +1 @@
+DIST grafana-bin-3.0.4.tar.gz 40460699 SHA256 ec5581d055bb67abac3007457a30869bca263c151264011cf0c9ce086c5329df SHA512 eca12381e5aec14ba40e0821a3e46a169f789f7d7d00c89db2ef1d7db1a770a09906d144515cfac72d5b1bff72a18f9ad71316439ea33240ccefcd859752a916 WHIRLPOOL fa48e9f6b4792cc3f1d6123d624d4404a7283aee9dca8b59ce524fd02db6de9120607d0bb04eae052d56f0cd416e46b67a7cbb212cb64994b2d78e281ba88d5f
diff --git a/www-apps/grafana-bin/files/grafana.confd b/www-apps/grafana-bin/files/grafana.confd
new file mode 100644
index 0000000..207ef76
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.confd
@@ -0,0 +1,7 @@
+# Config file for /etc/init.d/grafana
+
+# The user to run your application as.
+GRAFANA_USER=grafana
+
+# The group to run your application as.
+GRAFANA_GROUP=grafana
diff --git a/www-apps/grafana-bin/files/grafana.initd b/www-apps/grafana-bin/files/grafana.initd
new file mode 100644
index 0000000..ecbd2e2
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need localmount
+}
+
+start() {
+ ebegin "Starting grafana server"
+
+ start-stop-daemon --start -b \
+ --chdir /usr/share/grafana \
+ --user ${GRAFANA_USER}:${GRAFANA_GROUP} \
+ --exec /usr/bin/grafana-server -- \
+ -pidfile=/run/grafana.pid \
+ -config=/etc/grafana/grafana.ini \
+ cfg:default.paths.data=/var/lib/grafana \
+ cfg:default.paths.logs=/var/log/grafana
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping grafana server"
+
+ start-stop-daemon --stop \
+ --pidfile /run/grafana.pid \
+ --user "${GRAFANA_USER}" \
+ --retry=TERM/20/KILL/5
+
+ eend $?
+}
diff --git a/www-apps/grafana-bin/grafana-bin-3.0.4.ebuild b/www-apps/grafana-bin/grafana-bin-3.0.4.ebuild
new file mode 100644
index 0000000..4b2e8ab
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-3.0.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user
+MY_PN=${PN/-bin/}
+MY_PV="3.0.4-1464167696"
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="http://grafana.org"
+SRC_URI="https://grafanarel.s3.amazonaws.com/builds/${MY_PN}-${MY_PV}.linux-x64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ >=dev-lang/go-1.5
+ net-libs/nodejs
+"
+
+pkg_setup() {
+ enewgroup grafana
+ enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+ keepdir /etc/grafana
+ insinto /etc/grafana
+ newins "${S}"/conf/sample.ini grafana.ini
+ rm "${S}"/conf/sample.ini
+
+ # Frontend assets
+ insinto /usr/share/${MY_PN}
+ doins -r public conf vendor
+
+ dobin bin/grafana-cli
+ dobin bin/grafana-server
+
+ newconfd "${FILESDIR}"/grafana.confd grafana
+ newinitd "${FILESDIR}"/grafana.initd grafana
+
+ keepdir /var/{lib,log}/grafana
+ fowners grafana:grafana /var/{lib,log}/grafana
+ fperms 0750 /var/{lib,log}/grafana
+}
diff --git a/www-apps/grafana-bin/metadata.xml b/www-apps/grafana-bin/metadata.xml
new file mode 100644
index 0000000..8c5a530
--- /dev/null
+++ b/www-apps/grafana-bin/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/files/, www-apps/grafana-bin/
@ 2016-08-24 10:38 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2016-08-24 10:38 UTC (permalink / raw
To: gentoo-commits
commit: 696e9771c2429d256ba0c5fb38ee19a1dcd7b873
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 10:36:57 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 10:38:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696e9771
www-apps/grafana-bin: Drop old
Package-Manager: portage-2.3.0
www-apps/grafana-bin/Manifest | 1 -
www-apps/grafana-bin/files/grafana.initd | 34 ------------------
www-apps/grafana-bin/grafana-bin-3.0.4.ebuild | 51 ---------------------------
3 files changed, 86 deletions(-)
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 0a0e660..72ae710 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,2 +1 @@
-DIST grafana-bin-3.0.4.tar.gz 40460699 SHA256 ec5581d055bb67abac3007457a30869bca263c151264011cf0c9ce086c5329df SHA512 eca12381e5aec14ba40e0821a3e46a169f789f7d7d00c89db2ef1d7db1a770a09906d144515cfac72d5b1bff72a18f9ad71316439ea33240ccefcd859752a916 WHIRLPOOL fa48e9f6b4792cc3f1d6123d624d4404a7283aee9dca8b59ce524fd02db6de9120607d0bb04eae052d56f0cd416e46b67a7cbb212cb64994b2d78e281ba88d5f
DIST grafana-bin-3.1.0.tar.gz 40620308 SHA256 da8175ee46d2dc39cbe29f49bf5efdd34fddaad53d4ddfcef1316356fa029c9c SHA512 fb458299c8622ed0c2478928aa72b565fb87127cde342cc1b3f36a3582b3f76031547b7fef4240a37a51c1ac2ce239b086f97dfddf1309fe99d3c999ee80747e WHIRLPOOL 37f8f6ade9eb250c7a1591b975014410adf3e4dd8c803c842d37c30e88a3b7b64b05ff02a4849139216ffe9e76e75fd2e87db9e24dc404b60966e7b4ced47f7d
diff --git a/www-apps/grafana-bin/files/grafana.initd b/www-apps/grafana-bin/files/grafana.initd
deleted file mode 100644
index ecbd2e2..00000000
--- a/www-apps/grafana-bin/files/grafana.initd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount
-}
-
-start() {
- ebegin "Starting grafana server"
-
- start-stop-daemon --start -b \
- --chdir /usr/share/grafana \
- --user ${GRAFANA_USER}:${GRAFANA_GROUP} \
- --exec /usr/bin/grafana-server -- \
- -pidfile=/run/grafana.pid \
- -config=/etc/grafana/grafana.ini \
- cfg:default.paths.data=/var/lib/grafana \
- cfg:default.paths.logs=/var/log/grafana
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping grafana server"
-
- start-stop-daemon --stop \
- --pidfile /run/grafana.pid \
- --user "${GRAFANA_USER}" \
- --retry=TERM/20/KILL/5
-
- eend $?
-}
diff --git a/www-apps/grafana-bin/grafana-bin-3.0.4.ebuild b/www-apps/grafana-bin/grafana-bin-3.0.4.ebuild
deleted file mode 100644
index 4b2e8ab..00000000
--- a/www-apps/grafana-bin/grafana-bin-3.0.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user
-MY_PN=${PN/-bin/}
-MY_PV="3.0.4-1464167696"
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="http://grafana.org"
-SRC_URI="https://grafanarel.s3.amazonaws.com/builds/${MY_PN}-${MY_PV}.linux-x64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- >=dev-lang/go-1.5
- net-libs/nodejs
-"
-
-pkg_setup() {
- enewgroup grafana
- enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
- keepdir /etc/grafana
- insinto /etc/grafana
- newins "${S}"/conf/sample.ini grafana.ini
- rm "${S}"/conf/sample.ini
-
- # Frontend assets
- insinto /usr/share/${MY_PN}
- doins -r public conf vendor
-
- dobin bin/grafana-cli
- dobin bin/grafana-server
-
- newconfd "${FILESDIR}"/grafana.confd grafana
- newinitd "${FILESDIR}"/grafana.initd grafana
-
- keepdir /var/{lib,log}/grafana
- fowners grafana:grafana /var/{lib,log}/grafana
- fperms 0750 /var/{lib,log}/grafana
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/files/, www-apps/grafana-bin/
@ 2016-12-01 17:03 Tobias Klausmann
0 siblings, 0 replies; 4+ messages in thread
From: Tobias Klausmann @ 2016-12-01 17:03 UTC (permalink / raw
To: gentoo-commits
commit: a0bdf69245dcfa1d0f7c0b794a15da42e5cbc4ad
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 17:02:04 2016 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 17:03:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0bdf692
Revert "www-apps/grafana-bin: Add info about higher FD ulimit for 4.x"
This reverts commit 620deff506d5d7ae1260fb2fa3f5e6188ad50af6.
Grafana 4.0.0 has a massive FD leak problem (needing a restart every ten
minutes, depending on the amount of dashboard users and metrics).
Upstream is aware:
https://github.com/grafana/grafana/issues/6759
Still, we'll roll back 4.0.0 to beta2 until 4.0.1 is out.
www-apps/grafana-bin/files/grafana.confd | 5 -----
.../{grafana-bin-4.0.0-r1.ebuild => grafana-bin-4.0.0.ebuild} | 6 ------
2 files changed, 11 deletions(-)
diff --git a/www-apps/grafana-bin/files/grafana.confd b/www-apps/grafana-bin/files/grafana.confd
index 0ad311d..207ef76 100644
--- a/www-apps/grafana-bin/files/grafana.confd
+++ b/www-apps/grafana-bin/files/grafana.confd
@@ -5,8 +5,3 @@ GRAFANA_USER=grafana
# The group to run your application as.
GRAFANA_GROUP=grafana
-
-# Starting with 4.0, grafana uses a lot of file descriptors.
-# If you run into the default limit of 1024, uncomment this line and if needed,
-# bump its value.
-#rc_ulimit="-n 10000"
diff --git a/www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild b/www-apps/grafana-bin/grafana-bin-4.0.0.ebuild
similarity index 83%
rename from www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild
rename to www-apps/grafana-bin/grafana-bin-4.0.0.ebuild
index 95285d1..b460877 100644
--- a/www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-4.0.0.ebuild
@@ -49,9 +49,3 @@ src_install() {
fowners grafana:grafana /var/{lib,log}/grafana
fperms 0750 /var/{lib,log}/grafana
}
-
-post_install() {
- einfo "Starting with version 4.0, Grafana is using a lot more file"
- einfo "descriptors. You can bump the limit (by default 1024) by"
- einfo "uncommenting the relevant line in /etc/conf.d/grafana."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/files/, www-apps/grafana-bin/
@ 2023-03-20 19:17 罗百科
0 siblings, 0 replies; 4+ messages in thread
From: 罗百科 @ 2023-03-20 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 7c62f15f877fec0ac7c11b5c3c8d3231792ef7f8
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 19:15:58 2023 +0000
Commit: 罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 19:17:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c62f15f
www-apps/grafana-bin: Fix installed files
Closes: https://bugs.gentoo.org/902459
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
www-apps/grafana-bin/files/grafana.initd2 | 36 ++++++++++++++++++++++
...in-9.3.8.ebuild => grafana-bin-9.3.8-r1.ebuild} | 3 +-
...in-9.4.3.ebuild => grafana-bin-9.4.3-r1.ebuild} | 3 +-
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/www-apps/grafana-bin/files/grafana.initd2 b/www-apps/grafana-bin/files/grafana.initd2
new file mode 100644
index 000000000000..1c8f6b2af56f
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd2
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+GRAFANA_USER="${GRAFANA_USER:-"grafana"}"
+GRAFANA_GROUP="${GRAFANA_GROUP:-"grafana"}"
+GRAFANA_CONFIGFILE="${GRAFANA_CONFIGFILE:-"/etc/grafana/${RC_SVCNAME}.ini"}"
+GRAFANA_DATADIR="${GRAFANA_DATADIR:-"/var/lib/grafana"}"
+GRAFANA_LOGDIR="${GRAFANA_LOGDIR:-"/var/log/grafana"}"
+GRAFANA_PIDFILE="${GRAFANA_PIDFILE:-"/run/${RC_SVCNAME}.pid"}"
+GRAFANA_SSDARGS=${GRAFANA_SSDARGS:-"--wait 1000"}
+GRAFANA_TERMTIMEOUT=${GRFANA_TERMTIMEOUT:-"TERM/60/KILL/5"}
+
+command="/usr/bin/grafana"
+command_args="server -homepath=/usr/share/grafana"
+command_args="${command_args} -config=\"${GRAFANA_CONFIGFILE}\""
+command_args="${command_args} cfg:default.paths.data=\"${GRAFANA_DATADIR}\""
+command_args="${command_args} cfg:default.paths.logs=\"${GRAFANA_LOGDIR}\""
+command_background="yes"
+pidfile="${GRAFANA_PIDFILE}"
+retry="${GRAFANA_TERMTIMEOUT}"
+start_stop_daemon_args="--user ${GRAFANA_USER}:${GRAFANA_GROUP} ${GRAFANA_SSDARGS}"
+
+description="Grafana server, feature rich metrics dashboard and graph editor."
+
+required_files="${GRAFANA_CONFIGFILE}"
+
+depend() {
+ need localmount
+}
+
+start_pre() {
+ checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}" || return 1
+ checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}/dashboards" || return 1
+ checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}/plugins" || return 1
+}
diff --git a/www-apps/grafana-bin/grafana-bin-9.3.8.ebuild b/www-apps/grafana-bin/grafana-bin-9.3.8-r1.ebuild
similarity index 96%
rename from www-apps/grafana-bin/grafana-bin-9.3.8.ebuild
rename to www-apps/grafana-bin/grafana-bin-9.3.8-r1.ebuild
index 0e8aae35965c..ed079e9887f5 100644
--- a/www-apps/grafana-bin/grafana-bin-9.3.8.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-9.3.8-r1.ebuild
@@ -38,10 +38,11 @@ src_install() {
doins -r public conf
dobin bin/grafana-cli
+ dobin bin/grafana
dobin bin/grafana-server
newconfd "${FILESDIR}"/grafana-r1.confd grafana
- newinitd "${FILESDIR}"/grafana.initd grafana
+ newinitd "${FILESDIR}"/grafana.initd2 grafana
systemd_newunit "${FILESDIR}"/grafana.service grafana.service
keepdir /var/{lib,log}/grafana
diff --git a/www-apps/grafana-bin/grafana-bin-9.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-9.4.3-r1.ebuild
similarity index 96%
rename from www-apps/grafana-bin/grafana-bin-9.4.3.ebuild
rename to www-apps/grafana-bin/grafana-bin-9.4.3-r1.ebuild
index 0e8aae35965c..ed079e9887f5 100644
--- a/www-apps/grafana-bin/grafana-bin-9.4.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-9.4.3-r1.ebuild
@@ -38,10 +38,11 @@ src_install() {
doins -r public conf
dobin bin/grafana-cli
+ dobin bin/grafana
dobin bin/grafana-server
newconfd "${FILESDIR}"/grafana-r1.confd grafana
- newinitd "${FILESDIR}"/grafana.initd grafana
+ newinitd "${FILESDIR}"/grafana.initd2 grafana
systemd_newunit "${FILESDIR}"/grafana.service grafana.service
keepdir /var/{lib,log}/grafana
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-20 19:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-20 19:17 [gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/files/, www-apps/grafana-bin/ 罗百科
-- strict thread matches above, loose matches on Subject: below --
2016-12-01 17:03 Tobias Klausmann
2016-08-24 10:38 Pacho Ramos
2016-06-22 10:36 Patrick Lauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox