Accepting request 1322238 from server:monitoring

OBS-URL: https://build.opensuse.org/request/show/1322238
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/loki?expand=0&rev=29

_service

@@ -7,7 +7,7 @@
     <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
     -->
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">v3.5.3</param>
+    <param name="revision">v3.6.3</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="submodules">disable</param>
     <param name="changesgenerate">enable</param>

_servicedata

@@ -3,4 +3,4 @@
                 <param name="url">git://github.com/grafana/loki.git</param>
               <param name="changesrevision">525040a3265715ca8cfb52cd39108ccfac9f8af6</param></service><service name="tar_scm">
                 <param name="url">https://github.com/grafana/loki.git</param>
-              <param name="changesrevision">af52a690ce73867bbf9cecbf2d279c578aa99d2d</param></service></servicedata>
+              <param name="changesrevision">9385bc6320733e8c19283f058c685e9eaa14c4ac</param></service></servicedata>

loki-3.5.3.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f496c201b6c8e821c473ae7522c278ee30aa8793e1570ab5e3295d0eeba80538
-size 509494286

loki-3.6.3.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e36d40dbc864dc9bdfd90d6823bef4ba36bca1ba9e046d21f0b9d7284a67c043
+size 527484431

loki.changes

@@ -1,3 +1,152 @@
+-------------------------------------------------------------------
+Thu Dec 11 14:38:02 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to version 3.6.3:
+  * chore: upgrade to Go 1.25 (#20204)
+  * docs: backport storage update 3.6 (#20179)
+  * fix: Do not override S3 region if already specified in configuration chain (backport release-3.6.x) (#20128)
+  * fix: Fix regression in S3 client configuration (backport release-3.6.x) (#20118)
+  * docs: manual backport 20097 3.6 branch (#20104)
+  * chore(deps): update module golang.org/x/net to v0.38.0 [security] (release-3.6.x) (#20023)
+  * docs: Edit deployment modes SSD (backport release-3.6.x) (#20070)
+  * docs: backport 20029 to 3.6 branch (#20034)
+  * docs: Update RN 3.6.2 (backport release-3.6.x) (#20025)
+  * docs: Sm update to Labels (backport release-3.6.x) (#20020)
+  * chore(release-3.6.x): release 3.6.2 (#20021)
+  * docs: document breaking change (backport release-3.6.x) (#20017)
+
+-------------------------------------------------------------------
+Tue Nov 25 21:52:56 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to version 3.6.2:
+  * fix(deps): Loki 3.6.1 CVE updates (#20014)
+  * docs: 3.5.8 Release Notes (backport release-3.6.x) (#19995)
+  * docs: Release Notes 3.6.1 (backport release-3.6.x) (#19971)
+  * docs: backport typo to 3.6 (#19967)
+  * chore(docs): Fix link to helm chart values.yaml (backport release-3.6.x) (#19963)
+  * chore(release-3.6.x): release 3.6.1 (#19953)
+
+-------------------------------------------------------------------
+Fri Nov 21 19:30:03 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Add support for instantiated services and a target to
+  disable/restart all at the same time
+
+-------------------------------------------------------------------
+Fri Nov 21 17:28:17 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to version 3.6.1:
+  * fix(docker): set WORKDIR to root in loki Dockerfiles (#19952)
+  * fix(docker): missing permissions  to start docker (backport release-3.6.x) (#19948)
+  * chore(k277): release 3.6.0 (#19686)
+
+-------------------------------------------------------------------
+Tue Nov 18 23:26:07 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- add support for instantiated services
+
+-------------------------------------------------------------------
+Tue Nov 18 23:24:08 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Sync service files with upstream again
+
+-------------------------------------------------------------------
+Mon Nov 17 23:23:30 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to version 3.6.0:
+  A new big feature and bugfix release
+
+  For all the details see
+  https://github.com/grafana/loki/releases/tag/v3.6.0
+
+-------------------------------------------------------------------
+Thu Nov 06 06:36:50 UTC 2025 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
+
+- Update to version 3.5.8:
+  * fix: bump go version (#19702)
+  * ci: make dist job run on self-hosted runner (backport
+    release-3.5.x) (#19697)
+  * docs: Add pattern ingester to components (backport
+    release-3.5.x) (#19652)
+  * docs: Update variable formatting (#19610) (#19628)
+  * docs: Update TOC entry for unwanted queries (backport
+    release-3.5.x) (#19626)
+  * docs: update note in labels topic (backport release-3.5.x)
+    (#19624)
+  * docs: Update Loki version, add notes (backport release-3.5.x)
+    (#19601)
+  * docs: backport 19594 3.5 branch (#19597)
+  * docs: backport 19532 to 3.5 branch (#19537)
+  * docs: Update Auth topic with nginx instructions (backport
+    release-3.5.x) (#19527)
+  * chore(build): Pull in latest helm tagged releases workflow
+    (#19512)
+  * docs: Update RN for 3.5.7 (backport release-3.5.x) (#19498)
+  * chore(release-3.5.x): release 3.5.7 (#19477)
+
+-------------------------------------------------------------------
+Mon Oct 13 10:26:36 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to version 3.5.7:
+  * fix(build): rpm signature config (#19476) (#19483)
+  * docs: Update RN for 3.5.6 (backport release-3.5.x) (#19480)
+  * fix(build): update loki build image (#19473) (#19474)
+  * chore(release-3.5.x): release 3.5.6 (#19273)
+
+-------------------------------------------------------------------
+Fri Oct 10 12:58:46 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to version 3.5.6:
+  * fix(deps): remove CVE GHSA-2464-8j7c-4cjm (#19469)
+  * fix(release-3.5.x): bump Go version to 1.24.8 (#19454) (#19462)
+  * docs: backport #17266 to 3.5 branch (#19463)
+  * docs: Update auth docs (backport release-3.5.x) (#19460)
+  * docs: Adding config to reference section (backport release-3.5.x) (#19458)
+  * chore(deps): update dependency vite to v7 [security] (release-3.5.x) (#19150)
+  * fix(deps): update module github.com/twmb/franz-go/plugin/kprom to v1.2.1 (release-3.5.x) (#18793)
+  * docs: Update RN 3.5.5 (#19179) (#19182)
+  * docs: Update RN for 3.4.6 (backport release-3.5.x) (#19181)
+  * chore(release-3.5.x): release 3.5.5 (#19167)
+
+-------------------------------------------------------------------
+Thu Sep 11 09:54:08 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to version 3.5.5:
+  * fix(release-3.5.x): backport fix to correctly calculate entry metadata size (#19163)
+  * docs: Backport 19151 (#19158)
+  * docs: Add breaking change to upgrade (backport release-3.5.x) (#19147)
+  * docs: manual backport 3.5 (#19123)
+  * docs: Release notes for 3.5.4 (#19113)
+  * chore(release-3.5.x): release 3.5.4 (#18680)
+
+-------------------------------------------------------------------
+Thu Sep 04 12:42:22 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to version 3.5.4:
+  * fix: Upgrade go version 1.24.6 in release-3.5.x (#19096)
+  * chore: Add ingester_chunks_flush_requests_total (backport release-3.5.x) (#19088)
+  * docs: prep OTEL shared content (backport release-3.5.x) (#19057)
+  * docs: backport typo to 3.5 branch (#19047)
+  * docs: Adding link to learning journey (backport release-3.5.x) (#19006)
+  * docs: Update deployment to point to new repo (backport release-3.5.x) (#18970)
+  * docs: Clarify that Distributed = Microservices (backport release-3.5.x) (#18968)
+  * docs: backport add note to retention topic (#18924)
+  * docs: Remove port number from OTEL endpoint (backport release-3.5.x) (#18922)
+  * docs: remove Jaeger from troubleshooting (backport release-3.5.x) (#18920)
+  * docs: Add note to LIDS template (backport release-3.5.x) (#18885)
+  * docs: Adding a note for Cloud customers (backport release-3.5.x) (#18883)
+  * docs: backport typo fix to 3.5 (#18827)
+  * docs: backport link fix 3.5 (#18823)
+  * docs: update heading to match example (backport release-3.5.x) (#18771)
+  * docs: fix typo in Bloom Filters topic (backport release-3.5.x) (#18766)
+  * fix(docs): added instructions for how to upgrade zone-aware ingesters… (#18663)
+  * docs: fix broken link (backport release-3.5.x) (#18627)
+  * docs(fix): Updated port expose for Alloy (backport release-3.5.x) (#18611)
+  * docs: Update Release Notes for 3.5.3 (backport release-3.5.x) (#18557)
+  * ci: backport 18538 to 3.5 (#18560)
+  * chore(release-3.5.x): release 3.5.3 (#18424)
+  * docs: Fix navigation for drilldown (backport release-3.5.x) (#18492)
+
 -------------------------------------------------------------------
 Wed Jul 23 09:42:01 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
 

loki.obsinfo

@@ -1,4 +1,4 @@
 name: loki
-version: 3.5.3
-mtime: 1752701740
-commit: af52a690ce73867bbf9cecbf2d279c578aa99d2d
+version: 3.6.3
+mtime: 1765443491
+commit: 9385bc6320733e8c19283f058c685e9eaa14c4ac

loki.service

@@ -1,6 +1,8 @@
 [Unit]
 Description=Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system
 Documentation=https://github.com/grafana/loki
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 # added automatically, for details please see
@@ -14,14 +16,17 @@ ProtectKernelTunables=true
 ProtectKernelModules=true
 ProtectControlGroups=true
 RestrictRealtime=true
-# end of automatic additions 
-Restart=always
+# end of automatic additions
 User=loki
 EnvironmentFile=-/etc/sysconfig/loki
 ExecStart=/usr/bin/loki -config.file=${CONFIG_FILE}
 ExecReload=/bin/kill -HUP $MAINPID
-TimeoutStopSec=20s
+# Give a reasonable amount of time for the server to start up/shut down
+TimeoutSec = 120
+TimeoutStopSec=120s
 SendSIGKILL=no
+Restart=always
+RestartSec = 2
 
 [Install]
 WantedBy=multi-user.target

loki.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package loki
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,8 +20,11 @@
 %global loki_logdir /var/log/loki
 %global promtail_datadir /var/lib/promtail
 
+%global loki_services     loki.target     loki.service     loki@.service
+%global promtail_services promtail.target promtail.service promtail@.service
+
 Name:           loki
-Version:        3.5.3
+Version:        3.6.3
 Release:        0
 Summary:        Loki: like Prometheus, but for logs
 License:        Apache-2.0
@@ -32,6 +35,10 @@ Source1:        loki.service
 Source2:        promtail.service
 Source3:        sysconfig.loki
 Source4:        sysconfig.promtail
+Source5:        loki@.service
+Source6:        promtail@.service
+Source7:        loki.target
+Source8:        promtail.target
 Source99:       series
 Patch0:         proper-data-directories.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -113,8 +120,14 @@ CGO_ENABLED=1 go build -ldflags="$GOLDFLAGS" --tags=promtail_journal_enabled ./c
 # Service files for Loki and promtail
 install -Dm644 %{SOURCE1} %{buildroot}%{_unitdir}/loki.service
 install -Dm644 %{SOURCE2} %{buildroot}%{_unitdir}/promtail.service
+install -Dm644 %{SOURCE5} %{buildroot}%{_unitdir}/loki@.service
+install -Dm644 %{SOURCE6} %{buildroot}%{_unitdir}/promtail@.service
+install -Dm644 %{SOURCE7} %{buildroot}%{_unitdir}/loki.target
+install -Dm644 %{SOURCE8} %{buildroot}%{_unitdir}/promtail.target
+
 install -Dm644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.loki
 install -Dm644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.promtail
+
 install -dm755 %{buildroot}%{_sbindir}
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcloki
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcpromtail
@@ -135,35 +148,37 @@ install -Dm755 logcli %{buildroot}%{_bindir}
 install -D -d -m 0750 %{buildroot}%{promtail_datadir} %{buildroot}%{loki_datadir} %{buildroot}%{loki_logdir}
 
 %pre
-%service_add_pre loki.service
+%service_add_pre %{loki_services}
 
 %post
-%fillup_only
-%service_add_post loki.service
+%fillup_only -n loki
+%service_add_post %{loki_services}
 
 %preun
-%service_del_preun loki.service
+%service_del_preun %{loki_services}
 
 %postun
-%service_del_postun loki.service promtail.service
+%service_del_postun %{loki_services} %{promtail_services}
 
 %pre -n promtail
-%service_add_pre promtail.service
+%service_add_pre %{promtail_services}
 
 %post -n promtail
 %fillup_only -n promtail
-%service_add_post promtail.service
+%service_add_post %{promtail_services}
 
 %preun -n promtail
-%service_del_preun promtail.service
+%service_del_preun %{promtail_services}
 
 %postun -n promtail
-%service_del_postun promtail.service
+%service_del_postun %{promtail_services}
 
 %files
 %license LICENSE
 %doc README.md
+%{_unitdir}/loki.target
 %{_unitdir}/loki.service
+%{_unitdir}/loki@.service
 %{_fillupdir}/sysconfig.loki
 %{_bindir}/loki
 %dir %{_sysconfdir}/loki
@@ -173,7 +188,9 @@ install -D -d -m 0750 %{buildroot}%{promtail_datadir} %{buildroot}%{loki_datadir
 %dir %attr(-,loki,loki) %{loki_logdir}/
 
 %files -n promtail
+%{_unitdir}/promtail.target
 %{_unitdir}/promtail.service
+%{_unitdir}/promtail@.service
 %{_fillupdir}/sysconfig.promtail
 %{_bindir}/promtail
 %dir %{_sysconfdir}/loki

loki.target

@@ -0,0 +1,5 @@
+[Unit]
+Description=Target to restart all parts of Grafana Loki
+
+[Install]
+WantedBy=multi-user.target

loki@.service

@@ -0,0 +1,32 @@
+[Unit]
+Description=Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system
+Documentation=https://github.com/grafana/loki
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+ProtectSystem=full
+ProtectHome=true
+PrivateDevices=true
+ProtectHostname=true
+ProtectClock=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectControlGroups=true
+RestrictRealtime=true
+# end of automatic additions
+User=loki
+Environment=CONFIG_FILE=/etc/loki/%i.yaml
+ExecStart=/usr/bin/loki -config.file=${CONFIG_FILE}
+ExecReload=/bin/kill -HUP $MAINPID
+# Give a reasonable amount of time for the server to start up/shut down
+TimeoutSec = 120
+TimeoutStopSec=120s
+SendSIGKILL=no
+Restart=always
+RestartSec = 2
+
+[Install]
+WantedBy=loki.target

promtail.service

@@ -1,6 +1,8 @@
 [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
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 # added automatically, for details please see
@@ -14,14 +16,17 @@ ProtectKernelTunables=true
 ProtectKernelModules=true
 ProtectControlGroups=true
 RestrictRealtime=true
-# end of automatic additions 
-Restart=always
+# end of automatic additions
 User=root
 EnvironmentFile=-/etc/sysconfig/promtail
 ExecStart=/usr/bin/promtail -config.file=${CONFIG_FILE}
 ExecReload=/bin/kill -HUP $MAINPID
+# Give a reasonable amount of time for promtail to start up/shut down
+TimeoutSec = 60
 TimeoutStopSec=20s
 SendSIGKILL=no
+Restart=always
+RestartSec = 2
 
 [Install]
 WantedBy=multi-user.target

promtail.target

@@ -0,0 +1,5 @@
+[Unit]
+Description=Target to restart all parts of Grafana Loki
+
+[Install]
+WantedBy=multi-user.target

promtail@.service

@@ -0,0 +1,32 @@
+[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
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+ProtectSystem=full
+ProtectHome=true
+PrivateDevices=true
+ProtectHostname=true
+ProtectClock=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectControlGroups=true
+RestrictRealtime=true
+# end of automatic additions
+User=root
+Environment=CONFIG_FILE=/etc/promtail/%i.yaml
+ExecStart=/usr/bin/promtail -config.file=${CONFIG_FILE}
+ExecReload=/bin/kill -HUP $MAINPID
+# Give a reasonable amount of time for promtail to start up/shut down
+TimeoutSec = 60
+TimeoutStopSec=20s
+SendSIGKILL=no
+Restart=always
+RestartSec = 2
+
+[Install]
+WantedBy=promtail.target