Date: Friday, August 6, 2021 @ 17:56:11 Author: daurnimator Revision: 994578
archrelease: copy trunk to community-x86_64 Added: loki/repos/community-x86_64/PKGBUILD (from rev 994577, loki/trunk/PKGBUILD) loki/repos/community-x86_64/loki.service (from rev 994577, loki/trunk/loki.service) loki/repos/community-x86_64/loki.sysusers (from rev 994577, loki/trunk/loki.sysusers) loki/repos/community-x86_64/loki.tmpfiles (from rev 994577, loki/trunk/loki.tmpfiles) loki/repos/community-x86_64/promtail.service (from rev 994577, loki/trunk/promtail.service) loki/repos/community-x86_64/promtail.sysusers (from rev 994577, loki/trunk/promtail.sysusers) loki/repos/community-x86_64/promtail.tmpfiles (from rev 994577, loki/trunk/promtail.tmpfiles) Deleted: loki/repos/community-x86_64/PKGBUILD loki/repos/community-x86_64/loki.service loki/repos/community-x86_64/loki.sysusers loki/repos/community-x86_64/loki.tmpfiles loki/repos/community-x86_64/promtail.service loki/repos/community-x86_64/promtail.sysusers loki/repos/community-x86_64/promtail.tmpfiles -------------------+ PKGBUILD | 191 +++++++++++++++++++++++++--------------------------- loki.service | 58 +++++++-------- loki.sysusers | 2 loki.tmpfiles | 2 promtail.service | 56 +++++++-------- promtail.sysusers | 4 - promtail.tmpfiles | 2 7 files changed, 154 insertions(+), 161 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-08-06 17:55:36 UTC (rev 994577) +++ PKGBUILD 2021-08-06 17:56:11 UTC (rev 994578) @@ -1,99 +0,0 @@ -# Maintainer: Daurnimator <daurnima...@archlinux.org> -# Maintainer: Jelle van der Waa <je...@archlinux.org> - -pkgname=('loki' 'loki-canary' 'promtail' 'logcli') -pkgver=2.2.1 -pkgrel=3 -pkgdesc='like Prometheus, but for logs' -url='https://github.com/grafana/loki' -arch=('x86_64') -license=('Apache') -depends=('glibc') -makedepends=('go' 'systemd') -source=($pkgname-$pkgver.tar.gz::https://github.com/grafana/loki/archive/v$pkgver.tar.gz - https://github.com/grafana/loki/commit/d6ecfd24313ecc9ad03e26875cb11394de7e988a.patch # Patch for Go 1.16; issue #3485 - promtail.sysusers promtail.service promtail.tmpfiles - loki.sysusers loki.service loki.tmpfiles) -sha512sums=('8777f66dda3893c52ad41244ca4c96950e2fe15c05b08e3f07f848b3672cbdda701958cf98781e9f6c848f4711df6f5d2fcbb5c31f7de2535faa367b3eceb1db' - '2b17d1146c07945d715da0bee8eb36490461e93c54931a6c1f0420a8b03e60b7fa6fd698f60f41951436bebc8fbc1ad4ffa58141081047b7da4b3479d8216dfc' - '2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74' - '7ff5c7324a4c883f5156b55cd025d2df8d8be134c18b1ecc007f89cafe20b4bed6c612b81588c9c660dd2fd3b6091fd952fcd3ad69a44e1ffa02e1eaeb05b290' - '598042c40673a7914c5a1eeccfb78f832379a61f4360212c5d86f667343cf2fc78e98d9025f9717ea64f3e16e0a28f08cd7709706d811656722019f6167dd788' - 'f00b3cb64b71d3ca5a422a2bdff1f81a3e2707c4f73bcb27e24338eabff039b96125c847aaae43c9b22ccc47f89585118c1d0e0b29c4eb7b6f9260c68f8a8324' - '03904b67617e4064a1eb39b6edfaec5d55bc85f142e867d115d3d0e12494a052fddf13bb6f5c541aaca29a18582df2332bb0cc6b8f29928cf6a0d5d2710ead74' - 'de40d1e6752edbf8c21317ce1ee10f98dfc869e569c07092c613f7144e261e9438683a145a2e0e37e2a9fc758c5c2f02e1d0ac1c60347e98b147e4a550ec6040') - -prepare() { - cd loki-$pkgver - - patch -p1 < "${srcdir}/d6ecfd24313ecc9ad03e26875cb11394de7e988a.patch" -} - -build() { - cd loki-$pkgver - - for cmd in loki loki-canary promtail logcli; do - go build \ - -trimpath \ - -buildmode=pie \ - -mod=readonly \ - -modcacherw \ - -ldflags " \ - -X github.com/grafana/loki/pkg/build.Version=$pkgver - -X github.com/grafana/loki/pkg/build.BuildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ' --date=@${SOURCE_DATE_EPOCH}) - -linkmode external - -extldflags \"${LDFLAGS}\"" \ - ./cmd/"$cmd" - done -} - -check() { - cd loki-$pkgver - - go test -v ./... -} - -package_loki() { - backup=('etc/loki/loki.yaml') - - cd loki-$pkgver - - install -Dm755 -t "$pkgdir"/usr/bin loki - - install -Dm644 cmd/loki/loki-local-config.yaml $pkgdir/etc/loki/loki.yaml - - install -Dm644 ${srcdir}/loki.sysusers "$pkgdir/usr/lib/sysusers.d/loki.conf" - install -Dm644 ${srcdir}/loki.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/loki.conf" - install -Dm644 ${srcdir}/loki.service "$pkgdir/usr/lib/systemd/system/loki.service" -} - -package_loki-canary() { - pkgdesc="A standalone app that audits the log capturing performance of Loki" - - cd loki-$pkgver - - install -Dm755 -t "$pkgdir"/usr/bin loki-canary -} - -package_promtail() { - pkgdesc="An agent which ships the contents of local logs to a private Loki instance or Grafana Cloud" - backup=('etc/loki/promtail.yaml') - - cd loki-$pkgver - - install -Dm755 -t "$pkgdir"/usr/bin promtail - - install -Dm644 cmd/promtail/promtail-local-config.yaml $pkgdir/etc/loki/promtail.yaml - - install -Dm644 ${srcdir}/promtail.sysusers "$pkgdir/usr/lib/sysusers.d/promtail.conf" - install -Dm644 ${srcdir}/promtail.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/promtail.conf" - install -Dm644 ${srcdir}/promtail.service "$pkgdir/usr/lib/systemd/system/promtail.service" -} - -package_logcli() { - pkgdesc="A command-line for loki" - - cd loki-$pkgver - - install -Dm755 -t "$pkgdir"/usr/bin logcli -} Copied: loki/repos/community-x86_64/PKGBUILD (from rev 994577, loki/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-08-06 17:56:11 UTC (rev 994578) @@ -0,0 +1,92 @@ +# Maintainer: Daurnimator <daurnima...@archlinux.org> +# Maintainer: Jelle van der Waa <je...@archlinux.org> + +pkgname=('loki' 'loki-canary' 'promtail' 'logcli') +pkgver=2.3.0 +pkgrel=1 +pkgdesc='like Prometheus, but for logs' +url='https://github.com/grafana/loki' +arch=('x86_64') +license=('AGPL3' 'Apache') +depends=('glibc') +makedepends=('go' 'systemd') +source=($pkgname-$pkgver.tar.gz::https://github.com/grafana/loki/archive/v$pkgver.tar.gz + promtail.sysusers promtail.service promtail.tmpfiles + loki.sysusers loki.service loki.tmpfiles) +sha512sums=('7f2855d8df69c551e182d0e27e2a6fb6960fa5bc525dcc90cb2dc2428f52aeb5e2bddd0a9232e1ab70cbe60a9d5bb3349ba749dbee82fc63c6fc43e61240feed' + '2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74' + '7ff5c7324a4c883f5156b55cd025d2df8d8be134c18b1ecc007f89cafe20b4bed6c612b81588c9c660dd2fd3b6091fd952fcd3ad69a44e1ffa02e1eaeb05b290' + '598042c40673a7914c5a1eeccfb78f832379a61f4360212c5d86f667343cf2fc78e98d9025f9717ea64f3e16e0a28f08cd7709706d811656722019f6167dd788' + 'f00b3cb64b71d3ca5a422a2bdff1f81a3e2707c4f73bcb27e24338eabff039b96125c847aaae43c9b22ccc47f89585118c1d0e0b29c4eb7b6f9260c68f8a8324' + '03904b67617e4064a1eb39b6edfaec5d55bc85f142e867d115d3d0e12494a052fddf13bb6f5c541aaca29a18582df2332bb0cc6b8f29928cf6a0d5d2710ead74' + 'de40d1e6752edbf8c21317ce1ee10f98dfc869e569c07092c613f7144e261e9438683a145a2e0e37e2a9fc758c5c2f02e1d0ac1c60347e98b147e4a550ec6040') + +build() { + cd loki-$pkgver + + for path in cmd/loki cmd/loki-canary cmd/logcli clients/cmd/promtail; do + go build \ + -trimpath \ + -buildmode=pie \ + -mod=readonly \ + -modcacherw \ + -ldflags " \ + -X github.com/grafana/loki/pkg/build.Version=$pkgver + -X github.com/grafana/loki/pkg/build.BuildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ' --date=@${SOURCE_DATE_EPOCH}) + -linkmode external + -extldflags \"${LDFLAGS}\"" \ + ./"$path" + done +} + +check() { + cd loki-$pkgver + + # https://github.com/grafana/loki/issues/4110 + go test -v $(go list ./... | grep -v /pkg/storage/stores/shipper/compactor/retention) +} + +package_loki() { + backup=('etc/loki/loki.yaml') + + cd loki-$pkgver + + install -Dm755 -t "$pkgdir"/usr/bin loki + + install -Dm644 cmd/loki/loki-local-config.yaml $pkgdir/etc/loki/loki.yaml + + install -Dm644 ${srcdir}/loki.sysusers "$pkgdir/usr/lib/sysusers.d/loki.conf" + install -Dm644 ${srcdir}/loki.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/loki.conf" + install -Dm644 ${srcdir}/loki.service "$pkgdir/usr/lib/systemd/system/loki.service" +} + +package_loki-canary() { + pkgdesc="A standalone app that audits the log capturing performance of Loki" + + cd loki-$pkgver + + install -Dm755 -t "$pkgdir"/usr/bin loki-canary +} + +package_promtail() { + pkgdesc="An agent which ships the contents of local logs to a private Loki instance or Grafana Cloud" + backup=('etc/loki/promtail.yaml') + + cd loki-$pkgver + + install -Dm755 -t "$pkgdir"/usr/bin promtail + + install -Dm644 clients/cmd/promtail/promtail-local-config.yaml $pkgdir/etc/loki/promtail.yaml + + install -Dm644 ${srcdir}/promtail.sysusers "$pkgdir/usr/lib/sysusers.d/promtail.conf" + install -Dm644 ${srcdir}/promtail.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/promtail.conf" + install -Dm644 ${srcdir}/promtail.service "$pkgdir/usr/lib/systemd/system/promtail.service" +} + +package_logcli() { + pkgdesc="A command-line for loki" + + cd loki-$pkgver + + install -Dm755 -t "$pkgdir"/usr/bin logcli +} Deleted: loki.service =================================================================== --- loki.service 2021-08-06 17:55:36 UTC (rev 994577) +++ loki.service 2021-08-06 17:56:11 UTC (rev 994578) @@ -1,29 +0,0 @@ -[Unit] -Description=Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system -Documentation=https://grafana.com/docs/loki/latest/ -After=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/loki -boltdb.dir /var/lib/loki/index -local.chunk-directory /var/lib/loki/chunks -config.file /etc/loki/loki.yaml -TimeoutStopSec=30s -User=loki -Restart=on-failure - -NoNewPrivileges=true -MemoryDenyWriteExecute=true -RestrictRealtime=true - -ProtectHome=true -ProtectSystem=strict -ReadWritePaths=/var/lib/loki -PrivateTmp=true - -PrivateDevices=true -ProtectKernelTunables=true -ProtectKernelModules=true -ProtectKernelLogs=true -ProtectControlGroups=true - -[Install] -WantedBy=multi-user.target Copied: loki/repos/community-x86_64/loki.service (from rev 994577, loki/trunk/loki.service) =================================================================== --- loki.service (rev 0) +++ loki.service 2021-08-06 17:56:11 UTC (rev 994578) @@ -0,0 +1,29 @@ +[Unit] +Description=Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system +Documentation=https://grafana.com/docs/loki/latest/ +After=network.target + +[Service] +Type=simple +ExecStart=/usr/bin/loki -boltdb.dir /var/lib/loki/index -local.chunk-directory /var/lib/loki/chunks -config.file /etc/loki/loki.yaml +TimeoutStopSec=30s +User=loki +Restart=on-failure + +NoNewPrivileges=true +MemoryDenyWriteExecute=true +RestrictRealtime=true + +ProtectHome=true +ProtectSystem=strict +ReadWritePaths=/var/lib/loki +PrivateTmp=true + +PrivateDevices=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true + +[Install] +WantedBy=multi-user.target Deleted: loki.sysusers =================================================================== --- loki.sysusers 2021-08-06 17:55:36 UTC (rev 994577) +++ loki.sysusers 2021-08-06 17:56:11 UTC (rev 994578) @@ -1 +0,0 @@ -u loki - "loki user" /var/lib/loki Copied: loki/repos/community-x86_64/loki.sysusers (from rev 994577, loki/trunk/loki.sysusers) =================================================================== --- loki.sysusers (rev 0) +++ loki.sysusers 2021-08-06 17:56:11 UTC (rev 994578) @@ -0,0 +1 @@ +u loki - "loki user" /var/lib/loki Deleted: loki.tmpfiles =================================================================== --- loki.tmpfiles 2021-08-06 17:55:36 UTC (rev 994577) +++ loki.tmpfiles 2021-08-06 17:56:11 UTC (rev 994578) @@ -1 +0,0 @@ -d /var/lib/loki 0750 loki loki - Copied: loki/repos/community-x86_64/loki.tmpfiles (from rev 994577, loki/trunk/loki.tmpfiles) =================================================================== --- loki.tmpfiles (rev 0) +++ loki.tmpfiles 2021-08-06 17:56:11 UTC (rev 994578) @@ -0,0 +1 @@ +d /var/lib/loki 0750 loki loki - Deleted: promtail.service =================================================================== --- promtail.service 2021-08-06 17:55:36 UTC (rev 994577) +++ promtail.service 2021-08-06 17:56:11 UTC (rev 994578) @@ -1,28 +0,0 @@ -[Unit] -Description=promtail is the agent responsible for gathering logs and sending them to Loki. -Documentation=https://grafana.com/docs/loki/latest/clients/promtail/ -Requires=network-online.target -After=network-online.target - -[Service] -Type=simple -ExecStart=/usr/bin/promtail -positions.file /var/lib/promtail/positions.yml -config.file /etc/loki/promtail.yaml -User=promtail -TimeoutStopSec=30s - -NoNewPrivileges=true -MemoryDenyWriteExecute=true -RestrictRealtime=true - -ProtectHome=true -ProtectSystem=strict -ReadWritePaths=/var/lib/promtail -PrivateTmp=true - -PrivateDevices=true -ProtectKernelTunables=true -ProtectKernelModules=true -ProtectControlGroups=true - -[Install] -WantedBy=multi-user.target Copied: loki/repos/community-x86_64/promtail.service (from rev 994577, loki/trunk/promtail.service) =================================================================== --- promtail.service (rev 0) +++ promtail.service 2021-08-06 17:56:11 UTC (rev 994578) @@ -0,0 +1,28 @@ +[Unit] +Description=promtail is the agent responsible for gathering logs and sending them to Loki. +Documentation=https://grafana.com/docs/loki/latest/clients/promtail/ +Requires=network-online.target +After=network-online.target + +[Service] +Type=simple +ExecStart=/usr/bin/promtail -positions.file /var/lib/promtail/positions.yml -config.file /etc/loki/promtail.yaml +User=promtail +TimeoutStopSec=30s + +NoNewPrivileges=true +MemoryDenyWriteExecute=true +RestrictRealtime=true + +ProtectHome=true +ProtectSystem=strict +ReadWritePaths=/var/lib/promtail +PrivateTmp=true + +PrivateDevices=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectControlGroups=true + +[Install] +WantedBy=multi-user.target Deleted: promtail.sysusers =================================================================== --- promtail.sysusers 2021-08-06 17:55:36 UTC (rev 994577) +++ promtail.sysusers 2021-08-06 17:56:11 UTC (rev 994578) @@ -1,2 +0,0 @@ -u promtail - "promtail user" /var/lib/promtail -m promtail systemd-journal Copied: loki/repos/community-x86_64/promtail.sysusers (from rev 994577, loki/trunk/promtail.sysusers) =================================================================== --- promtail.sysusers (rev 0) +++ promtail.sysusers 2021-08-06 17:56:11 UTC (rev 994578) @@ -0,0 +1,2 @@ +u promtail - "promtail user" /var/lib/promtail +m promtail systemd-journal Deleted: promtail.tmpfiles =================================================================== --- promtail.tmpfiles 2021-08-06 17:55:36 UTC (rev 994577) +++ promtail.tmpfiles 2021-08-06 17:56:11 UTC (rev 994578) @@ -1 +0,0 @@ -d /var/lib/promtail 0750 promtail promtail - Copied: loki/repos/community-x86_64/promtail.tmpfiles (from rev 994577, loki/trunk/promtail.tmpfiles) =================================================================== --- promtail.tmpfiles (rev 0) +++ promtail.tmpfiles 2021-08-06 17:56:11 UTC (rev 994578) @@ -0,0 +1 @@ +d /var/lib/promtail 0750 promtail promtail -