[arch-commits] Commit in loki/repos/community-x86_64 (14 files)

Daurnimator daurnimator at archlinux.org
Wed Jul 8 08:32:24 UTC 2020


    Date: Wednesday, July 8, 2020 @ 08:32:24
  Author: daurnimator
Revision: 660542

archrelease: copy trunk to community-x86_64

Added:
  loki/repos/community-x86_64/PKGBUILD
    (from rev 660541, loki/trunk/PKGBUILD)
  loki/repos/community-x86_64/loki.service
    (from rev 660541, loki/trunk/loki.service)
  loki/repos/community-x86_64/loki.sysusers
    (from rev 660541, loki/trunk/loki.sysusers)
  loki/repos/community-x86_64/loki.tmpfiles
    (from rev 660541, loki/trunk/loki.tmpfiles)
  loki/repos/community-x86_64/promtail.service
    (from rev 660541, loki/trunk/promtail.service)
  loki/repos/community-x86_64/promtail.sysusers
    (from rev 660541, loki/trunk/promtail.sysusers)
  loki/repos/community-x86_64/promtail.tmpfiles
    (from rev 660541, 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          |  157 +++++++++++++++++++++++++++-------------------------
 loki.service      |   54 ++++++++---------
 loki.sysusers     |    2 
 loki.tmpfiles     |    2 
 promtail.service  |   52 ++++++++---------
 promtail.sysusers |    4 -
 promtail.tmpfiles |    2 
 7 files changed, 140 insertions(+), 133 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-08 08:31:24 UTC (rev 660541)
+++ PKGBUILD	2020-07-08 08:32:24 UTC (rev 660542)
@@ -1,75 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle at archlinux.org>
-
-pkgname=loki
-pkgver=1.5.0
-pkgrel=1
-pkgdesc='like Prometheus, but for logs'
-url='https://github.com/grafana/loki'
-arch=('x86_64')
-license=('Apache')
-depends=('glibc')
-makedepends=('go' 'systemd')
-backup=('etc/loki/loki.yaml' 'etc/loki/promtail.yaml')
-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=('31d61ba9cb47afeb0971fe35347683cf96e3b7a4da44b640b0065e64268109c2a1e9011f94d3fcf7912e98f8b079a001cd892a06e3f8d11796f23c8acfc93fff'
-            '2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74'
-            'a3427ddecada33b90658635962c4ea36ced6b9d0e1686ce898884980c2ce1a82be2ddcfa6b42736392653f48fa561408633d6016b77e2b513029ba0cec977727'
-            '598042c40673a7914c5a1eeccfb78f832379a61f4360212c5d86f667343cf2fc78e98d9025f9717ea64f3e16e0a28f08cd7709706d811656722019f6167dd788'
-            'f00b3cb64b71d3ca5a422a2bdff1f81a3e2707c4f73bcb27e24338eabff039b96125c847aaae43c9b22ccc47f89585118c1d0e0b29c4eb7b6f9260c68f8a8324'
-            '3c40d70366ee0ac3d11c87a818d82dfb4e64143e905187b287f7716ee009640bab6676b8a348e526458a00e4cff35fbd8e9d81bdaa6db38a5d673294f09e6638'
-            'de40d1e6752edbf8c21317ce1ee10f98dfc869e569c07092c613f7144e261e9438683a145a2e0e37e2a9fc758c5c2f02e1d0ac1c60347e98b147e4a550ec6040')
-
-build() {
-  cd loki-$pkgver
-
-  go build \
-    -trimpath \
-    -buildmode=pie \
-    -mod=readonly \
-    -modcacherw \
-    -ldflags "-extldflags ${LDFLAGS}" \
-    ./cmd/loki
-
-  go build \
-    -trimpath \
-    -buildmode=pie \
-    -mod=readonly \
-    -modcacherw \
-    -ldflags "-extldflags ${LDFLAGS}" \
-    ./cmd/promtail
-
-  go build \
-    -trimpath \
-    -buildmode=pie \
-    -mod=readonly \
-    -modcacherw \
-    -ldflags "-extldflags ${LDFLAGS}" \
-    ./cmd/logcli
-}
-
-check() {
-  cd loki-$pkgver
-
-  go test -v $(go list  ./... | grep -v "distributor")
-}
-
-package() {
-  cd loki-$pkgver
-
-  install -Dm755 -t "$pkgdir"/usr/bin loki promtail logcli
-
-  install -Dm644 cmd/promtail/promtail-local-config.yaml $pkgdir/etc/loki/promtail.yaml
-  install -Dm644 cmd/loki/loki-local-config.yaml $pkgdir/etc/loki/loki.yaml
-
-  # Promtail
-  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"
-
-  # Loki
-  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"
-}

Copied: loki/repos/community-x86_64/PKGBUILD (from rev 660541, loki/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-08 08:32:24 UTC (rev 660542)
@@ -0,0 +1,82 @@
+# Maintainer: Daurnimator <daurnimator at archlinux.org>
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+
+pkgname=('loki' 'promtail' 'logcli')
+pkgver=1.5.0
+pkgrel=2
+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
+        promtail.sysusers promtail.service promtail.tmpfiles
+        loki.sysusers loki.service loki.tmpfiles)
+sha512sums=('31d61ba9cb47afeb0971fe35347683cf96e3b7a4da44b640b0065e64268109c2a1e9011f94d3fcf7912e98f8b079a001cd892a06e3f8d11796f23c8acfc93fff'
+            '2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74'
+            'a3427ddecada33b90658635962c4ea36ced6b9d0e1686ce898884980c2ce1a82be2ddcfa6b42736392653f48fa561408633d6016b77e2b513029ba0cec977727'
+            '598042c40673a7914c5a1eeccfb78f832379a61f4360212c5d86f667343cf2fc78e98d9025f9717ea64f3e16e0a28f08cd7709706d811656722019f6167dd788'
+            'f00b3cb64b71d3ca5a422a2bdff1f81a3e2707c4f73bcb27e24338eabff039b96125c847aaae43c9b22ccc47f89585118c1d0e0b29c4eb7b6f9260c68f8a8324'
+            '3c40d70366ee0ac3d11c87a818d82dfb4e64143e905187b287f7716ee009640bab6676b8a348e526458a00e4cff35fbd8e9d81bdaa6db38a5d673294f09e6638'
+            'de40d1e6752edbf8c21317ce1ee10f98dfc869e569c07092c613f7144e261e9438683a145a2e0e37e2a9fc758c5c2f02e1d0ac1c60347e98b147e4a550ec6040')
+
+build() {
+  cd loki-$pkgver
+
+  for cmd in loki 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})
+         -extldflags ${LDFLAGS}" \
+      ./cmd/"$cmd"
+  done
+}
+
+check() {
+  cd loki-$pkgver
+
+  go test -v $(go list  ./... | grep -v "distributor")
+}
+
+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_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
+}

