Date: Monday, April 3, 2023 @ 19:31:12
Author: jelle
Revision: 1434416
archrelease: copy trunk to community-x86_64
Added:
loki/repos/community-x86_64/PKGBUILD
(from rev 1434415, loki/trunk/PKGBUILD)
loki/repos/community-x86_64/go-1.19.patch
(from rev 1434415, loki/trunk/go-1.19.patch)
loki/repos/community-x86_64/loki.service
(from rev 1434415, loki/trunk/loki.service)
loki/repos/community-x86_64/loki.sysusers
(from rev 1434415, loki/trunk/loki.sysusers)
loki/repos/community-x86_64/loki.tmpfiles
(from rev 1434415, loki/trunk/loki.tmpfiles)
loki/repos/community-x86_64/no-moving-gc-bump.patch
(from rev 1434415, loki/trunk/no-moving-gc-bump.patch)
loki/repos/community-x86_64/promtail.service
(from rev 1434415, loki/trunk/promtail.service)
loki/repos/community-x86_64/promtail.sysusers
(from rev 1434415, loki/trunk/promtail.sysusers)
loki/repos/community-x86_64/promtail.tmpfiles
(from rev 1434415, loki/trunk/promtail.tmpfiles)
Deleted:
loki/repos/community-x86_64/PKGBUILD
loki/repos/community-x86_64/go-1.19.patch
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/no-moving-gc-bump.patch
loki/repos/community-x86_64/promtail.service
loki/repos/community-x86_64/promtail.sysusers
loki/repos/community-x86_64/promtail.tmpfiles
-------------------------+
PKGBUILD | 206 ++++++++++++++++++-------------------
go-1.19.patch | 130 +++++++++++------------
loki.service | 58 +++++-----
loki.sysusers | 2
loki.tmpfiles | 2
no-moving-gc-bump.patch | 252 +++++++++++++++++++++++-----------------------
promtail.service | 58 +++++-----
promtail.sysusers | 4
promtail.tmpfiles | 2
9 files changed, 357 insertions(+), 357 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-03 19:30:55 UTC (rev 1434415)
+++ PKGBUILD 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -1,103 +0,0 @@
-# Maintainer: Daurnimator <[email protected]>
-# Maintainer: Jelle van der Waa <[email protected]>
-
-pkgname=('loki' 'loki-canary' 'promtail' 'logcli')
-pkgver=2.7.4
-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=('3a7c9829b45dc4ad630fe44e11b8bc11b40be18188dfaaf871363f7da498a1f124e89087980207c5584304441c6ca523b1e8f6328309f81fa76c41ec53910bb1'
-
'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
-}
Copied: loki/repos/community-x86_64/PKGBUILD (from rev 1434415,
loki/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -0,0 +1,103 @@
+# Maintainer: Daurnimator <[email protected]>
+# Maintainer: Jelle van der Waa <[email protected]>
+
+pkgname=('loki' 'loki-canary' 'promtail' 'logcli')
+pkgver=2.7.5
+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=('3017b7730433b1573e7eb83b9c1e7645314da64df9ab59898b9d07e26865b6793294610bc1b3d8f00839d53c2e902a0438b8208151b64b7135e565181dcfc27d'
+
'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: go-1.19.patch
===================================================================
--- go-1.19.patch 2023-04-03 19:30:55 UTC (rev 1434415)
+++ go-1.19.patch 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -1,65 +0,0 @@
-diff --git a/go.mod b/go.mod
-index f6b5af8bb..667ed4517 100644
---- a/go.mod
-+++ b/go.mod
-@@ -327,3 +327,5 @@ exclude k8s.io/client-go v8.0.0+incompatible
- // Replace memberlist with our fork which includes some fixes that haven't
been
- // merged upstream yet.
- replace github.com/hashicorp/memberlist => github.com/grafana/memberlist
v0.3.1-0.20220708130638-bd88e10a3d91
-+
-+replace go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37
=> go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
-diff --git a/go.sum b/go.sum
-index bf4a83f17..f3db4362c 100644
---- a/go.sum
-+++ b/go.sum
-@@ -2028,8 +2028,8 @@ go.uber.org/zap v1.19.1
h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI=
- go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
- go4.org/intern v0.0.0-20211027215823-ae77deb06f29
h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE=
- go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod
h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA=
--go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37
h1:Tx9kY6yUkLge/pFG7IEMwDZy6CS2ajFc9TvQdPCW0uA=
--go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod
h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
-+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4=
-+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod
h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
- golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
- golang.org/x/crypto v0.0.0-20180505025534-4ec37c66abab/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
- golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-@@ -2345,11 +2345,9 @@ golang.org/x/sys
v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w
- golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
--golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
--golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-diff --git a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
-index 01377f77e..da4d943f6 100644
---- a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
-+++ b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
-@@ -2,8 +2,8 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
-
--//go:build go1.19
--// +build go1.19
-+//go:build go1.20
-+// +build go1.20
-
- package assume_no_moving_gc
-
-diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 7bef3766d..2cdfa9baa 100644
---- a/vendor/modules.txt
-+++ b/vendor/modules.txt
-@@ -1178,7 +1178,7 @@ go.uber.org/zap/zapgrpc
- # go4.org/intern v0.0.0-20211027215823-ae77deb06f29
- ## explicit; go 1.13
- go4.org/intern
--# go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37
-+# go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 =>
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
- ## explicit; go 1.11
- go4.org/unsafe/assume-no-moving-gc
- # golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
Copied: loki/repos/community-x86_64/go-1.19.patch (from rev 1434415,
loki/trunk/go-1.19.patch)
===================================================================
--- go-1.19.patch (rev 0)
+++ go-1.19.patch 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -0,0 +1,65 @@
+diff --git a/go.mod b/go.mod
+index f6b5af8bb..667ed4517 100644
+--- a/go.mod
++++ b/go.mod
+@@ -327,3 +327,5 @@ exclude k8s.io/client-go v8.0.0+incompatible
+ // Replace memberlist with our fork which includes some fixes that haven't
been
+ // merged upstream yet.
+ replace github.com/hashicorp/memberlist => github.com/grafana/memberlist
v0.3.1-0.20220708130638-bd88e10a3d91
++
++replace go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37
=> go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
+diff --git a/go.sum b/go.sum
+index bf4a83f17..f3db4362c 100644
+--- a/go.sum
++++ b/go.sum
+@@ -2028,8 +2028,8 @@ go.uber.org/zap v1.19.1
h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI=
+ go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
+ go4.org/intern v0.0.0-20211027215823-ae77deb06f29
h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE=
+ go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod
h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA=
+-go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37
h1:Tx9kY6yUkLge/pFG7IEMwDZy6CS2ajFc9TvQdPCW0uA=
+-go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod
h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
++go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4=
++go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod
h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+ golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20180505025534-4ec37c66abab/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+@@ -2345,11 +2345,9 @@ golang.org/x/sys
v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w
+ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+-golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+diff --git a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
+index 01377f77e..da4d943f6 100644
+--- a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
++++ b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
+@@ -2,8 +2,8 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+
+-//go:build go1.19
+-// +build go1.19
++//go:build go1.20
++// +build go1.20
+
+ package assume_no_moving_gc
+
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+index 7bef3766d..2cdfa9baa 100644
+--- a/vendor/modules.txt
++++ b/vendor/modules.txt
+@@ -1178,7 +1178,7 @@ go.uber.org/zap/zapgrpc
+ # go4.org/intern v0.0.0-20211027215823-ae77deb06f29
+ ## explicit; go 1.13
+ go4.org/intern
+-# go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37
++# go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 =>
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
+ ## explicit; go 1.11
+ go4.org/unsafe/assume-no-moving-gc
+ # golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
Deleted: loki.service
===================================================================
--- loki.service 2023-04-03 19:30:55 UTC (rev 1434415)
+++ loki.service 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -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 1434415,
loki/trunk/loki.service)
===================================================================
--- loki.service (rev 0)
+++ loki.service 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -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 2023-04-03 19:30:55 UTC (rev 1434415)
+++ loki.sysusers 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -1 +0,0 @@
-u loki - "loki user" /var/lib/loki
Copied: loki/repos/community-x86_64/loki.sysusers (from rev 1434415,
loki/trunk/loki.sysusers)
===================================================================
--- loki.sysusers (rev 0)
+++ loki.sysusers 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -0,0 +1 @@
+u loki - "loki user" /var/lib/loki
Deleted: loki.tmpfiles
===================================================================
--- loki.tmpfiles 2023-04-03 19:30:55 UTC (rev 1434415)
+++ loki.tmpfiles 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -1 +0,0 @@
-d /var/lib/loki 0750 loki loki -
Copied: loki/repos/community-x86_64/loki.tmpfiles (from rev 1434415,
loki/trunk/loki.tmpfiles)
===================================================================
--- loki.tmpfiles (rev 0)
+++ loki.tmpfiles 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -0,0 +1 @@
+d /var/lib/loki 0750 loki loki -
Deleted: no-moving-gc-bump.patch
===================================================================
--- no-moving-gc-bump.patch 2023-04-03 19:30:55 UTC (rev 1434415)
+++ no-moving-gc-bump.patch 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -1,126 +0,0 @@
-From 5389c59a613327b7789938f543bfb00906c62f0b Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <[email protected]>
-Date: Fri, 10 Feb 2023 11:21:33 +0100
-Subject: [PATCH] chore: update assume-no-moving-gc to fix go 1.20
-
-assume-no-moving-gc makes the program exit if the current go version was
-not explicitly specified in it as safe. This version adds go 1.20 to
-the list of safe versions which fixes running loki when built with go
-1.20.
----
- go.mod | 2 +-
- go.sum | 4 ++--
- operator/go.mod | 2 +-
- .../assume-no-moving-gc/assume-no-moving-gc.go | 14 +++++++++++++-
- .../go4.org/unsafe/assume-no-moving-gc/untested.go | 6 +++---
- vendor/modules.txt | 2 +-
- 6 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/go.mod b/go.mod
-index 01284a1579..ab61dc8a09 100644
---- a/go.mod
-+++ b/go.mod
-@@ -282,7 +282,7 @@ require (
- go.uber.org/multierr v1.8.0 // indirect
- go.uber.org/zap v1.21.0 // indirect
- go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
-- go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
// indirect
-+ go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760
// indirect
- golang.org/x/mod v0.7.0 // indirect
- golang.org/x/term v0.4.0 // indirect
- golang.org/x/tools v0.4.0 // indirect
-diff --git a/go.sum b/go.sum
-index c5d17bca86..6827031a62 100644
---- a/go.sum
-+++ b/go.sum
-@@ -1500,8 +1500,8 @@ go.uber.org/zap v1.21.0/go.mod
h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
- go4.org/intern v0.0.0-20211027215823-ae77deb06f29
h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE=
- go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod
h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA=
- go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod
h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
--go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4=
--go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod
h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
-+go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760
h1:gH0IO5GDYAcawu+ThKrvAofVTgJjYaoOZ5rrC4pS2Xw=
-+go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760/go.mod
h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
- golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
- golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
- golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod
h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-diff --git a/operator/go.mod b/operator/go.mod
-index 329d64bcea..5e5d4e0699 100644
---- a/operator/go.mod
-+++ b/operator/go.mod
-@@ -146,7 +146,7 @@ require (
- go.uber.org/multierr v1.7.0 // indirect
- go.uber.org/zap v1.21.0 // indirect
- go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
-- go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
// indirect
-+ go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760
// indirect
- golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
- golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
- golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
-diff --git a/vendor/go4.org/unsafe/assume-no-moving-gc/assume-no-moving-gc.go
b/vendor/go4.org/unsafe/assume-no-moving-gc/assume-no-moving-gc.go
-index 14a41e73ed..fb585807a3 100644
---- a/vendor/go4.org/unsafe/assume-no-moving-gc/assume-no-moving-gc.go
-+++ b/vendor/go4.org/unsafe/assume-no-moving-gc/assume-no-moving-gc.go
-@@ -4,7 +4,11 @@
-
- // Package go4.org/unsafe/assume-no-moving-gc exists so you can depend
- // on it from unsafe code that wants to declare that it assumes that
--// the Go runtime does not using a moving garbage colllector.
-+// the Go runtime does not using a moving garbage colllector. Specifically,
-+// it asserts that the caller is playing stupid games with the addresses
-+// of heap-allocated values. It says nothing about values that Go's escape
-+// analysis keeps on the stack. Ensuring things aren't stack-allocated
-+// is the caller's responsibility.
- //
- // This package is then updated for new Go versions when that
- // is still the case and explodes at runtime with a failure
-@@ -16,6 +20,14 @@
- //
- // There is no API.
- //
-+// It is intentional that this package will break code that's not updated
-+// regularly to double check its assumptions about the world and new Go
-+// versions. If you play stupid games with unsafe pointers, the stupid prize
-+// is this maintenance cost. (The alternative would be memory corruption if
-+// some unmaintained, unsafe library were built with a future version of Go
-+// that worked very differently than when the unsafe library was built.)
-+// Ideally you shouldn't write unsafe code, though.
-+//
- // The GitHub repo is at https://github.com/go4org/unsafe-assume-no-moving-gc
- package assume_no_moving_gc
-
-diff --git a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
-index da4d943f6b..dbb169045a 100644
---- a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
-+++ b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
-@@ -2,8 +2,8 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
-
--//go:build go1.20
--// +build go1.20
-+//go:build go1.21
-+// +build go1.21
-
- package assume_no_moving_gc
-
-@@ -22,5 +22,5 @@ func init() {
- if os.Getenv(env) == v {
- return
- }
-- panic("Something in this program imports
go4.org/unsafe/assume-no-moving-gc to declare that it assumes a non-moving
garbage collector, but your version of go4.org/unsafe/assume-no-moving-gc
hasn't been updated to assert that it's safe against the " + v + " runtime. If
you want to risk it, run with environment variable " + env + "=" + v + " set.
Notably, if " + v + " adds a moving garbage collector, this program is unsafe
to use.")
-+ panic("Something in this program imports
go4.org/unsafe/assume-no-moving-gc to declare that it assumes a non-moving
garbage collector, but your version of go4.org/unsafe/assume-no-moving-gc
hasn't been updated to assert that it's safe against the " + v + " runtime. If
you want to risk it, run with environment variable " + env + "=\"" + v + "\"
set. Notably, if " + v + " adds a moving garbage collector, this program is
unsafe to use.")
- }
-diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 55c617f93e..a40b75c42e 100644
---- a/vendor/modules.txt
-+++ b/vendor/modules.txt
-@@ -1346,7 +1346,7 @@ go.uber.org/zap/zapgrpc
- # go4.org/intern v0.0.0-20211027215823-ae77deb06f29
- ## explicit; go 1.13
- go4.org/intern
--# go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
-+# go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760
- ## explicit; go 1.11
- go4.org/unsafe/assume-no-moving-gc
- # golang.org/x/crypto v0.5.0
Copied: loki/repos/community-x86_64/no-moving-gc-bump.patch (from rev 1434415,
loki/trunk/no-moving-gc-bump.patch)
===================================================================
--- no-moving-gc-bump.patch (rev 0)
+++ no-moving-gc-bump.patch 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -0,0 +1,126 @@
+From 5389c59a613327b7789938f543bfb00906c62f0b Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <[email protected]>
+Date: Fri, 10 Feb 2023 11:21:33 +0100
+Subject: [PATCH] chore: update assume-no-moving-gc to fix go 1.20
+
+assume-no-moving-gc makes the program exit if the current go version was
+not explicitly specified in it as safe. This version adds go 1.20 to
+the list of safe versions which fixes running loki when built with go
+1.20.
+---
+ go.mod | 2 +-
+ go.sum | 4 ++--
+ operator/go.mod | 2 +-
+ .../assume-no-moving-gc/assume-no-moving-gc.go | 14 +++++++++++++-
+ .../go4.org/unsafe/assume-no-moving-gc/untested.go | 6 +++---
+ vendor/modules.txt | 2 +-
+ 6 files changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/go.mod b/go.mod
+index 01284a1579..ab61dc8a09 100644
+--- a/go.mod
++++ b/go.mod
+@@ -282,7 +282,7 @@ require (
+ go.uber.org/multierr v1.8.0 // indirect
+ go.uber.org/zap v1.21.0 // indirect
+ go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
+- go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
// indirect
++ go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760
// indirect
+ golang.org/x/mod v0.7.0 // indirect
+ golang.org/x/term v0.4.0 // indirect
+ golang.org/x/tools v0.4.0 // indirect
+diff --git a/go.sum b/go.sum
+index c5d17bca86..6827031a62 100644
+--- a/go.sum
++++ b/go.sum
+@@ -1500,8 +1500,8 @@ go.uber.org/zap v1.21.0/go.mod
h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
+ go4.org/intern v0.0.0-20211027215823-ae77deb06f29
h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE=
+ go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod
h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA=
+ go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod
h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+-go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4=
+-go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod
h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
++go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760
h1:gH0IO5GDYAcawu+ThKrvAofVTgJjYaoOZ5rrC4pS2Xw=
++go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760/go.mod
h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod
h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+diff --git a/operator/go.mod b/operator/go.mod
+index 329d64bcea..5e5d4e0699 100644
+--- a/operator/go.mod
++++ b/operator/go.mod
+@@ -146,7 +146,7 @@ require (
+ go.uber.org/multierr v1.7.0 // indirect
+ go.uber.org/zap v1.21.0 // indirect
+ go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
+- go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
// indirect
++ go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760
// indirect
+ golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
+ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+ golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
+diff --git a/vendor/go4.org/unsafe/assume-no-moving-gc/assume-no-moving-gc.go
b/vendor/go4.org/unsafe/assume-no-moving-gc/assume-no-moving-gc.go
+index 14a41e73ed..fb585807a3 100644
+--- a/vendor/go4.org/unsafe/assume-no-moving-gc/assume-no-moving-gc.go
++++ b/vendor/go4.org/unsafe/assume-no-moving-gc/assume-no-moving-gc.go
+@@ -4,7 +4,11 @@
+
+ // Package go4.org/unsafe/assume-no-moving-gc exists so you can depend
+ // on it from unsafe code that wants to declare that it assumes that
+-// the Go runtime does not using a moving garbage colllector.
++// the Go runtime does not using a moving garbage colllector. Specifically,
++// it asserts that the caller is playing stupid games with the addresses
++// of heap-allocated values. It says nothing about values that Go's escape
++// analysis keeps on the stack. Ensuring things aren't stack-allocated
++// is the caller's responsibility.
+ //
+ // This package is then updated for new Go versions when that
+ // is still the case and explodes at runtime with a failure
+@@ -16,6 +20,14 @@
+ //
+ // There is no API.
+ //
++// It is intentional that this package will break code that's not updated
++// regularly to double check its assumptions about the world and new Go
++// versions. If you play stupid games with unsafe pointers, the stupid prize
++// is this maintenance cost. (The alternative would be memory corruption if
++// some unmaintained, unsafe library were built with a future version of Go
++// that worked very differently than when the unsafe library was built.)
++// Ideally you shouldn't write unsafe code, though.
++//
+ // The GitHub repo is at https://github.com/go4org/unsafe-assume-no-moving-gc
+ package assume_no_moving_gc
+
+diff --git a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
+index da4d943f6b..dbb169045a 100644
+--- a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
++++ b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
+@@ -2,8 +2,8 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+
+-//go:build go1.20
+-// +build go1.20
++//go:build go1.21
++// +build go1.21
+
+ package assume_no_moving_gc
+
+@@ -22,5 +22,5 @@ func init() {
+ if os.Getenv(env) == v {
+ return
+ }
+- panic("Something in this program imports
go4.org/unsafe/assume-no-moving-gc to declare that it assumes a non-moving
garbage collector, but your version of go4.org/unsafe/assume-no-moving-gc
hasn't been updated to assert that it's safe against the " + v + " runtime. If
you want to risk it, run with environment variable " + env + "=" + v + " set.
Notably, if " + v + " adds a moving garbage collector, this program is unsafe
to use.")
++ panic("Something in this program imports
go4.org/unsafe/assume-no-moving-gc to declare that it assumes a non-moving
garbage collector, but your version of go4.org/unsafe/assume-no-moving-gc
hasn't been updated to assert that it's safe against the " + v + " runtime. If
you want to risk it, run with environment variable " + env + "=\"" + v + "\"
set. Notably, if " + v + " adds a moving garbage collector, this program is
unsafe to use.")
+ }
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+index 55c617f93e..a40b75c42e 100644
+--- a/vendor/modules.txt
++++ b/vendor/modules.txt
+@@ -1346,7 +1346,7 @@ go.uber.org/zap/zapgrpc
+ # go4.org/intern v0.0.0-20211027215823-ae77deb06f29
+ ## explicit; go 1.13
+ go4.org/intern
+-# go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
++# go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760
+ ## explicit; go 1.11
+ go4.org/unsafe/assume-no-moving-gc
+ # golang.org/x/crypto v0.5.0
Deleted: promtail.service
===================================================================
--- promtail.service 2023-04-03 19:30:55 UTC (rev 1434415)
+++ promtail.service 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -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 1434415,
loki/trunk/promtail.service)
===================================================================
--- promtail.service (rev 0)
+++ promtail.service 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -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 2023-04-03 19:30:55 UTC (rev 1434415)
+++ promtail.sysusers 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -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 1434415,
loki/trunk/promtail.sysusers)
===================================================================
--- promtail.sysusers (rev 0)
+++ promtail.sysusers 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -0,0 +1,2 @@
+u promtail - "promtail user" /var/lib/promtail
+m promtail systemd-journal
Deleted: promtail.tmpfiles
===================================================================
--- promtail.tmpfiles 2023-04-03 19:30:55 UTC (rev 1434415)
+++ promtail.tmpfiles 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -1 +0,0 @@
-d /var/lib/promtail 0750 promtail promtail -
Copied: loki/repos/community-x86_64/promtail.tmpfiles (from rev 1434415,
loki/trunk/promtail.tmpfiles)
===================================================================
--- promtail.tmpfiles (rev 0)
+++ promtail.tmpfiles 2023-04-03 19:31:12 UTC (rev 1434416)
@@ -0,0 +1 @@
+d /var/lib/promtail 0750 promtail promtail -
