[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/, www-apps/grafana-bin/files/
commit: 19fbe71dc67a48543f3a86cbce9b3405e1070bdc
Author: Patrick Lauer gentoo org>
AuthorDate: Mon Mar 27 04:55:17 2023 +
Commit: 罗百科 gentoo org>
CommitDate: Mon Mar 27 04:55:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fbe71d
www-apps/grafana-bin: Add 9.3.11 9.4.7
Also remove old
Bug: https://bugs.gentoo.org/903143
Signed-off-by: Patrick Lauer gentoo.org>
www-apps/grafana-bin/Manifest | 7 +--
www-apps/grafana-bin/files/grafana.initd | 36
www-apps/grafana-bin/grafana-bin-9.3.0.ebuild | 66 --
...n-9.3.8-r1.ebuild => grafana-bin-9.3.11.ebuild} | 0
www-apps/grafana-bin/grafana-bin-9.3.2.ebuild | 66 --
www-apps/grafana-bin/grafana-bin-9.3.6.ebuild | 66 --
...in-9.4.3-r1.ebuild => grafana-bin-9.4.7.ebuild} | 0
7 files changed, 2 insertions(+), 239 deletions(-)
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 4dce2f7eaa7f..91c6b9c62b83 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,5 +1,2 @@
-DIST grafana-bin-9.3.0.tar.gz 88847005 BLAKE2B
4c37dc077b7f9fb8f9256a2a85094eef5ae2dabe693d039b7c5509ec2662ec544d307dc1cf0043301fb4c3525107bddfac0a7f7a67f0efb8b333936c1b96192d
SHA512
1489d3f948259dd3db6403e95f176fea664cb5bfc83a6f22e57ffbe075cc07257a463c4b1d1fd8aa94fbad5473b29608f0c3fc6fdf0c08bcb72f3beeff5163c7
-DIST grafana-bin-9.3.2.tar.gz 89322650 BLAKE2B
b9256b6468aa4eff1d77a7bce1f701ab61a372baf2f239572921b04a5624933e57c881035de9a0a86a5ff17b942e2965a7807ae2c183a60cfabb4bd4bf546acb
SHA512
9d13624f728b5f5845c9780372b9334d81faadf03b47034b0de708fe87e50db3daff95f61e5649548cf6a4181253cc39f6d523dde5651833e72df42fe3577f16
-DIST grafana-bin-9.3.6.tar.gz 89397564 BLAKE2B
1095be4f4fd4cedb70ddc0500b7ec84466d6db5a9be8154e5675fa47cdef0082cd57f5c03e0035f84989e639df2f30ced644c270b0d1189d7a00c54f5dd8ca66
SHA512
2619a6fef8bfaafdd45469198b7b7542def77d795e9c58a03a0308cce1e21db0dda936966a098e750304e6cc5a3576ba059d13aad0fd5f59ca24cf3074dba921
-DIST grafana-bin-9.3.8.tar.gz 69932750 BLAKE2B
57c1ad7910145f81b552cdb68fb835bfa0de45c73f69cdff9fdc6565827d73c957513bb02aba31871895d641457c8dc68e19689af4b476ff659d1ab2b84d67dd
SHA512
4e321d007011452dac57daf0dfad55430f46b96f04be7d4f779809900c2dd81b3817123419c9570c84eb9496e3bd38f73af4a63a6c00e95a9d6c252afeda1ccf
-DIST grafana-bin-9.4.3.tar.gz 83780585 BLAKE2B
b8b609bb701b63262e0b70e551b608e4923721664a40ce4eb91a50c60f0978f93c53dd05d5e0e7758ecd7a38f3a459cf695175912c5806f6cfda3e4109114c7e
SHA512
bd315ab4ddd52ad7d9cbf81bce9d04fb00fdf418d2148c84385a47649b76df3e2f36c5664692bfe99038b6f4a280176152d508627f57b7f4402767c03f73f7a6
+DIST grafana-bin-9.3.11.tar.gz 70182266 BLAKE2B
dd1a1eb95cfe356a77975fdb5af75b8f4a6f5b0b9f3245311b269911061e25a8b07c55e13e9f2364328c847170813e1dfdf8bf27108e7423a6969ff23bc1bf11
SHA512
47ce7f321e94495fd53c2fa292edd63ecf75bcd7dd1e5dd67d78fe9cb28e4ae423da5e7071b57ecaacbe6cf7b4ce6cd321022a61eca4c2e083e68729de1e5bf1
+DIST grafana-bin-9.4.7.tar.gz 83744269 BLAKE2B
a34d1e0761b6e16673ac8d4ad0e25cb6caadde06af0986053cb455edd143cc5aa6b70672e43afd6c1381658136ce2243e03ef871416969a26e346a99e1ddbb11
SHA512
7511bdb68e9a3c15e318a7d0d98b3b9df4c8827793498aadd45a12aac92646aab8c1b6d97422b6473553ab62d8f0dcb9e797d9c3df150a877e61182fca32
diff --git a/www-apps/grafana-bin/files/grafana.initd
b/www-apps/grafana-bin/files/grafana.initd
deleted file mode 100644
index ec72725100f8..
--- a/www-apps/grafana-bin/files/grafana.initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/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-server"
-command_args="-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
[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/, www-apps/grafana-bin/files/
commit: 2a4ae922df4b70738da256fffe93a2b887f3f199
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Mar 27 00:58:27 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Mar 27 01:02:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a4ae922
www-apps/grafana-bin: drop old
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
www-apps/grafana-bin/Manifest | 3 --
www-apps/grafana-bin/files/grafana.confd | 7 ---
www-apps/grafana-bin/files/grafana.initd.3| 38
www-apps/grafana-bin/grafana-bin-7.4.1.ebuild | 64 ---
www-apps/grafana-bin/grafana-bin-7.4.2.ebuild | 64 ---
www-apps/grafana-bin/grafana-bin-7.4.3.ebuild | 64 ---
6 files changed, 240 deletions(-)
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 227c0d41fca..778c9fe2d84 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,4 +1 @@
-DIST grafana-bin-7.4.1.tar.gz 51266762 BLAKE2B
8f0cc812e67ea2c91d0b1758a3d675289d6b5bedd42061fb994473073fcb3e174740d7a3546fa2b1482b39425daa45bb817f867deedf85ba56966282ee8aa9cb
SHA512
f7d2e91139d32999d43cabb7843a5368eff2af1386bf865ae8aaf9c099c6c24a5b494029e4a5e4f4c7c5ecd5f23e0e0229c82fd5c142a2e01edf2c63239e5cf0
-DIST grafana-bin-7.4.2.tar.gz 51266527 BLAKE2B
ce1edd1b1a718fbc8acf5e20218f1d5dc82823e5246ea6504f10c92c6309e7a89cdb270b2fa448554370acc521d5b2eb1ac8d160cb206cd9ba223be849fe4e50
SHA512
404e36d0fa4bbe2b39d6bcba0ab04a92a0f5db5878089c2b972ecb2d7b8a7409aa1b1d1fc81deec620da223b942113500661003804b93f17ddccd38f1f1ad361
-DIST grafana-bin-7.4.3.tar.gz 51268825 BLAKE2B
8af8279eaf30b0235a1bb8d44995ad4bce9c71bf80dbbe67aad91de7c5c4e4cc74ca41feedce07c8f7faf15826753b88ac928b5d04914c6a2be73c5e4f1cc052
SHA512
d841e829ca9b8d66294334b3870cd4ca40385e6896b5a25795f8696498f12ee192ab93c4c5a663bc745f77fb8b3b3d46d6066387c6d70c67177f6bc049abd9e9
DIST grafana-bin-7.4.5.tar.gz 51268864 BLAKE2B
c59e16dd8cde882c8f7ffaa3352aeaf38f2fa1e5da3d340796403b0719d33b9eeb5fb7d8ac54b8321f2617d534a3121d2f8a86462e7cf07019baf2a08b141cc2
SHA512
8ad7e2fa9ca92a406690f5a14ea111ff329e6abb4330d4ede5bb34870c3d28cdec940db4c849bb99c097276ad10a3d4c70cf6b73ed8286d45fdf056673d0892f
diff --git a/www-apps/grafana-bin/files/grafana.confd
b/www-apps/grafana-bin/files/grafana.confd
deleted file mode 100644
index 207ef765f65..000
--- a/www-apps/grafana-bin/files/grafana.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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.3
b/www-apps/grafana-bin/files/grafana.initd.3
deleted file mode 100644
index c454fb24975..000
--- a/www-apps/grafana-bin/files/grafana.initd.3
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need localmount
-}
-
-start() {
- ebegin "Starting grafana server"
-
-checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750
"/var/lib/grafana/dashboards"
-checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750
"/var/lib/grafana/plugins"
-checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750
"/var/lib/grafana/sessions"
-
- start-stop-daemon --start -b \
- --make-pidfile \
- --pidfile /run/grafana.pid \
- --chdir /usr/share/grafana \
- --user ${GRAFANA_USER}:${GRAFANA_GROUP} \
- --exec /usr/bin/grafana-server -- \
- -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-7.4.1.ebuild
b/www-apps/grafana-bin/grafana-bin-7.4.1.ebuild
deleted file mode 100644
index 0de07551fc7..000
--- a/www-apps/grafana-bin/grafana-bin-7.4.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB
& OpenTSDB"
-HOMEPAGE="https://grafana.org;
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
- acct-user/grafana"
[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/, www-apps/grafana-bin/files/
commit: 173e640d52754cb0bc24338555cdf8ee185ba2f7
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Feb 21 19:18:01 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Feb 21 19:18:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=173e640d
www-apps/grafana-bin: add multi-instance support
Thanks-to: Kim Jahn maisspace.org>
Closes: https://github.com/gentoo/gentoo/pull/18821
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
www-apps/grafana-bin/files/grafana-r1.confd | 27
www-apps/grafana-bin/files/grafana.initd | 36 +++
www-apps/grafana-bin/grafana-bin-7.4.2.ebuild | 4 +--
3 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/www-apps/grafana-bin/files/grafana-r1.confd
b/www-apps/grafana-bin/files/grafana-r1.confd
new file mode 100644
index 000..fffd31d43b6
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana-r1.confd
@@ -0,0 +1,27 @@
+# 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
+
+# Configuration file
+#GRAFANA_CONFIGFILE="/etc/grafana/${RC_SVCNAME}.ini"
+
+# PID file
+#GRAFANA_PIDFILE="/run/${RC_SVCNAME}.pid"
+
+# The grafana datadir
+#GRAFANA_DATADIR=/var/lib/grafana
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#GRAFANA_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+#GRAFANA_TERMTIMEOUT="TERM/60/KILL/5"
diff --git a/www-apps/grafana-bin/files/grafana.initd
b/www-apps/grafana-bin/files/grafana.initd
new file mode 100644
index 000..ec72725100f
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd
@@ -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-server"
+command_args="-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-7.4.2.ebuild
b/www-apps/grafana-bin/grafana-bin-7.4.2.ebuild
index 0de07551fc7..229e2a789b9 100644
--- a/www-apps/grafana-bin/grafana-bin-7.4.2.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-7.4.2.ebuild
@@ -38,8 +38,8 @@ src_install() {
dobin bin/grafana-cli
dobin bin/grafana-server
- newconfd "${FILESDIR}"/grafana.confd grafana
- newinitd "${FILESDIR}"/grafana.initd.3 grafana
+ newconfd "${FILESDIR}"/grafana-r1.confd grafana
+ newinitd "${FILESDIR}"/grafana.initd grafana
systemd_newunit "${FILESDIR}"/grafana.service grafana.service
keepdir /var/{lib,log}/grafana
[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/, www-apps/grafana-bin/files/
commit: 7f6f2e9b4456669c74284b19985492f649597345
Author: Tobias Klausmann gentoo org>
AuthorDate: Mon Aug 21 08:15:16 2017 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Mon Aug 21 08:15:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f6f2e9b
www-apps/grafana-bin: Add 4.4.3 and do some cleanup
Package-Manager: Portage-2.3.8, Repoman-2.3.3
www-apps/grafana-bin/Manifest | 3 +-
www-apps/grafana-bin/files/grafana.initd.2 | 34
www-apps/grafana-bin/grafana-bin-4.4.1.ebuild | 62 --
...in-4.2.0-r2.ebuild => grafana-bin-4.4.3.ebuild} | 0
4 files changed, 1 insertion(+), 98 deletions(-)
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 8c36ae2eb8b..f17711ee3ad 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,3 +1,2 @@
-DIST grafana-bin-4.2.0.tar.gz 45741731 SHA256
e9927baaaf6cbcab64892dedd11ccf509e4edea54670db4250b9e7568466ec61 SHA512
8c100f5d61b8ebac2abb3894d3f37e926c6fd81eb3ab68fd966d2bc38d9ec2386fee15dd745f5efe7c0e52de06321f3e983fdab0185b3da3f28562b54c60994f
WHIRLPOOL
08d00ab71ae8dba828c98661c4250b5e4a014f75d25b9eb80daee445570b972b2babd6da89f5aba76ca1d32b1d6e71376066c6387d6bb92c1f7299fbc7087d4b
DIST grafana-bin-4.3.2.tar.gz 47036583 SHA256
0c835229d1dcba43cbb79014ef0782edbd7b58d156a6aa2886a07bb52232666e SHA512
3c941bb589637d7b917794f5e655427ce5516a4dc97d87e696c8c9b7d00604dc147726d14ec8635d9e51f9db82f13748deb28556737568504f16bbf3f8349bab
WHIRLPOOL
fc7b00644c360359583bcd371ab2f0bc0375e8c018707f2887b483b60ca2d03b1cd7d6121b8a7abaa2157d84820de6713f131b08ca98a0aa017e3fad2599b9c5
-DIST grafana-bin-4.4.1.tar.gz 47275422 SHA256
700aa0e5c68129c112f784d63d39102af23d5a247ac97ecab71e0370f43f14aa SHA512
062d9a7586a1d376855129ef9aee914aaae42f1e60ce6d1851f8fdceca61a45a29396274b772fe1c06adb8a55dae631be9a00cbce4e75787562048e36d65056d
WHIRLPOOL
39596546125befdae05e036076a5ac5accd16e0ce7436a06bcb2265149ecf9f7390a3b7069df0ee668170f09df8c569406eeea3bcaa3d0ec943b6fa3099b77dd
+DIST grafana-bin-4.4.3.tar.gz 47282503 SHA256
90d0c53f6a9edb5f6fb5acb58265a167ef41f5b06701301eafc30bafa28566dc SHA512
21eea944931a9d4a7120d6f2e27fb5300f747ba0ff12cc93b160d38133400548701e342e6481e647f4252d34740aa49a7ebbe8c63a2a30a9fa6a057b90deb87a
WHIRLPOOL
d5fffbf9dc21fbb0711335a6234233a95bcd801bc3701e1b1be8b037977a291d77e668e950f6bf2c7f848c2395ccfe424b9abf97062f8d1b08b3b676e24f0f81
diff --git a/www-apps/grafana-bin/files/grafana.initd.2
b/www-apps/grafana-bin/files/grafana.initd.2
deleted file mode 100644
index 13dd8ff8fdc..000
--- a/www-apps/grafana-bin/files/grafana.initd.2
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need localmount
-}
-
-start() {
- ebegin "Starting grafana server"
-
- start-stop-daemon --start -b \
- --make-pidfile \
- --pidfile /run/grafana.pid \
- --chdir /usr/share/grafana \
- --user ${GRAFANA_USER}:${GRAFANA_GROUP} \
- --exec /usr/bin/grafana-server -- \
- -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-4.4.1.ebuild
b/www-apps/grafana-bin/grafana-bin-4.4.1.ebuild
deleted file mode 100644
index 3a8308e2d6d..000
--- a/www-apps/grafana-bin/grafana-bin-4.4.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB
& OpenTSDB"
-HOMEPAGE="http://grafana.org;
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-x64.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-QA_PRESTRIPPED=${QA_EXECSTACK}
-
-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 || die
-
- # Frontend assets
- insinto /usr/share/${MY_PN}
- doins -r public conf vendor
-
- dobin bin/grafana-cli
- dobin bin/grafana-server
-
- newconfd "${FILESDIR}"/grafana.confd
[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/, www-apps/grafana-bin/files/
commit: f42d6679c038c3efcc257d38547267d01823aea9
Author: Patrice Clement gentoo org>
AuthorDate: Tue Apr 11 16:37:46 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Apr 11 16:39:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42d6679
www-apps/grafana-bin: revert 12c3eacda7c4d23686eaf10eab21d810cc95ea49 and
disable log rotation support.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-apps/grafana-bin/files/grafana.logrotate | 8
...na-bin-4.2.0-r1.ebuild => grafana-bin-4.2.0-r2.ebuild} | 15 +--
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/www-apps/grafana-bin/files/grafana.logrotate
b/www-apps/grafana-bin/files/grafana.logrotate
deleted file mode 100644
index 508db1e16ce..000
--- a/www-apps/grafana-bin/files/grafana.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/grafana/grafana*.log {
-nocompress
-create 644 root root
-daily
-rotate 7
-missingok
-size 50M
-}
diff --git a/www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild
b/www-apps/grafana-bin/grafana-bin-4.2.0-r2.ebuild
similarity index 78%
rename from www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild
rename to www-apps/grafana-bin/grafana-bin-4.2.0-r2.ebuild
index 2afa441185f..3a8308e2d6d 100644
--- a/www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-4.2.0-r2.ebuild
@@ -17,9 +17,7 @@ SLOT="0"
KEYWORDS="~amd64"
DEPEND=""
-RDEPEND="
- ${DEPEND}
- app-admin/logrotate"
+RDEPEND="${DEPEND}"
QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
QA_PRESTRIPPED=${QA_EXECSTACK}
@@ -52,8 +50,13 @@ src_install() {
fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
fperms 0750 /var/{lib,log}/grafana
fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
- # Logrotation support.
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/grafana.logrotate "${PN}"
+postinst() {
+ elog "${PN} has built-in log rotation. Please see [log.file] section of"
+ elog "/etc/grafana/grafana.ini for related settings."
+ elog
+ elog "You may add your own custom configuration for app-admin/logrotate
if you"
+ elog "wish to use external rotation of logs. In this case, you also
need to make"
+ elog "sure the built-in rotation is turned off."
}
[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/, www-apps/grafana-bin/files/
commit: 12c3eacda7c4d23686eaf10eab21d810cc95ea49
Author: Patrice Clement gentoo org>
AuthorDate: Tue Apr 11 13:49:14 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Apr 11 13:49:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c3eacd
www-apps/grafana-bin: add logrorate support.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-apps/grafana-bin/files/grafana.logrotate | 8
www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild | 59
2 files changed, 67 insertions(+)
diff --git a/www-apps/grafana-bin/files/grafana.logrotate
b/www-apps/grafana-bin/files/grafana.logrotate
new file mode 100644
index 000..508db1e16ce
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.logrotate
@@ -0,0 +1,8 @@
+/var/log/grafana/grafana*.log {
+nocompress
+create 644 root root
+daily
+rotate 7
+missingok
+size 50M
+}
diff --git a/www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild
b/www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild
new file mode 100644
index 000..2afa441185f
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB
& OpenTSDB"
+HOMEPAGE="http://grafana.org;
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-x64.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="
+ ${DEPEND}
+ app-admin/logrotate"
+
+QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PRESTRIPPED=${QA_EXECSTACK}
+
+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 || die
+
+ # 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.3 grafana
+ systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+ keepdir /var/{lib,log}/grafana
+ keepdir /var/lib/grafana/{dashboards,plugins}
+ fowners grafana:grafana /var/{lib,log}/grafana
+ fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+ fperms 0750 /var/{lib,log}/grafana
+ fperms 0750 /var/lib/grafana/{dashboards,plugins}
+
+ # Logrotation support.
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/grafana.logrotate "${PN}"
+}
[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/, www-apps/grafana-bin/files/
commit: 77e5da07ebf7376541167d97a0d5eb8f39ce7f08
Author: Patrick Lauer gentoo org>
AuthorDate: Tue Apr 11 08:55:31 2017 +
Commit: Patrick Lauer gentoo org>
CommitDate: Tue Apr 11 08:55:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e5da07
www-apps/grafana-bin: Bump. Fix lots of bugs. Add ferki as maintainer
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-apps/grafana-bin/Manifest | 2 +-
www-apps/grafana-bin/files/grafana.initd.3 | 38 ++
www-apps/grafana-bin/files/grafana.service | 24 ++
...4.2.0_beta1.ebuild => grafana-bin-4.2.0.ebuild} | 22 -
www-apps/grafana-bin/metadata.xml | 4 +++
5 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 1e6feb1c960..1c9562d30ab 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,4 +1,4 @@
DIST grafana-bin-4.0.1.tar.gz 42179027 SHA256
910327d0d7b7597cb471a697766baea170da9eb2ac59c94782c90744a16a218b SHA512
7aea39aa8dddf4123d7716b4561476beb50c4725c1ef59f5d8ab033134725445c9c3b47fda9538de58edf5c45c2145f2a9cf0bd33352764fd2840ba090967bd0
WHIRLPOOL
5d0ecc929b681ead4a17d544631b54cb0b76705f5a72470acc646b7d5888937a02b033a1d3aeab901f436fb6c0d8c21460bcf0422b0db99578dfc0378d13deb5
DIST grafana-bin-4.1.1.tar.gz 45019506 SHA256
51464c7569638bbfd7c6a7397c8f5f296c6839a113360ff5f908d454a9643aeb SHA512
74df71c1f4b8d84046ed94447d01a759197486232ff4818a10e5e4656c6fd025c9aa224df8c8f02770a77a7483398c881aebfd40a1da12e8d83d8ec97980d3db
WHIRLPOOL
b8f8d4c59d49303bdb9f53de9d67481083e41ff2d9be43dab2cacfc6bee742bf310cabba0766c58c80c7d42a7aad7e2633d3e57d4603ea23a1fd4a14faba7e16
DIST grafana-bin-4.1.2.tar.gz 45024995 SHA256
b8111cd014e9c202dd1b168b924731a140161e9e43e32f3ca7ae18db850af6c4 SHA512
4a0825c99eebb4185036cf5e1fd2ec26ff12913e474ac6014bb677329e1c92ee866be4ff53bd2560d91ebe38d7d7e3ae310e05b221e415046afbafd7a164e3cf
WHIRLPOOL
6c4eda846cdd4ff4ef0ef34a0fd3b45da45cbc0aa0fa46d707616809c3fed322146b89678dcd11de2d31bf6ca94efa6afb7cd9f9423b5cac1847da209b7bae6c
-DIST grafana-bin-4.2.0_beta1.tar.gz 46386040 SHA256
522c6a9a956a988580cd0b284d991389ef229ad4d515584fa4df16de6fa95771 SHA512
da4f4c8255b27dfdcc75dc0e356b88e8d6869c07504af7923118c42acea0f6170e4af2fdd89827056a3cace1090ce90bed62544a795f8d5980b93c8bac05444f
WHIRLPOOL
ee24150ffa3d8d651d3378b1a77837917cb398610330c67dac29a0a17b49114918065f2462ff6d8ce1e13e2f17e455afe9d2195ad58ad5e064bccc18eecd80d2
+DIST grafana-bin-4.2.0.tar.gz 45741731 SHA256
e9927baaaf6cbcab64892dedd11ccf509e4edea54670db4250b9e7568466ec61 SHA512
8c100f5d61b8ebac2abb3894d3f37e926c6fd81eb3ab68fd966d2bc38d9ec2386fee15dd745f5efe7c0e52de06321f3e983fdab0185b3da3f28562b54c60994f
WHIRLPOOL
08d00ab71ae8dba828c98661c4250b5e4a014f75d25b9eb80daee445570b972b2babd6da89f5aba76ca1d32b1d6e71376066c6387d6bb92c1f7299fbc7087d4b
diff --git a/www-apps/grafana-bin/files/grafana.initd.3
b/www-apps/grafana-bin/files/grafana.initd.3
new file mode 100644
index 000..c454fb24975
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd.3
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need localmount
+}
+
+start() {
+ ebegin "Starting grafana server"
+
+checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750
"/var/lib/grafana/dashboards"
+checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750
"/var/lib/grafana/plugins"
+checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750
"/var/lib/grafana/sessions"
+
+ start-stop-daemon --start -b \
+ --make-pidfile \
+ --pidfile /run/grafana.pid \
+ --chdir /usr/share/grafana \
+ --user ${GRAFANA_USER}:${GRAFANA_GROUP} \
+ --exec /usr/bin/grafana-server -- \
+ -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/files/grafana.service
b/www-apps/grafana-bin/files/grafana.service
new file mode 100644
index 000..66fefe67e3e
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.service
@@ -0,0 +1,24 @@
+[Unit]
+Description=Grafana
+Documentation=http://docs.grafana.org
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+User=grafana
+Group=grafana
+Type=simple
+Restart=on-failure
+WorkingDirectory=/usr/share/grafana
+ExecStart=/usr/bin/grafana-server \
+--config=/etc/grafana/grafana.ini \
+
[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/, www-apps/grafana-bin/files/
commit: 620deff506d5d7ae1260fb2fa3f5e6188ad50af6
Author: Tobias Klausmann gentoo org>
AuthorDate: Thu Dec 1 13:04:31 2016 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Thu Dec 1 13:05:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=620deff5
www-apps/grafana-bin: Add info about higher FD ulimit for 4.x
Package-Manager: portage-2.3.2
www-apps/grafana-bin/files/grafana.confd| 5 +
.../{grafana-bin-4.0.0.ebuild => grafana-bin-4.0.0-r1.ebuild} | 6 ++
2 files changed, 11 insertions(+)
diff --git a/www-apps/grafana-bin/files/grafana.confd
b/www-apps/grafana-bin/files/grafana.confd
index 207ef76..0ad311d 100644
--- a/www-apps/grafana-bin/files/grafana.confd
+++ b/www-apps/grafana-bin/files/grafana.confd
@@ -5,3 +5,8 @@ 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 1"
diff --git a/www-apps/grafana-bin/grafana-bin-4.0.0.ebuild
b/www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild
similarity index 83%
rename from www-apps/grafana-bin/grafana-bin-4.0.0.ebuild
rename to www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild
index b460877..95285d1 100644
--- a/www-apps/grafana-bin/grafana-bin-4.0.0.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild
@@ -49,3 +49,9 @@ 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."
+}
[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/, www-apps/grafana-bin/files/
commit: 21e1ed587a5f803da0b927a8f3f95e3e5f624a11
Author: Patrick Lauer gentoo org>
AuthorDate: Mon Jul 18 15:33:01 2016 +
Commit: Patrick Lauer gentoo org>
CommitDate: Mon Jul 18 15:35:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e1ed58
www-apps/grafana-bin: Fix pidfile handling
Package-Manager: portage-2.3.0
www-apps/grafana-bin/files/grafana.initd.2 | 35 ++
...in-3.1.0.ebuild => grafana-bin-3.1.0-r1.ebuild} | 2 +-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/www-apps/grafana-bin/files/grafana.initd.2
b/www-apps/grafana-bin/files/grafana.initd.2
new file mode 100644
index 000..14b0b1f
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd.2
@@ -0,0 +1,35 @@
+#!/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 \
+ --make-pidfile \
+ --pidfile /run/grafana.pid \
+ --chdir /usr/share/grafana \
+ --user ${GRAFANA_USER}:${GRAFANA_GROUP} \
+ --exec /usr/bin/grafana-server -- \
+ -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.1.0.ebuild
b/www-apps/grafana-bin/grafana-bin-3.1.0-r1.ebuild
similarity index 95%
rename from www-apps/grafana-bin/grafana-bin-3.1.0.ebuild
rename to www-apps/grafana-bin/grafana-bin-3.1.0-r1.ebuild
index 159d2d8..3752348 100644
--- a/www-apps/grafana-bin/grafana-bin-3.1.0.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-3.1.0-r1.ebuild
@@ -43,7 +43,7 @@ src_install() {
dobin bin/grafana-server
newconfd "${FILESDIR}"/grafana.confd grafana
- newinitd "${FILESDIR}"/grafana.initd grafana
+ newinitd "${FILESDIR}"/grafana.initd.2 grafana
keepdir /var/{lib,log}/grafana
fowners grafana:grafana /var/{lib,log}/grafana
