[arch-commits] Commit in loki/trunk (4 files)

[Jelle van der Waa]

    Date: Sunday, January 26, 2020 @ 15:55:31
  Author: jelle
Revision: 373967

add services/sysusers

Added:
  loki/trunk/loki.service
  loki/trunk/promtail.service
  loki/trunk/promtail.sysusers
Modified:
  loki/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   14 +++++++++++---
 loki.service      |    7 +++++++
 promtail.service  |   21 +++++++++++++++++++++
 promtail.sysusers |    2 ++
 4 files changed, 41 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-26 15:29:39 UTC (rev 373966)
+++ PKGBUILD	2020-01-26 15:55:31 UTC (rev 373967)
@@ -10,8 +10,9 @@
 depends=('glibc')
 makedepends=('go-pie')
 backup=('etc/loki/loki.yaml' 'etc/loki/promtail.yaml')
-source=($pkgname-$pkgver.tar.gz::https://github.com/grafana/loki/archive/v$pkgver.tar.gz)
-sha512sums=('db2c5e81b2b24d884f2c56531e577beae693cc06e30fe74b4d89b6b1c3857992396aeb46877ab5b787b268741cc9de75fd5ed53c548de6abac701afe97477df2')
+source=($pkgname-$pkgver.tar.gz::https://github.com/grafana/loki/archive/v$pkgver.tar.gz promtail.sysusers)
+sha512sums=('db2c5e81b2b24d884f2c56531e577beae693cc06e30fe74b4d89b6b1c3857992396aeb46877ab5b787b268741cc9de75fd5ed53c548de6abac701afe97477df2'
+            '2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74')
 
 build() {
   cd loki-$pkgver
@@ -27,6 +28,11 @@
     -trimpath \
     -ldflags "$LDFLAGS" \
     ./cmd/promtail
+
+  go build \
+    -trimpath \
+    -ldflags "$LDFLAGS" \
+    ./cmd/logcli
 }
 
 check() {
@@ -38,8 +44,10 @@
 package() {
   cd loki-$pkgver
 
-  install -Dm755 -t "$pkgdir"/usr/bin loki promtail
+  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
+
+  install -Dm644 ${srcdir}/promtail.sysusers "$pkgdir/usr/lib/sysusers.d/promtail.conf"
 }

Added: loki.service
===================================================================
--- loki.service	                        (rev 0)
+++ loki.service	2020-01-26 15:55:31 UTC (rev 373967)
@@ -0,0 +1,7 @@
+[Unit]
+Description=Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/loki -config.file /etc/loki/loki.yaml
+TimeoutStopSec=30s

Added: promtail.service
===================================================================
--- promtail.service	                        (rev 0)
+++ promtail.service	2020-01-26 15:55:31 UTC (rev 373967)
@@ -0,0 +1,21 @@
+[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
+TimeoutStopSec=30s
+
+NoNewPrivileges=true
+ProtectHome=true
+# Needs to write to /var/log/positions.yml
+#ProtectSystem=full
+PrivateTmp=true
+PrivateDevices=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectControlGroups=true
+
+[Install]
+WantedBy=multi-user.target

Added: promtail.sysusers
===================================================================
--- promtail.sysusers	                        (rev 0)
+++ promtail.sysusers	2020-01-26 15:55:31 UTC (rev 373967)
@@ -0,0 +1,2 @@
+u promtail - "promtail user" /var/lib/promtail
+m promtail systemd-journal