Deleted: loki.service
===================================================================
--- loki.service	2020-07-08 08:31:24 UTC (rev 660541)
+++ loki.service	2020-07-08 08:32:24 UTC (rev 660542)
@@ -1,27 +0,0 @@
-[Unit]
-Description=Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system
-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
-
-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 660541, loki/trunk/loki.service)
===================================================================
--- loki.service	                        (rev 0)
+++ loki.service	2020-07-08 08:32:24 UTC (rev 660542)
@@ -0,0 +1,27 @@
+[Unit]
+Description=Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system
+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
+
+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	2020-07-08 08:31:24 UTC (rev 660541)
+++ loki.sysusers	2020-07-08 08:32:24 UTC (rev 660542)
@@ -1 +0,0 @@
-u loki - "loki user" /var/lib/loki

Copied: loki/repos/community-x86_64/loki.sysusers (from rev 660541, loki/trunk/loki.sysusers)
===================================================================
--- loki.sysusers	                        (rev 0)
+++ loki.sysusers	2020-07-08 08:32:24 UTC (rev 660542)
@@ -0,0 +1 @@
+u loki - "loki user" /var/lib/loki

Deleted: loki.tmpfiles
===================================================================
--- loki.tmpfiles	2020-07-08 08:31:24 UTC (rev 660541)
+++ loki.tmpfiles	2020-07-08 08:32:24 UTC (rev 660542)
@@ -1 +0,0 @@
-d /var/lib/loki 0750 loki loki -

Copied: loki/repos/community-x86_64/loki.tmpfiles (from rev 660541, loki/trunk/loki.tmpfiles)
===================================================================
--- loki.tmpfiles	                        (rev 0)
+++ loki.tmpfiles	2020-07-08 08:32:24 UTC (rev 660542)
@@ -0,0 +1 @@
+d /var/lib/loki 0750 loki loki -

Deleted: promtail.service
===================================================================
--- promtail.service	2020-07-08 08:31:24 UTC (rev 660541)
+++ promtail.service	2020-07-08 08:32:24 UTC (rev 660542)
@@ -1,26 +0,0 @@
-[Unit]
-Description=promtail is the agent responsible for gathering logs and sending them to Loki.
-Documentation=https://github.com/grafana/loki/blob/master/docs/promtail.md
-
-[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 660541, loki/trunk/promtail.service)
===================================================================
--- promtail.service	                        (rev 0)
+++ promtail.service	2020-07-08 08:32:24 UTC (rev 660542)
@@ -0,0 +1,26 @@
+[Unit]
+Description=promtail is the agent responsible for gathering logs and sending them to Loki.
+Documentation=https://github.com/grafana/loki/blob/master/docs/promtail.md
+
+[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	2020-07-08 08:31:24 UTC (rev 660541)
+++ promtail.sysusers	2020-07-08 08:32:24 UTC (rev 660542)
@@ -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 660541, loki/trunk/promtail.sysusers)
===================================================================
--- promtail.sysusers	                        (rev 0)
+++ promtail.sysusers	2020-07-08 08:32:24 UTC (rev 660542)
@@ -0,0 +1,2 @@
+u promtail - "promtail user" /var/lib/promtail
+m promtail systemd-journal

Deleted: promtail.tmpfiles
===================================================================
--- promtail.tmpfiles	2020-07-08 08:31:24 UTC (rev 660541)
+++ promtail.tmpfiles	2020-07-08 08:32:24 UTC (rev 660542)
@@ -1 +0,0 @@
-d /var/lib/promtail 0750 promtail promtail -

Copied: loki/repos/community-x86_64/promtail.tmpfiles (from rev 660541, loki/trunk/promtail.tmpfiles)
===================================================================
--- promtail.tmpfiles	                        (rev 0)
+++ promtail.tmpfiles	2020-07-08 08:32:24 UTC (rev 660542)
@@ -0,0 +1 @@
+d /var/lib/promtail 0750 promtail promtail -


More information about the arch-commits mailing list