From 240e2d38ce1c1f27efe4b746bdba3247823f7fef Mon Sep 17 00:00:00 2001
From: lraab <lraab@openbsd.org>
Date: Tue, 13 Sep 2022 22:17:00 +0000
Subject: [PATCH] sysutils/loki: update to 2.6.1

changelogs:
https://github.com/grafana/loki/releases/tag/v2.6.1
https://github.com/grafana/loki/releases/tag/v2.6.0
https://github.com/grafana/loki/releases/tag/v2.5.0

with feedback (thanks!) and OK, landry@ and sthen@
---
 sysutils/loki/Makefile                        |  8 +++++--
 sysutils/loki/distinfo                        |  4 ++--
 .../patch-cmd_loki_loki-local-config_yaml     |  3 ++-
 sysutils/loki/pkg/{DESCR => DESCR-main}       |  0
 sysutils/loki/pkg/DESCR-promtail              |  1 +
 sysutils/loki/pkg/{PLIST => PLIST-main}       | 20 ++----------------
 sysutils/loki/pkg/PLIST-promtail              | 21 +++++++++++++++++++
 7 files changed, 34 insertions(+), 23 deletions(-)
 rename sysutils/loki/pkg/{DESCR => DESCR-main} (100%)
 create mode 100644 sysutils/loki/pkg/DESCR-promtail
 rename sysutils/loki/pkg/{PLIST => PLIST-main} (56%)
 create mode 100644 sysutils/loki/pkg/PLIST-promtail

diff --git a/sysutils/loki/Makefile b/sysutils/loki/Makefile
index 3fdc638ddb0..8d01cc197e2 100644
--- a/sysutils/loki/Makefile
+++ b/sysutils/loki/Makefile
@@ -1,12 +1,16 @@
-COMMENT =	like Prometheus, but for logs
+COMMENT-main =		like Prometheus, but for logs
+COMMENT-promtail =	tails log files and pushes them to Loki
 
 GH_ACCOUNT =	grafana
 GH_PROJECT =	loki
-GH_TAGNAME =	v2.4.2
+GH_TAGNAME =	v2.6.1
 
 CATEGORIES =	sysutils
 
 HOMEPAGE =	https://grafana.com/oss/loki/
+MASTER_SITES =	https://ports.lucasraab.me/
+
+MULTI_PACKAGES =	-main -promtail
 
 # AGPLv3 + some bits Apache 2.0
 PERMIT_PACKAGE =	Yes
diff --git a/sysutils/loki/distinfo b/sysutils/loki/distinfo
index 81d5f3b6299..f11d2f4c8a9 100644
--- a/sysutils/loki/distinfo
+++ b/sysutils/loki/distinfo
@@ -1,2 +1,2 @@
-SHA256 (loki-2.4.2.tar.gz) = 725af867fa3bece6ccd46e0722eb68fe72462b15faa15c8ada609b5b2a476b07
-SIZE (loki-2.4.2.tar.gz) = 26148143
+SHA256 (loki-2.6.1.tar.gz) = q3H2KQo+NGHL+yOOdZAOGGzo77X7CVuVOIfu1Sd+4zk=
+SIZE (loki-2.6.1.tar.gz) = 29338323
diff --git a/sysutils/loki/patches/patch-cmd_loki_loki-local-config_yaml b/sysutils/loki/patches/patch-cmd_loki_loki-local-config_yaml
index 3569b2dff9e..87b384453c8 100644
--- a/sysutils/loki/patches/patch-cmd_loki_loki-local-config_yaml
+++ b/sysutils/loki/patches/patch-cmd_loki_loki-local-config_yaml
@@ -1,6 +1,7 @@
+Index: cmd/loki/loki-local-config.yaml
 --- cmd/loki/loki-local-config.yaml.orig
 +++ cmd/loki/loki-local-config.yaml
-@@ -5,11 +5,11 @@
+@@ -5,11 +5,11 @@ server:
    grpc_listen_port: 9096
  
  common:
diff --git a/sysutils/loki/pkg/DESCR b/sysutils/loki/pkg/DESCR-main
similarity index 100%
rename from sysutils/loki/pkg/DESCR
rename to sysutils/loki/pkg/DESCR-main
diff --git a/sysutils/loki/pkg/DESCR-promtail b/sysutils/loki/pkg/DESCR-promtail
new file mode 100644
index 00000000000..3cdd03c7134
--- /dev/null
+++ b/sysutils/loki/pkg/DESCR-promtail
@@ -0,0 +1 @@
+agent which tails log files and pushes them to Loki
diff --git a/sysutils/loki/pkg/PLIST b/sysutils/loki/pkg/PLIST-main
similarity index 56%
rename from sysutils/loki/pkg/PLIST
rename to sysutils/loki/pkg/PLIST-main
index 1f6c724bc14..d8518ca6e35 100644
--- a/sysutils/loki/pkg/PLIST
+++ b/sysutils/loki/pkg/PLIST-main
@@ -1,13 +1,11 @@
+@pkgpath sysutils/loki
 @newgroup _loki:848
 @newuser _loki:848:848:daemon:Loki Daemon:/var/empty:/sbin/nologin
 @extraunexec rm -rf /var/loki/
-@extraunexec rm -rf /var/promtail/
 @rcscript ${RCDIR}/loki
-@rcscript ${RCDIR}/promtail
 @bin bin/logcli
 @bin bin/loki
 @bin bin/loki-canary
-@bin bin/promtail
 share/examples/loki/
 @mode 0755
 @owner root
@@ -20,21 +18,7 @@ share/examples/loki/loki-local-config.yaml
 @mode 0640
 @group _loki
 @sample ${SYSCONFDIR}/loki/loki-config.yaml
-@mode
-@group
-share/examples/promtail/
-@mode 0755
-@owner root
-@group _loki
-@sample ${SYSCONFDIR}/promtail/
-@mode
-@owner
-@group
-share/examples/promtail/promtail-local-config.yaml
-@mode 0640
-@group _loki
-@sample ${SYSCONFDIR}/promtail/promtail-config.yaml
 @mode 0750
 @owner _loki
+@group
 @sample /var/loki/
-@sample /var/promtail/
diff --git a/sysutils/loki/pkg/PLIST-promtail b/sysutils/loki/pkg/PLIST-promtail
new file mode 100644
index 00000000000..112812ca7d5
--- /dev/null
+++ b/sysutils/loki/pkg/PLIST-promtail
@@ -0,0 +1,21 @@
+@conflict loki-<=2.4.2
+@newgroup _loki:848
+@newuser _loki:848:848:daemon:Loki Daemon:/var/empty:/sbin/nologin
+@extraunexec rm -rf /var/promtail/
+@rcscript ${RCDIR}/promtail
+@bin bin/promtail
+share/examples/promtail/
+@mode 0755
+@owner root
+@group _loki
+@sample ${SYSCONFDIR}/promtail/
+@mode
+@owner
+@group
+share/examples/promtail/promtail-local-config.yaml
+@mode 0640
+@group _loki
+@sample ${SYSCONFDIR}/promtail/promtail-config.yaml
+@mode 0750
+@owner _loki
+@sample /var/promtail/