[arch-commits] Commit in loki/repos/community-x86_64 (14 files)
Daurnimator
daurnimator at gemini.archlinux.org
Mon Jul 11 06:10:52 UTC 2022
Date: Monday, July 11, 2022 @ 06:10:52
Author: daurnimator
Revision: 1249487
archrelease: copy trunk to community-x86_64
Added:
loki/repos/community-x86_64/PKGBUILD
(from rev 1249486, loki/trunk/PKGBUILD)
loki/repos/community-x86_64/loki.service
(from rev 1249486, loki/trunk/loki.service)
loki/repos/community-x86_64/loki.sysusers
(from rev 1249486, loki/trunk/loki.sysusers)
loki/repos/community-x86_64/loki.tmpfiles
(from rev 1249486, loki/trunk/loki.tmpfiles)
loki/repos/community-x86_64/promtail.service
(from rev 1249486, loki/trunk/promtail.service)
loki/repos/community-x86_64/promtail.sysusers
(from rev 1249486, loki/trunk/promtail.sysusers)
loki/repos/community-x86_64/promtail.tmpfiles
(from rev 1249486, 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 | 219 ++++++++++++++++++++++++----------------------------
loki.service | 58 ++++++-------
loki.sysusers | 2
loki.tmpfiles | 2
promtail.service | 58 ++++++-------
promtail.sysusers | 4
promtail.tmpfiles | 2
7 files changed, 166 insertions(+), 179 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-11 06:09:58 UTC (rev 1249486)
+++ PKGBUILD 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -1,116 +0,0 @@
-# Maintainer: Daurnimator <daurnimator at archlinux.org>
-# Maintainer: Jelle van der Waa <jelle at archlinux.org>
-
-pkgname=('loki' 'loki-canary' 'promtail' 'logcli')
-pkgver=2.5.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')
-options=('!lto')
-source=($pkgname-$pkgver.tar.gz::https://github.com/grafana/loki/archive/v$pkgver.tar.gz
- $pkgname-go1.18.patch::https://github.com/grafana/loki/commit/d0160cb09c1e.patch
- $pkgname-gcs-use-fake-creds-in-tests.patch::https://github.com/grafana/loki/commit/c0cc004333b1.patch
- $pkgname-use-fake-creds-in-storage-tests.patch::https://github.com/grafana/loki/commit/a877febf75be.patch
- promtail.sysusers promtail.service promtail.tmpfiles
- loki.sysusers loki.service loki.tmpfiles)
-sha512sums=('1a37cc3f5685d822e4ddc9d733505905ee4ef8f664e78954a69d34b5cab90b2dd82133bd309da2d98e7235ead1d952815f76dbd6ec655ebd26027506238fa7a3'
- '5f06db86127d5601b37bea65decd469b6d1b126bddfcaf1dd85b0c074b6c1ed30e0d96d2b331399154bb2e7a72ed0edb3d9ea1bc62e8986d40148ba4caa2dacf'
- '20fe843571e5e5ad45c18f5fa96210a10665acd494ec41c157372d90843056e4b29da55b2d02e7d58d10b19d9f6c9fdcf03ab699b8c9b494a8ab44a328e172e3'
- '82977ab8f6867ccf2f033a9bca9a3d5135dbe6478c5970f2b9a1d593054e67cdf7fb9a92af584f1d16677376b6099302c61e91774aee0dce42314853a3807d54'
- '2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74'
- '18011b135c7817f2542f7a93b607ee46e5d61625921c7dc6e46e1b29e31c67147653b215d8677fde21cdce3b577c479cebd2d85f47e4b8cbe4c30f8be5f910cd'
- '598042c40673a7914c5a1eeccfb78f832379a61f4360212c5d86f667343cf2fc78e98d9025f9717ea64f3e16e0a28f08cd7709706d811656722019f6167dd788'
- 'f00b3cb64b71d3ca5a422a2bdff1f81a3e2707c4f73bcb27e24338eabff039b96125c847aaae43c9b22ccc47f89585118c1d0e0b29c4eb7b6f9260c68f8a8324'
- '03904b67617e4064a1eb39b6edfaec5d55bc85f142e867d115d3d0e12494a052fddf13bb6f5c541aaca29a18582df2332bb0cc6b8f29928cf6a0d5d2710ead74'
- 'de40d1e6752edbf8c21317ce1ee10f98dfc869e569c07092c613f7144e261e9438683a145a2e0e37e2a9fc758c5c2f02e1d0ac1c60347e98b147e4a550ec6040')
-
-prepare() {
- cd "$pkgname-$pkgver"
- patch -Np1 -i ../$pkgname-go1.18.patch
-
- # https://github.com/grafana/loki/issues/5832
- patch -Np1 -i ../$pkgname-gcs-use-fake-creds-in-tests.patch
-
- # https://github.com/grafana/loki/issues/6185
- patch pkg/storage/chunk/gcp/fixtures.go <../$pkgname-use-fake-creds-in-storage-tests.patch
-
- go mod download
-}
-
-build() {
- cd loki-$pkgver
-
- export CGO_LDFLAGS="${LDFLAGS}"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export GOPROXY=off
- 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/util/build.Version=$pkgver
- -X github.com/grafana/loki/pkg/util/build.BuildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ' --date=@${SOURCE_DATE_EPOCH})
- -linkmode external
- -extldflags \"${LDFLAGS}\"" \
- ./"$path"
- done
-}
-
-check() {
- cd loki-$pkgver
-
- go test ./...
-}
-
-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
-}
Copied: loki/repos/community-x86_64/PKGBUILD (from rev 1249486, loki/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -0,0 +1,103 @@
+# Maintainer: Daurnimator <daurnimator at archlinux.org>
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+
+pkgname=('loki' 'loki-canary' 'promtail' 'logcli')
+pkgver=2.6.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')
+options=('!lto')
+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=('d727ebbe2be30b9446c5369ccecfddfb05641a6f4d8231f41c2aad48979b9db1b97bda338d0e922e34d440d4e343de83be5c3250ad35de5c3d5fcbdb9a77e6f4'
+ '2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74'
+ '18011b135c7817f2542f7a93b607ee46e5d61625921c7dc6e46e1b29e31c67147653b215d8677fde21cdce3b577c479cebd2d85f47e4b8cbe4c30f8be5f910cd'
+ '598042c40673a7914c5a1eeccfb78f832379a61f4360212c5d86f667343cf2fc78e98d9025f9717ea64f3e16e0a28f08cd7709706d811656722019f6167dd788'
+ 'f00b3cb64b71d3ca5a422a2bdff1f81a3e2707c4f73bcb27e24338eabff039b96125c847aaae43c9b22ccc47f89585118c1d0e0b29c4eb7b6f9260c68f8a8324'
+ '03904b67617e4064a1eb39b6edfaec5d55bc85f142e867d115d3d0e12494a052fddf13bb6f5c541aaca29a18582df2332bb0cc6b8f29928cf6a0d5d2710ead74'
+ 'de40d1e6752edbf8c21317ce1ee10f98dfc869e569c07092c613f7144e261e9438683a145a2e0e37e2a9fc758c5c2f02e1d0ac1c60347e98b147e4a550ec6040')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ go mod download
+}
+
+build() {
+ cd loki-$pkgver
+
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export GOPROXY=off
+ 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/util/build.Version=$pkgver
+ -X github.com/grafana/loki/pkg/util/build.BuildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ' --date=@${SOURCE_DATE_EPOCH})
+ -linkmode external
+ -extldflags \"${LDFLAGS}\"" \
+ ./"$path"
+ done
+}
+
+check() {
+ cd loki-$pkgver
+
+ go test ./...
+}
+
+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 2022-07-11 06:09:58 UTC (rev 1249486)
+++ loki.service 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -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 1249486, loki/trunk/loki.service)
===================================================================
--- loki.service (rev 0)
+++ loki.service 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -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 2022-07-11 06:09:58 UTC (rev 1249486)
+++ loki.sysusers 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -1 +0,0 @@
-u loki - "loki user" /var/lib/loki
Copied: loki/repos/community-x86_64/loki.sysusers (from rev 1249486, loki/trunk/loki.sysusers)
===================================================================
--- loki.sysusers (rev 0)
+++ loki.sysusers 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -0,0 +1 @@
+u loki - "loki user" /var/lib/loki
Deleted: loki.tmpfiles
===================================================================
--- loki.tmpfiles 2022-07-11 06:09:58 UTC (rev 1249486)
+++ loki.tmpfiles 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -1 +0,0 @@
-d /var/lib/loki 0750 loki loki -
Copied: loki/repos/community-x86_64/loki.tmpfiles (from rev 1249486, loki/trunk/loki.tmpfiles)
===================================================================
--- loki.tmpfiles (rev 0)
+++ loki.tmpfiles 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -0,0 +1 @@
+d /var/lib/loki 0750 loki loki -
Deleted: promtail.service
===================================================================
--- promtail.service 2022-07-11 06:09:58 UTC (rev 1249486)
+++ promtail.service 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -1,29 +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
-LimitNOFILE=65536
-
-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 1249486, loki/trunk/promtail.service)
===================================================================
--- promtail.service (rev 0)
+++ promtail.service 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -0,0 +1,29 @@
+[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
+LimitNOFILE=65536
+
+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 2022-07-11 06:09:58 UTC (rev 1249486)
+++ promtail.sysusers 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -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 1249486, loki/trunk/promtail.sysusers)
===================================================================
--- promtail.sysusers (rev 0)
+++ promtail.sysusers 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -0,0 +1,2 @@
+u promtail - "promtail user" /var/lib/promtail
+m promtail systemd-journal
Deleted: promtail.tmpfiles
===================================================================
--- promtail.tmpfiles 2022-07-11 06:09:58 UTC (rev 1249486)
+++ promtail.tmpfiles 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -1 +0,0 @@
-d /var/lib/promtail 0750 promtail promtail -
Copied: loki/repos/community-x86_64/promtail.tmpfiles (from rev 1249486, loki/trunk/promtail.tmpfiles)
===================================================================
--- promtail.tmpfiles (rev 0)
+++ promtail.tmpfiles 2022-07-11 06:10:52 UTC (rev 1249487)
@@ -0,0 +1 @@
+d /var/lib/promtail 0750 promtail promtail -
More information about the arch-commits
mailing list