From: Kirill A. Korinsky <kirill@korins.ky>
Subject: Re: [Update] sysutils/loki: update to 3.0.0
To: OpenBSD ports <ports@openbsd.org>
Date: Sat, 27 Jul 2024 23:12:30 +0200

ports@,

Here a major update of sysutils/loki and promtail.

Notable changes: all my patches to support bsd syslog were merged and now
promtail can be used with OpenBSD syslogd.

Changelogs:
 - https://github.com/grafana/loki/releases/tag/v3.1.0
 - https://github.com/grafana/loki/releases/tag/v3.0.0

Tested on -current/amd64

The diff:

diff --git sysutils/loki/Makefile sysutils/loki/Makefile
index d6ec8e8e744..55edbad9912 100644
--- sysutils/loki/Makefile
+++ sysutils/loki/Makefile
@@ -3,7 +3,7 @@ COMMENT-promtail =	tails log files and pushes them to Loki
 
 GH_ACCOUNT =	grafana
 GH_PROJECT =	loki
-GH_TAGNAME =	v2.9.3
+GH_TAGNAME =	v3.1.0
 
 CATEGORIES =	sysutils
 
diff --git sysutils/loki/distinfo sysutils/loki/distinfo
index 7b8b0965507..c64bb593ad8 100644
--- sysutils/loki/distinfo
+++ sysutils/loki/distinfo
@@ -1,2 +1,2 @@
-SHA256 (loki-2.9.3.tar.gz) = xn81HdyOqma7pbNHTZiR6e+N5LzYnopP0M+0E7yo/cQ=
-SIZE (loki-2.9.3.tar.gz) = 45730205
+SHA256 (loki-3.1.0.tar.gz) = 5afHU6thSISVp2XvzNwPTc3dhjn184dC3yfj9Dqql7Y=
+SIZE (loki-3.1.0.tar.gz) = 51764140
diff --git sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_normalize_label_go sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_normalize_label_go
new file mode 100644
index 00000000000..93484df1dfb
--- /dev/null
+++ sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_normalize_label_go
@@ -0,0 +1,14 @@
+Backport: https://github.com/prometheus/prometheus/pull/13759
+
+Index: vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_label.go
+--- vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_label.go.orig
++++ vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_label.go
+@@ -3,7 +3,7 @@
+ // Copyright The OpenTelemetry Authors
+ // SPDX-License-Identifier: Apache-2.0
+ 
+-package prometheus // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus"
++package prometheus // import "github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus"
+ 
+ import (
+ 	"strings"
diff --git sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_normalize_name_go sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_normalize_name_go
new file mode 100644
index 00000000000..ba99fd60e8b
--- /dev/null
+++ sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_normalize_name_go
@@ -0,0 +1,14 @@
+Backport: https://github.com/prometheus/prometheus/pull/13759
+
+Index: vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go
+--- vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go.orig
++++ vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go
+@@ -3,7 +3,7 @@
+ // Copyright The OpenTelemetry Authors
+ // SPDX-License-Identifier: Apache-2.0
+ 
+-package prometheus // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus"
++package prometheus // import "github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus"
+ 
+ import (
+ 	"strings"
diff --git sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_unit_to_ucum_go sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_unit_to_ucum_go
new file mode 100644
index 00000000000..3646f91b228
--- /dev/null
+++ sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_unit_to_ucum_go
@@ -0,0 +1,14 @@
+Backport: https://github.com/prometheus/prometheus/pull/13759
+
+Index: vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/unit_to_ucum.go
+--- vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/unit_to_ucum.go.orig
++++ vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/unit_to_ucum.go
+@@ -3,7 +3,7 @@
+ // Copyright The OpenTelemetry Authors
+ // SPDX-License-Identifier: Apache-2.0
+ 
+-package prometheus // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus"
++package prometheus // import "github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus"
+ 
+ import "strings"
+ 


-- 
wbr, Kirill