Updated www-apps/grafana to 11.4.0

Author: r7l

www-apps/grafana/Manifest

@@ -1,8 +1,6 @@
-AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
-AUX grafana.initd 948 BLAKE2B 0d770c3914f730d58d0c5f619e215df7e16a163c39f4e1e31a94dee305a6d47c9ab70e49b05daf7571abfb4b730b31e816a7378a2f3af8f5c97a8f328877e6f7 SHA512 f8e3670e957ff6c9faee9cfdfb09134fa6fd0d6095bb0ab982fda9a4b9dbc3b370f1b710efd44f0135d49fe90b1a5b7f950974589aff3b4d1e7fd33fbfa82735
-AUX grafana.service 708 BLAKE2B 059e153ad6c8f4a1a7b3e957b178137b27045fa5c4207099d56e83e3df7220ba175570c104c6a2d0ddfe5b4bc990982243463d9092d0a1a915c10e4cd115c00b SHA512 802c6dfbf0f29eeef79f59d0730d4762a250adf369ad91fa4a5cee080fd3620bf8f0da0fb25dfd8e549a7bdf4f95db450880c92997abb6f99f96eb0341435db1
-DIST grafana-11.2.0.tar.gz 33720263 BLAKE2B afcbc93a2a75cfcaa4dc3ec8e6a23c4c6f05118ff67329b8d4fc35a3f5c175d7d8ada91870ef35081e45e568a8f0421eb1f2043e2c5ae0c49ffe66d5130fa86d SHA512 66fb9045c4a16517e9e059762c68744e6e42452f5c3fb501ac25c010682a8c516778ebe807f806657b9073f1285037348247effb051f5aa84fe607adb67eb5cd
-DIST grafana-11.2.2.tar.gz 33767356 BLAKE2B fe935876a154ac0751e4f07364cf98c66d8807bc0a3d381cd9562b6a1d6cb5ab9a0e7f10350620b8ff2541f02c0eadaa5cbbb9d434a9f7f7dcbfe2dcc6d11b6d SHA512 c950b59befe65054ed8d784d96b6bf53f1d3007031cc9621ad9eb0c790ef5b211a79c1ad949495b5c769ee26a2553901a8eab231112f7c7078f5b6929b19a980
-EBUILD grafana-11.2.0.ebuild 2001 BLAKE2B ec7e4566cca785cdf31918e795ec0113d11c43abb29c82ac41cdff6336e4b6fdcd0f742e576f1c9611cc079e67249ea2ba6a141df78adfa511612a427e414510 SHA512 346eb7d07053c75203c39cbe3fab94b180615987994af37a7a4726146d0ac529dee705381ee73206bdc06e852e6f720ed4cf2baab473c8389a06d0cf297844e5
-EBUILD grafana-11.2.2.ebuild 2001 BLAKE2B ec7e4566cca785cdf31918e795ec0113d11c43abb29c82ac41cdff6336e4b6fdcd0f742e576f1c9611cc079e67249ea2ba6a141df78adfa511612a427e414510 SHA512 346eb7d07053c75203c39cbe3fab94b180615987994af37a7a4726146d0ac529dee705381ee73206bdc06e852e6f720ed4cf2baab473c8389a06d0cf297844e5
+AUX grafana.confd 869 BLAKE2B 79b9d8a43e1f6e82fdd0da40c3eaa66431913b57a515d0dce7122fbd90492045f008c0ce59d8dc61fd8774af9d0e33f404ecb8455ce9feb24fb4030405300b09 SHA512 457d858af5997c728c8fa1adb0418aabe2b9a92b148d274e447681ce323cd7375ad56a10669e58cb47b4ab98214f4fde8e5aaefe7fe1844f726b85efcc6c0b4b
+AUX grafana.initd 1498 BLAKE2B ce22443e0f328487cc9e1ff3e7df23c5a0deb790dd99b51330d388df3345d33f9e0588733323a0becff9fcb559c004860a2c080b2dbb21731a49bce5b387db41 SHA512 c7684f2d8647cf3c48a030f17250a592614fb74f846ff8821f07cd2031bc39ab50bb1936eb5eddeab9f67823c86c392648373b551c2c30e728c1501b3273242b
+AUX grafana.service 675 BLAKE2B c950091eef6342ec15ea61a3b9fb005d4f3672200acb6f24761ef9c102c70ebecfe144fa0dfda153547a52fcc006c39c93e6bb21d7f556105db905e4dbb3a319 SHA512 ecd632256f44b9eb1745499a27446e2a03b0dc9698ab2a1ce5c2caa43ede72dc393b8046a37232d8cba1af08c31932f13c155c3e355d15c360c8877299645494
+DIST grafana-11.4.0.tar.gz 34329942 BLAKE2B 7ef9dfe23b752d567b257215e8ece97b10322b05521c8a0e8f50beee4010091163721b2a16003adfbb1bfd341fbcf1736b4933424a68001ea893b00b56db5deb SHA512 775facd03f6f7d2dd6162b84cf900c924fd3155f08b4c858ac87bcd8093e2f764bfcd76e71d027f67c6d5133d264065ed8a7f4e73b6193d21b7a2aa5cc53f424
+EBUILD grafana-11.4.0.ebuild 2099 BLAKE2B a730b87c6b0d30c24214cb3a4d251005890cb353e5adc34cd738d64b9301a03b67dbbd088e4a2af5c039bcbf147064a1fd2b0f005d70ca1f9ee5c09f51b9f0f9 SHA512 728ed6d282fbf53ad689fed9a333a2899906c847293e93f452c1ee866382ba15da54bbd3433f611f9816b95b0dfb919ca3d21273942239b48ce2d7b2f4d4a07e
 MISC metadata.xml 208 BLAKE2B 9a49bcbd6fb3839b65d0f64536f653db278a8a4128fed8331e63abfcac58a5eebcc5c05950454d3a07196b4bafd1dd3260797dfb1c5d83ef9c91641d3a8cd460 SHA512 7fe4226522e71aae30da5cf4f7c2b7b0099b8d8007ec154dadf1a4f320b8e39d8948428abb6b09e2d3619fdd1eb1cc988d028293b6845c2e4d0bd0ed77b92722

