diff options
| -rw-r--r-- | .SRCINFO | 30 | ||||
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | PKGBUILD | 67 | ||||
| -rw-r--r-- | grafana.install | 27 | ||||
| -rw-r--r-- | grafana.service | 2 | ||||
| -rw-r--r-- | grafana.sysusers | 1 | ||||
| -rw-r--r-- | grafana.tmpfiles | 2 |
7 files changed, 84 insertions, 49 deletions
@@ -1,27 +1,25 @@ pkgbase = grafana-bin - pkgdesc = A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb - binary version - pkgver = 7.1.0 + pkgdesc = Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB - binary version + pkgver = 10.4.1 pkgrel = 1 - url = http://grafana.org + url = https://grafana.com/ install = grafana.install arch = x86_64 - arch = armv6h - arch = armv7h arch = aarch64 + license = AGPL license = Apache provides = grafana conflicts = grafana - backup = etc/grafana/grafana.ini + backup = etc/grafana.ini source = grafana.service - sha256sums = 07512df687b1cf622c1a71b67f3cdf286ba02d7b87a844a4c51f89e0228074f2 - source_x86_64 = https://dl.grafana.com/oss/release/grafana-7.1.0.linux-amd64.tar.gz - sha256sums_x86_64 = 4b6d6ce3670b281919dac8da4bf6d644bc8403ceae215e4fd10db0f2d1e5718e - source_armv6h = https://dl.grafana.com/oss/release/grafana-7.1.0.linux-armv6.tar.gz - sha256sums_armv6h = 1fce769d308a4dfa8fb8d411e2a933f2a291c87148f3d67b9ee994fd159f3580 - source_armv7h = https://dl.grafana.com/oss/release/grafana-7.1.0.linux-armv7.tar.gz - sha256sums_armv7h = e57dc2bc24cc06dbfc5c7f5c00b2da7d028f8fbfc50eeef0b252952fcc107086 - source_aarch64 = https://dl.grafana.com/oss/release/grafana-7.1.0.linux-arm64.tar.gz - sha256sums_aarch64 = e6e5a64733d37cb0da04c5755ebfca3976de7333e5cced6a4184d24805c28477 + source = grafana.sysusers + source = grafana.tmpfiles + sha256sums = fa1aefe885f2d94bb6a9f6e98eb793b8145f1a980357c809036dc00c9d25594f + sha256sums = 9cbd46f771dae5e2308b991a00d07a25cc1765f9bdd4082726108e3476403b56 + sha256sums = 3cd6026ba009e05f49ec265d049d590d4f35330c1f14cd90a468c8d588501675 + source_x86_64 = https://dl.grafana.com/oss/release/grafana-10.4.1.linux-amd64.tar.gz + sha256sums_x86_64 = e6fb188d42556e7330165d1df46ebda920371640c24dad486cff71008f164127 + source_aarch64 = https://dl.grafana.com/oss/release/grafana-10.4.1.linux-arm64.tar.gz + sha256sums_aarch64 = 55bb07af495428f3988dfda0a7434a00ecda5a5f21d644bdce04b11af1a0cbbd pkgname = grafana-bin - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..54d4e2e8738a --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +pkg/ +src/ +grafana-*.tar.gz +grafana-*.tar @@ -1,43 +1,64 @@ # Maintainer: Zhuoyun Wei <wzyboy@wzyboy.org> +# Contributor: Sébastien "Seblu" Luttringer # Contributor: Carsten Feuls <archlinux@carstenfeuls.de> # Contributor: Gilles Hamel <hamelg at laposte dot net> # Contributor: Erikas Rudinskas <erikmnkl@gmail.com> - pkgname=grafana-bin _pkgname=grafana -pkgver=7.1.0 +pkgver=10.4.1 pkgrel=1 -pkgdesc="A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb - binary version" -url="http://grafana.org" +pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB - binary version' +url='https://grafana.com/' conflicts=('grafana') provides=('grafana') -arch=('x86_64' 'armv6h' 'armv7h' 'aarch64') -license=('Apache') +# 32-bit ARM is temporarily disabled upstream +# https://grafana.com/blog/2023/09/29/grafana-and-grafana-enterprise-updates-for-armv6-and-armv7-will-be-temporarily-paused/ +#arch=('x86_64' 'armv6h' 'armv7h' 'aarch64') +arch=('x86_64' 'aarch64') +license=('AGPL' 'Apache') install=${_pkgname}.install -backup=("etc/${_pkgname}/${_pkgname}.ini") -source=("grafana.service") +backup=('etc/grafana.ini') +source=('grafana.service' + 'grafana.sysusers' + 'grafana.tmpfiles' + ) +install=$_pkgname.install source_x86_64=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-amd64.tar.gz") -source_armv6h=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-armv6.tar.gz") -source_armv7h=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-armv7.tar.gz") +#source_armv6h=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-armv6.tar.gz") +#source_armv7h=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-armv7.tar.gz") source_aarch64=("https://dl.grafana.com/oss/release/grafana-${pkgver}.linux-arm64.tar.gz") -sha256sums=('07512df687b1cf622c1a71b67f3cdf286ba02d7b87a844a4c51f89e0228074f2') -sha256sums_x86_64=('4b6d6ce3670b281919dac8da4bf6d644bc8403ceae215e4fd10db0f2d1e5718e') -sha256sums_armv6h=('1fce769d308a4dfa8fb8d411e2a933f2a291c87148f3d67b9ee994fd159f3580') -sha256sums_armv7h=('e57dc2bc24cc06dbfc5c7f5c00b2da7d028f8fbfc50eeef0b252952fcc107086') -sha256sums_aarch64=('e6e5a64733d37cb0da04c5755ebfca3976de7333e5cced6a4184d24805c28477') +sha256sums=('fa1aefe885f2d94bb6a9f6e98eb793b8145f1a980357c809036dc00c9d25594f' + '9cbd46f771dae5e2308b991a00d07a25cc1765f9bdd4082726108e3476403b56' + '3cd6026ba009e05f49ec265d049d590d4f35330c1f14cd90a468c8d588501675') +sha256sums_x86_64=('e6fb188d42556e7330165d1df46ebda920371640c24dad486cff71008f164127') +sha256sums_aarch64=('55bb07af495428f3988dfda0a7434a00ecda5a5f21d644bdce04b11af1a0cbbd') +#sha256sums_armv6h=('633009b0dd4fa25cc0062f7d90addb020b83687c3d70866edcb31be8f8a1bd48') +#sha256sums_armv7h=('7a5fb0e045117f9ebf7e7549085e1a554f4a15b32724c088afa05f4d16e02c56') +prepare() { + cd ${_pkgname}-v${pkgver} + # set arch linux paths + sed -ri 's,^(\s*data\s*=).*,\1 /var/lib/grafana,' conf/defaults.ini + sed -ri 's,^(\s*plugins\s*=).*,\1 /var/lib/grafana/plugins,' conf/defaults.ini + sed -ri 's,^(\s*provisioning\s*=).*,\1 /var/lib/grafana/conf/provisioning,' conf/defaults.ini + sed -ri 's,^(\s*logs\s*=).*,\1 /var/log/grafana,' conf/defaults.ini +} package() { - install -Dm644 "${srcdir}/grafana.service" "$pkgdir/usr/lib/systemd/system/grafana.service" - cd "${srcdir}/${_pkgname}-${pkgver}" - install -dm755 "${pkgdir}/var/lib/grafana" - install -dm755 "${pkgdir}/var/log/grafana" + install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf" + install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf" + install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service" + + cd ${_pkgname}-v${pkgver} install -Dm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server" install -Dm755 bin/grafana-cli "$pkgdir/usr/bin/grafana-cli" - sed -i '/^;data = /c\data = /var/lib/grafana' conf/sample.ini - sed -i '/^;logs = /c\logs = /var/log/grafana' conf/sample.ini - install -Dm644 conf/sample.ini "$pkgdir/etc/${_pkgname}/${_pkgname}.ini" + install -Dm755 bin/grafana "$pkgdir/usr/bin/grafana" + install -Dm640 -o207 -g207 conf/sample.ini "$pkgdir/etc/grafana.ini" install -Dm644 conf/defaults.ini "$pkgdir/usr/share/grafana/conf/defaults.ini" - cp -r public scripts plugins-bundled "$pkgdir/usr/share/grafana/" + install -dm755 "$pkgdir/usr/share/grafana/" + cp -r public plugins-bundled "$pkgdir/usr/share/grafana/" + + # Remove unit tests + rm -r "$pkgdir/usr/share/grafana/public/test" } diff --git a/grafana.install b/grafana.install index f6ef82a7f506..56563086ff8e 100644 --- a/grafana.install +++ b/grafana.install @@ -1,13 +1,22 @@ -post_install() { - getent group grafana >/dev/null || groupadd -r grafana - getent passwd grafana >/dev/null || useradd -d /var/lib/grafana -g grafana -r -M -s /bin/false grafana - chown grafana:grafana /var/{lib,log}/grafana -} +#/bin/sh +# arg 1: the new package version +# arg 2: the old package version post_upgrade() { - post_install + if (( "$(vercmp $2 2.6.0-3)" < 0 )); then + echo '==> Configuration moved to /etc/grafana.ini' + fi + if (( "$(vercmp $2 4.4.3-1)" < 0 )); then + echo '==> Grafana now uses static UID/GID 207' + echo '==> Trying to update your previous UID/GID' + if ! { usermod -u 207 grafana && groupmod -g 207 grafana && + chown -R 207:207 /var/{lib,log}/grafana; }; then + echo '==> Automatic GID/UID change failed. Do it manually!' + echo '==> usermod -g 207 grafana && groupmod -u 207 grafana && chown -R 207:207 /var/l{ib,og}/grafana' + fi + echo '==> Check the ownership of your files!' + fi + return 0 } -post_remove() { - userdel grafana -} +# vim:set ts=2 sw=2 et: diff --git a/grafana.service b/grafana.service index 5fd9d17d5885..13e8dc020d48 100644 --- a/grafana.service +++ b/grafana.service @@ -6,7 +6,7 @@ After=network.target postgresql.service mariadb.service mysqld.service User=grafana Group=grafana WorkingDirectory=/usr/share/grafana -ExecStart=/usr/bin/grafana-server --config=/etc/grafana/grafana.ini +ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini LimitNOFILE=10000 TimeoutStopSec=20 SuccessExitStatus=0 2 diff --git a/grafana.sysusers b/grafana.sysusers new file mode 100644 index 000000000000..ccf29039f22a --- /dev/null +++ b/grafana.sysusers @@ -0,0 +1 @@ +u grafana 207 - /var/lib/grafana diff --git a/grafana.tmpfiles b/grafana.tmpfiles new file mode 100644 index 000000000000..f7881036c749 --- /dev/null +++ b/grafana.tmpfiles @@ -0,0 +1,2 @@ +d /var/lib/grafana 0750 grafana grafana - +d /var/log/grafana 0750 grafana grafana - |