diff --git a/.files b/.files index d05af9f..7e60c44 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index aa06985..900a6ee 100644 --- a/.rev +++ b/.rev @@ -48,4 +48,12 @@ 940654 + + 238d4b0ba0e3c48873f70b9424650986 + 2.4.2+git.1642005974.525040a32 + + dimstar_suse + + 949575 + diff --git a/.servicemark b/.servicemark index 3365118..3e19622 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -98ce990e504d7ccf94e079deb1e9ffc2 +1f923c1de5b98c48e0b5b95154efbb47 diff --git a/_service b/_service index 0393a29..335d078 100644 --- a/_service +++ b/_service @@ -5,7 +5,7 @@ .git loki @PARENT_TAG@+git.%ct.%h - v2.4.1 + v2.4.2 v(.*) enable diff --git a/_servicedata b/_servicedata index d19a183..6f1a5f2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/grafana/loki.git - f61a4d2612d8fa3a385c90c363301ec05bab34d8 \ No newline at end of file + 525040a3265715ca8cfb52cd39108ccfac9f8af6 \ No newline at end of file diff --git a/loki-2.4.1+git.1636374074.f61a4d261.tar.bz2 b/loki-2.4.1+git.1636374074.f61a4d261.tar.bz2 deleted file mode 120000 index 4c66d68..0000000 --- a/loki-2.4.1+git.1636374074.f61a4d261.tar.bz2 +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeibqcbgtf3d7ovv5v4qnyaubrowzoxgswkieh26qh4x6fcxyi24xnq \ No newline at end of file diff --git a/loki-2.4.2+git.1642005974.525040a32.tar.bz2 b/loki-2.4.2+git.1642005974.525040a32.tar.bz2 new file mode 120000 index 0000000..bc3ed53 --- /dev/null +++ b/loki-2.4.2+git.1642005974.525040a32.tar.bz2 @@ -0,0 +1 @@ +/ipfs/bafybeiehwdz6libuwaikgnp254i4efxjtcqdx35ibec7jyp7cn67jm2o6m \ No newline at end of file diff --git a/loki.changes b/loki.changes index 65b29e5..328bf3f 100644 --- a/loki.changes +++ b/loki.changes @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Thu Jan 27 18:30:01 UTC 2022 - ecsos@opensuse.org + +- Update to version 2.4.2+git.1642005974.525040a32: + * fix merge conflict (#5120) + * Docs: Fix documentation with correct default values and add missing options (#4792) (#5115) + * Backport 5077: improve default config values (#5077) (#5104) + * Loki: Implement custom /config handler (#4785) (#5078) + * temporary fix for the ruler joining the ingester ring (#4968) (#5037) + * Backport to 2.4: always apply replication factor common config (#4875) (#4989) + * Docs: fix broken links (#4770) (#4778) + * Adding upgrade guide for recording rules (#4751) (#4763) + * Docs: inject newlines into knob descriptions to avoid horizontal scroll bar (#4733) (#4758) + * Docs: small v2.4.1 release notes edits (#4718) (#4719) + * update everything for 2.4.1 (#4701) (#4702) + +------------------------------------------------------------------- Mon Dec 13 20:15:36 UTC 2021 - ecsos - Change user in promtail.service from loki to root. diff --git a/loki.spec b/loki.spec index c436e71..fcb6bbd 100644 --- a/loki.spec +++ b/loki.spec @@ -1,7 +1,7 @@ # # spec file for package loki # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: loki -Version: 2.4.1+git.1636374074.f61a4d261 +Version: 2.4.2+git.1642005974.525040a32 Release: 0 Summary: Loki: like Prometheus, but for logs License: Apache-2.0