www-apps/grafana/files/grafana.confd

@@ -1,7 +1,27 @@
 # Config file for /etc/init.d/grafana
 
-# The user to run your application as.
-GRAFANA_USER=grafana
+# The user to run your application as
+#GRAFANA_USER=grafana
 
-# The group to run your application as.
-GRAFANA_GROUP=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"

www-apps/grafana/files/grafana.initd

@@ -1,36 +1,36 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-#!/sbin/openrc-run
-
-homepath=/usr/share/grafana
-config=/etc/grafana/grafana.ini
-pidfile=/var/run/grafana/grafana.pid
-command=/usr/bin/grafana-server
-command_args="-config ${config} -homepath ${homepath}"
-command_background=yes
-make_pidfile=yes
-command_user="grafana:grafana"
-retry=SIGTERM/30/SIGKILL/10
-wait=1000
+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() {
-
-        # Check if config file exist
-        if [ ! -r ${config} ]; then
-                eerror "config file ${config} doesn't exist"
-            return 1
-        fi
-
-	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"
-
-        return 0
+	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
 }
-

www-apps/grafana/files/grafana.service

@@ -9,11 +9,11 @@ User=grafana
 Group=grafana
 Type=simple
 Restart=on-failure
+RuntimeDirectory=grafana
 WorkingDirectory=/usr/share/grafana
 ExecStart=/usr/bin/grafana-server                      \
-    -config=/etc/grafana/grafana.ini                   \
-    -homepath=/usr/share/grafana                       \
-    -pidfile=/run/grafana.pid                          \
+    --config=/etc/grafana/grafana.ini                  \
+    --pidfile=/run/grafana/grafana.pid                 \
     cfg:default.paths.logs=/var/log/grafana            \
     cfg:default.paths.data=/var/lib/grafana            \
     cfg:default.paths.plugins=/var/lib/grafana/plugins
@@ -22,4 +22,4 @@ TimeoutStopSec=20
 UMask=0027
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

www-apps/grafana/grafana-11.2.2.ebuild

@@ -32,7 +32,10 @@ pkg_pretend() {
 }
 
 src_compile() {
-	NODE_OPTIONS="--max-old-space-size=5120" LDFLAGS="" make all || die
+	NX_SOCKET_DIR="/tmp/nx-socket" \
+	NODE_OPTIONS="--max-old-space-size=5120" \
+	LDFLAGS="" \
+	make all || die
 }
 
 src_install() {
@@ -45,9 +48,8 @@ src_install() {
 	doins -r public conf
 
 	dobin bin/linux-amd64/grafana
-	dobin bin/linux-amd64/grafana-cli
-	dobin bin/linux-amd64/grafana-server
 
+	newconfd "${FILESDIR}"/grafana.confd grafana
 	newinitd "${FILESDIR}"/grafana.initd grafana
 
 	if ! use systemd; then
@@ -63,10 +65,14 @@ src_install() {
 }
 
 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."
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		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."
+	fi
 }