From 99b42016b2280ba5c258f22e97c1d58d286a144416746e90b1655a1bad18c40d Mon Sep 17 00:00:00 2001 From: Stefano Torresi Date: Wed, 6 Nov 2024 13:22:33 +0000 Subject: [PATCH] - Update to version 3.2.1: OBS-URL: https://build.opensuse.org/package/show/server:monitoring/loki?expand=0&rev=28 --- _service | 7 +- _servicedata | 2 +- harden_promtail.service.patch | 20 +- loki-3.1.1+git.1723126694.89fe788d.tar.xz | 3 - loki-3.2.1.tar.xz | 3 + loki.changes | 419 ++++++++++++++++++++++ loki.spec | 17 +- proper-data-directories.patch | 242 ++++++------- 8 files changed, 570 insertions(+), 143 deletions(-) delete mode 100644 loki-3.1.1+git.1723126694.89fe788d.tar.xz create mode 100644 loki-3.2.1.tar.xz diff --git a/_service b/_service index 89c635c..f5a914a 100644 --- a/_service +++ b/_service @@ -4,8 +4,11 @@ git .git loki - @PARENT_TAG@+git.%ct.%h - v3.1.1 + + @PARENT_TAG@ + v3.2.1 v(.*) enable diff --git a/_servicedata b/_servicedata index 370c95a..a8af473 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,4 @@ git://github.com/grafana/loki.git 525040a3265715ca8cfb52cd39108ccfac9f8af6 https://github.com/grafana/loki.git - 89fe788d63b10ffd0787506daba871d2ac7f2941 \ No newline at end of file + 3c386cc5d13629a74cddb43c429ec290ba2e4a0a \ No newline at end of file diff --git a/harden_promtail.service.patch b/harden_promtail.service.patch index 02186c7..cbd4989 100644 --- a/harden_promtail.service.patch +++ b/harden_promtail.service.patch @@ -1,11 +1,11 @@ -Index: a/tools/packaging/promtail.service +Index: loki/tools/packaging/promtail.service =================================================================== ---- a/tools/packaging/promtail.service -+++ b/tools/packaging/promtail.service -@@ -1,6 +1,18 @@ - [Unit] - Description=Promtail - [Service] +--- loki.orig/tools/packaging/promtail.service ++++ loki/tools/packaging/promtail.service +@@ -11,6 +11,18 @@ ExecStart=/usr/bin/promtail -config.file + TimeoutSec = 60 + Restart = on-failure + RestartSec = 2 +# added automatically, for details please see +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort +ProtectSystem=full @@ -18,6 +18,6 @@ Index: a/tools/packaging/promtail.service +ProtectControlGroups=true +RestrictRealtime=true +# end of automatic additions - User=root - WorkingDirectory=/opt/promtail/ - ExecStartPre=/bin/sleep 30 + + [Install] + WantedBy=multi-user.target diff --git a/loki-3.1.1+git.1723126694.89fe788d.tar.xz b/loki-3.1.1+git.1723126694.89fe788d.tar.xz deleted file mode 100644 index ecb854b..0000000 --- a/loki-3.1.1+git.1723126694.89fe788d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3ec4b9bd4ca0a2515fcb04978fd2c499dabdd478f262255789da3e074ea20fc -size 37186992 diff --git a/loki-3.2.1.tar.xz b/loki-3.2.1.tar.xz new file mode 100644 index 0000000..444fce3 --- /dev/null +++ b/loki-3.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:791f1521ca1160f835c0a181c4c6cc35c2a228ca7e0dcf3ee24cb9d93a1988d1 +size 39643648 diff --git a/loki.changes b/loki.changes index bcf1a58..6cb214b 100644 --- a/loki.changes +++ b/loki.changes @@ -1,3 +1,422 @@ +------------------------------------------------------------------- +Thu Oct 17 21:30:13 UTC 2024 - mrueckert@suse.de + +- Update to version 3.2.1: + * ci: fix logql analyzer (backport release-3.2.x) [manual backport] (#14518) + * fix(logql): updated JSONExpressionParser not to unescape extracted values if it is JSON object. (backport release-3.2.x) (#14502) + * docs: update sample result on loki setup page (backport release-3.2.x) (#14493) + * docs: Updated Fluent Bit docs to use official plugin + Sandbox (backport release-3.2.x) (#14490) + * docs: Small update to install docs (backport release-3.2.x) (#14479) + * docs: Update Promtail installation (backport release-3.2.x) (#14474) + * docs: update Helm installation topics (backport release-3.2.x) (#14471) + * docs: corrected result for the `flags` field in the examples (backport release-3.2.x) (#14468) + * docs: Update alloy-otel-logs.md to correct a typo (backport release-3.2.x) (#14459) + * docs: Revise the LogQL Analyzer topic (backport release-3.2.x) (#14454) + * docs: remove reference to Agent Flow (backport release-3.2.x) (#14450) + * docs: Updated Promtail to Alloy (backport release-3.2.x) (#14429) + * fix(storage/chunk/client/aws): have GetObject check for canceled context (backport release-3.2.x) (#14422) + * fix: Revert build image to Debian Bullseye to fix libc version issue in Promtail (#14386) + * docs: OpenTelemetry Collector Sandbox Tutorial (backport release-3.2.x) (#14380) + * fix(config): Copy Alibaba and IBM object storage configuration from common (#14315) + * docs: fix broken links (backport release-3.2.x) (#14363) + * docs: Reorganize Query Templates page (backport release-3.2.x) (#14335) + * chore: [release-3.2.x] docs: Fix link bracket for query-acceleration-blooms (#14265) + * chore: [release-3.2.x] docs: Fix typo in query-acceleration-blooms (#14251) + * chore: [release-3.2.x] docs: add additional clarification for single binary helm installation (#14236) + * chore: [release-3.2.x] docs: added video to components (#14232) + * chore: [release-3.2.x] docs: Replace shortcodes on Storage topic (#14229) + * chore: [release-3.2.x] docs: Added new Query best practices page (#14224) + * chore: [release-3.2.x] fix: Add additional validation for timeout while retrieving headers (#14220) + * chore: [release-3.2.x] docs: Explore Logs GA (#14219) + * chore: [release-3.2.x] docs: Fix awkwardly worded line about fluent-cli (#14205) + * chore: [release-3.2.x] docs: Update Loki components page with new bloom components (#14200) + * chore: [release-3.2.x] ci: Update workflows to use actions that don't need organization secrets (#14195) + * docs: Loki 3.2 Release Notes (#14194) + * ci: use app token for release + * chore(k218): release 3.2.0 (#14088) + +------------------------------------------------------------------- +Fri Oct 11 22:47:03 UTC 2024 - Marcus Rueckert + +- refresh patches: + harden_promtail.service.patch + proper-data-directories.patch +- use the source epoch as build date +- since we only package releases we can also just use the version + from the tag instead of a verbose version string +- no longer strip the binaries +- Update to version 3.2.0: + * chore: [k218] docs: add `X-Scope-OrgID` header to Grafana datasource if multi-tenancy is enabled (#14172) + * feat: add structured metadata to the promtail push API (#14153) (#14155) + * chore: [k218] fix(blooms): Fix panic in initialisation of the bloom planner and builder (#14113) + * chore: [k218] feat(blooms): Add bloom planner and bloom builder to `backend` target (#14092) + * chore: [k218] chore(deps): Downgrade fake-gcs-server (#14085) + * chore: [k218] feat(max-allowed-line-length): add config to set `max-allowed-line-length` in pattern ingester (#14076) + * chore: [k218] fix: downgrade grpc to fix regression (#14075) + * chore: [k218] fix: correct _extracted logic in detected fields (#14073) + * chore: [k218] fix: enable service detection for otlp endoint (#14052) + * chore: [k218] fix(`detected_fields`): return parsed labels when parsers are passed (#14050) + * fix: do not retain span logger created with index set initialized at query time (#14027) + * chore: [k218] chore(ci): fix failing arm builds (#14023) + * feat: Add initial support for a kafka-based ingest path (#13992) + * fix(detected_labels): Add matchers to get labels from store" (#14012) + * feat: add _extracted suffix to detected fields conflicts (#13993) + * fix: Propagate headers/warnings/stats from quantile downstreams (#13881) + * chore: update dskit and thanos/objstore (#13998) + * fix(deps): update module github.com/efficientgo/core to v1.0.0-rc.3 (#14001) + * fix(deps): update module github.com/hashicorp/consul/api to v1.29.4 (#14002) + * chore(deps): update anchore/sbom-action action to v0.17.2 (#13985) + * fix(deps): update module github.com/baidubce/bce-sdk-go to v0.9.188 (#14000) + * chore: Update nginx-unprivileged (#13978) + * chore(blooms)!: Remove bloom compactor component (#13969) + * docs: Update HTTP API docs for limit (#13987) + * fix: sanatize structured metadata at query time (#13983) + * chore: Rename `HeapIterator` to `MergeEntryIterator` (#13975) + * perf: Avoid looking up unnecessary TSDB symbols during Volume API (#13960) + * chore: Update kiwigrid/k8s-sidecar (#13979) + * chore(jsonnet)!: convert read statefulset into deployment for loki-simple-scalable (#13977) + * chore(jsonnet): Add backend component to loki-simple-scalable jsonnet (#13976) + * chore(docs): Rewrite query acceleration docs (#13965) + * fix(deps): update module github.com/gorilla/websocket to v1.5.3 (#13873) + * fix(detected labels): response when store label values are empty (#13970) + * feat: Limit to block ingestion until configured date (#13958) + * chore(deps): update terraform aws to v5 (#13961) + * feat: ability to ignore cache for volume queries (#13945) + * chore(deps): update terraform google to v5 (#13962) + * fix(deps): update module github.com/ncw/swift to v2 (#13951) + * fix(deps): update module github.com/tonistiigi/fifo to v1 (#13952) + * chore(deps): update fluent/fluent-bit docker tag (#13843) + * fix: Read full buffer from storage when fetching a range (#13948) + * fix(deps): update module github.com/fsouza/fake-gcs-server to v1.47.7 (#13935) + * chore(deps): update chunks/segments inspect dependencies (#13936) + * fix(cloud-mixin): Attribute OTLP route correctly to write path (#13943) + * chore: make mixin range interval configurable (#13925) + * chore(deps): lamba-promtail, move back to al2, update krb5-libs (#13939) + * chore(deps): LambdaPromtail - Bump to AmazonLinux 2023 (#13938) + * fix(deps): update module github.com/baidubce/bce-sdk-go to v0.9.187 (#13933) + * fix(deps): update module github.com/oschwald/geoip2-golang to v1.11.0 (#13934) + * fix: record datasample queries are limited query type (#13930) + * chore: log the query from the request when we're unable to get a result from the results cache (#13915) + * fix: Improve execution speed for queries with label filters (#13922) + * chore(deps): update dskit 20240819 (#13924) + * feat(operator): Enable leader-election (#13760) + * fix: split the error and agg metric cases for clarity (#13913) + * chore(deps): Update dependencies, build version, and go version for lambda-promtail (#13904) + * feat: aggregate byte and count metrics (#13731) + * chore: Update to labeler v5 (#13911) + * fix(deps): update module golang.org/x/time to v0.6.0 (#13910) + * chore(deps): update terraform random to v3.6.2 (#13909) + * chore(deps): update dependabot/fetch-metadata action to v2 (#13908) + * chore(deps): update ruby docker tag to v3.3.4 (#13907) + * fix(deps): update module github.com/ibm/go-sdk-core/v5 to v5.17.4 (#13892) + * fix(deps): update module github.com/ibm/ibm-cos-sdk-go to v1.11.0 (#13893) + * fix: Adjust tailer loop criteria so it is actually re-tested (#13906) + * chore: remove unused pattern tokenization form Loki (#13783) + * chore(deps): update anchore/sbom-action action to v0.17.1 (#13895) + * fix: Read "404" as object not exist (#13901) + * chore(deps): Revert "chore(deps): update actions/labeler action to v5" (#13899) + * chore(deps): update actions/labeler action to v5 (#13894) + * chore(deps): update azure/setup-helm action to v4 (#13890) + * fix(deps): update module github.com/mattn/go-ieproxy to v0.0.12 (#13876) + * chore(deps): update actions/setup-python action to v5 (#13889) + * chore(deps): update actions/checkout action to v4 (#13888) + * fix(deps): update module github.com/workiva/go-datastructures to v1.1.5 (#13885) + * chore(deps): update terraform aws to ~> 4.67.0 (#13886) + * feat(lambda-promtail): build lambda with zip file (#13787) + * fix(deps): update module github.com/schollz/progressbar/v3 to v3.14.6 (#13884) + * fix: Handle EOF when reading from some obj stores (#13868) + * fix(deps): update module github.com/klauspost/pgzip to v1.2.6 (#13874) + * chore(deps): update alpine docker tag to v3.20.2 (#13882) + * fix: flaky test blockPlansForGaps (#13743) + * fix(deps): update module github.com/azure/go-autorest/autorest/adal to v0.9.24 (#13862) + * docs: Recommended quickstart changes + Upgrade (#13747) + * chore: fix some comments (#13830) + * fix(deps): update module github.com/docker/docker to v27.1.2+incompatible (#13872) + * fix(deps): update module github.com/gogo/googleapis to v1.4.1 (#13871) + * fix(deps): update module github.com/felixge/fgprof to v0.9.4 (#13870) + * fix(deps): update module github.com/azure/go-autorest/autorest/azure/auth to v0.5.13 (#13863) + * fix(deps): update module github.com/datadog/sketches-go to v1.4.6 (#13865) + * chore: remove initial metric aggregation experiment (#13729) + * fix(deps): update module github.com/baidubce/bce-sdk-go to v0.9.186 (#13864) + * fix(deps): update module github.com/aliyun/aliyun-oss-go-sdk to v2.2.10+incompatible (#13861) + * chore(deps): update grafana/loki-build-image docker tag to v0.33.6 (#13859) + * chore(deps): update helm/chart-testing-action action to v2.6.1 (#13855) + * chore(deps): update grafana/promtail docker tag to v1.6.1 (#13851) + * chore(deps): update grafana/promtail docker tag to v2.9.10 (#13854) + * chore(deps): update dependency go to v1.22.6 (#13842) + * chore: Update loki build image to go 1.22.6 (#13857) + * chore: manual changelog backport (#13852) + * chore(deps): update grafana/loki docker tag to v2.9.10 (#13848) + * chore(deps): update golang docker tag to v1.22.6 (#13847) + * chore(deps): update grafana/loki-build-image docker tag to v0.33.5 (#13849) + * chore(ci): Update yaml file `./production/helm/loki/values.yaml` (+1 other) (#13832) + * chore: [main] chore(release-3.1.x): release 3.1.1 (#13817) + * fix(deps): update github.com/grafana/jsonparser digest to ea80629 (#13814) + * fix(ci): fixed release-please manifest (#13810) + * fix(deps): update github.com/c2h5oh/datasize digest to aa82cc1 (#13807) + * fix(deps): update github.com/docker/go-plugins-helpers digest to 45e2431 (#13808) + * fix(deps): update github.com/axiomhq/hyperloglog digest to af9851f (#13806) + * chore(deps): update github.com/grafana/regexp digest to a468a5b (#13805) + * chore: Turn off renovate on non-main branches (#13803) + * fix(ci): add cleanup step into job `dist` (#13801) + * chore: Add metastore client as dep for rf1 querier & ignore auth for ListBlocks (#13786) + * fix(deps): update module golang.org/x/text to v0.17.0 (main) (#13794) + * fix(operator): Don't overwrite annotations for LokiStack ingress resources (#13708) + * fix: panic when parsing and extracting JSON key values (#13790) + * feat(loki): add ability to disable AWS S3 dualstack endpoints usage (#13785) + * fix(helm): fixed memcached and provisioner templates (#13788) + * chore: Remove unused stream index from RF1 ingester (#13758) + * fix: Include whitespaces in extracted tokens (#13738) + * chore(deps): update module golang.org/x/net to v0.23.0 [security] (main) (#13763) + * fix(deps): update module github.com/docker/docker to v27.1.1+incompatible [security] (main) (#13762) + * feat: upgrade prometheus (#13671) + * fix(break): helm: Fix how we set imagePullSecrets for enterprise-gateway and admin-api. (#13761) + * chore(helm-chart): added SSE config into AWS storage config (#13746) + * fix: try reading chunks which have incorrect offset for blocks (#13720) + * docs: Update the Visualize topic (#13742) + * feat: Introduce wal segment read path. (#13695) + * build: Update loki-build-image to Alpine 3.20.2 (#13744) + * fix: ast left cycular reference result in oom (#13501) + * docs: fix broken links due to Alloy docs reorg (#13715) + * docs: rewrite quickstart with Killercoda metadata (#13234) + * chore: fix some comments (#13724) + * feat(blooms): Add series & chunks per block metrics (#13721) + * fix: Use elements match in gapsBetweenTSDBsAndMetas test (#13722) + * feat: Ingester Stream Limit Improvements (#13532) + * chore: add service_name label earlier in the ingestion pipeline (#13702) + * fix: protect ruler remote-write overrides map with a mutex when creating new appenders (#13676) + * docs: Late review comments and linting (#13714) + * docs: Update Observability topic (#13323) + * chore(lint-error): remove unused `stepCount` in `engine.go` (#13709) + * chore: add congestion control to AWS (#13691) + * chore: log stats around chunks being flushed (#13699) + * chore: treat datasample queries the same as limited queries (#13700) + * fix: fixed typo in ruler URL (#13692) + * chore: Use boltdb Batch API for metastore writes (#13693) + * feat(operator): Add alert for discarded samples (#13512) + * fix(blooms): Ship chunkrefs in task payload (#13677) + * chore: use native histogram for metastore_request_duration_seconds (#13680) + * feat: instrument failed chunk encoding/decoding (#13684) + * docs: State limitations of bloom filters (#13673) + * fix: add missing flush op timeout (#13679) + * fix: Handle block offset exceeding chunk length in memchunk.go (#13661) + * feat: Ignore empty streams in distributor if all entries fail validation (#13674) + * fix: fix a bug where AppendRequest with no entries triggers flush (#13672) + * docs: Fixed link test (#13666) + * fix: special case the return values from a sharded first/last_over_time query (#13578) + * fix(blooms): Improve error wrap to make ignoreNotFound work when fetching blocks (#13656) + * docs: Send Data Alloy page + Interactive Examples (#13367) + * chore(helm): fix comment in values.yml (#13638) + * chore: Remove client header interceptors from metastore client (#13659) + * feat: add loki_ingester_rf1_segment_age_seconds metric (#13653) + * feat(detected-labels): remove cardinality filter (#13652) + * fix(helm): removed helm test (#13651) + * chore: move timestamps into SegmentWriter (#13644) + * feat: Implement GetObjectRange for all storage providers (#13650) + * fix: remove trailing backtick in verify-config for Loki 3.0 (#13640) + * fix: remove limit middleware for `detected_labels` (#13643) + * feat: Add baseline rf1 querier implementation (#13639) + * feat: remove mutexes from wal.SegmentWriter (#13641) + * feat(rf1): Add query path for the metastore (#13636) + * feat: Calculate the age of a WAL segment (#13637) + * feat(lambda-promtail): Adding S3 log parser support for AWS GuardDuty (#13148) + * fix(helm): fix imagePullSecrets for statefulset-results-cache (#13051) + * feat(rf1): Store index ref in metastore (#13613) + * fix(loki-mixin): Fix latency panel for Index Gateway (#13629) + * fix(blooms): Use correct key to populate blockscache at startup (#13624) + * fix: Keep blocks referenced by newer metas (#13614) + * fix(blooms): Cleanup temp blockdir in bloom compactor (#13622) + * chore(deps): update nginx docker tag to v1.27 (main) (#13620) + * fix(deps): update module github.com/gorilla/mux to v1.8.1 (main) (#13618) + * chore(deps): update confluentinc/cp-kafka docker tag to v6.2.15 (main) (#11283) + * docs: small update to doc loki-http-api.md (#13594) + * fix(deps): update module github.com/cespare/xxhash/v2 to v2.3.0 (main) (#13615) + * feat(structured-metadata-api): add structured metadata to `/detected_fields` API (#13604) + * fix: remove retries on the stats handlers because they already retry (#13608) + * feat: Instrument rf1 write path with tracing (#13599) + * feat: Instrument metastore GRPC calls (#13598) + * chore: Remove excessive logging from bloom gateway (#13603) + * docs: add docs comparing native otlp ingestion vs loki exporter (#13574) + * fix: fix retry code to handle grpc status codes. updated newer stats retries to be wrapped with spans (#13592) + * fix: add a retry middleware to all the stats handlers (#13584) + * docs: added video for fluentd and fluent bit (#13579) + * feat: lambda-promtail; ensure messages to Kinesis are usable by refactoring parsing of KinesisEvent to match parsing of CWEvents + code cleanup (#13098) + * chore: do not shard log queries with empty filter (#13568) + * chore: shard limited queries with a fixed sharding factor (#13576) + * chore: replace pkg/errors with errors (#13583) + * chore: replace pkg/errors with errors (#13582) + * chore: replace pkg/errors with errors (#13581) + * feat: Bootstrap metastore for wal segments (#13550) + * fix(deps): update module github.com/docker/docker to v25.0.5+incompatible [security] (main) (#12279) + * fix(blooms): Fix eviction of multiple blockcache items (#13573) + * feat: Track when builders are doing work with a gauge (#13570) + * docs: Deprecated Notice for Grafana Agent + Updated Helm Concepts (#13461) + * fix: incorrect pod matcher for compactor in mixin when using ssd mode (#12846) + * build: Loki build and Docker updates (#13325) + * fix(operator): Set object storage for delete requests when using retention (#13562) + * feat: Update doc-validator version (#13558) + * fix: Dedup pattern tokens on output (#13534) + * fix: Retain original values in logfmt pattern tokenizer (#13535) + * fix: Fix panic in ingester.go (#13557) + * chore: Rename PendingItem to PendingSegment and clean up flush.go (#13554) + * chore: Remove redundant comments (#13553) + * chore: Use filesystem backed writer for blooms (#13522) + * fix: Fix log line for fingerprint not found (#13555) + * feat: Add CLI to inspect RF=1 WAL segments (#13552) + * chore: Clean up old streams periodically in RF-1 ingester (#13511) + * chore: refactor WAL Manager (#13551) + * chore: Clean up manager_test.go (#13549) + * chore: Use github.com/coder/quartz instead of time (#13542) + * chore(deps): update module github.com/azure/azure-sdk-for-go/sdk/azidentity to v1.6.0 [security] (main) (#13434) + * chore: Remove unused const (#13544) + * chore: Remove size and duration logs now we have metrics (#13547) + * chore: Fix not ready error message in RF-1 Ingester (#13546) + * fix: Fixes span name of serializeRounTripper (#13541) + * chore: Use pool of bytes.Buffer instead of io.Pipe (#13543) + * feat: Remove flush loop and queue from Ingester RF-1 (#13538) + * fix(helm): Update yaml file `./production/helm/loki/Chart.yaml` (+1 other) (#13392) + * feat(helm): Support alibabacloud oss in helm chart (#13441) + * fix(helm): Update yaml file `./production/helm/loki/values.yaml` (+1 other) (#13426) + * test: Add logging for empty blooms (#13537) + * fix(operator): Allow structured metadata only if V13 schema provided (#13463) + * feat: Add metrics for Ingester RF-1 (#13510) + * feat: WAL Manager configuration options (#13531) + * build(deps): bump golang.org/x/net from 0.22.0 to 0.23.0 in /cmd/chunks-inspect (#13433) + * docs: Add Explore Logs to Release Notes (#13529) + * fix: detected fields incorrect type bug (#13515) + * fix(blooms): Remove backoff from notify planner (#13506) + * fix(operator): Remove duplicate conditions from status (#13497) + * feat: improve placeholder replacement of byte sizes (#13508) + * chore: Improve test coverage of WAL Manager (#13498) + * chore: Remove unused metrics from Ingester-RF1 (#13499) + * fix: add logging to empty bloom (#13502) + * fix(blooms): skip empty blooms on reads (#13500) + * perf(blooms): Avoid tiny string allocations for insert cache (#13487) + * feat: downsample aggregated metrics (#13449) + * chore: Remove un-used errors from WAL Manager (#13496) + * chore: Small fixes to comments and ErrFull in manager.go (#13494) + * feat: Add metrics to WAL Manager (#13490) + * feat: Use WAL Manager (#13491) + * fix: Return empty vector instead of nil for empty evaluator. (#13485) + * fix(operator): Skip updating annotations for serviceaccounts (#13450) + * fix: Fix HPA ingester typo (#13158) + * refactor(blooms): Apply retention in planner (#13484) + * feat: WAL Manager (#13428) + * fix(query engine): Include lines with ts equal to end timestamp of the query range when executing range aggregations (#13448) + * docs: fix broken link (#13480) + * fix: Update Loki v3 Helm statefulset-ingester.yaml template (#13118) + * fix(operator): Support v3.1.0 in OpenShift dashboards (#13430) + * docs: Fix broken link (#13470) + * feat: RF1 improves replication stategy to support 1 replica (#13469) + * fix: Properly reset wal segment writer (#13468) + * feat(exporter): include boolean values in limit exporter (#13466) + * feat: Pattern ingesters add a limiter for high eviction rate (#13464) + * test: Add range aggregation test for instant queries (#13447) + * fix: Fix panic in BloomStore initialisation (#13457) + * docs: doc/promtail/journal: adds available labels paragraph (#11888) + * fix: Fixes pattern pruning stability (#13429) + * refactor(blooms): Improve task progress logging in builder (#13394) + * fix(gateway client): Fix nil pointer dereference panic when using ruler in ring mode (#13436) + * chore: Convert iterators in pattern module to `v2.Iterator` interface (#13407) + * docs: Add workaround instructions in upgrade guide for API changes (#13439) + * fix(log results cache): include pipeline wrapper disabled in cache key (#13328) + * feat(chunks-inspect): support structured metadata (#11506) + * feat(api)!: Fail log queries when executed on instant query endpoint (#13421) + * feat(operator): Update Loki operand to v3.1.0 (#13422) + * chore: Set memberlist func for ingester-rf1 init (#13424) + * fix: Remove query size limit for detected fields (#13423) + * chore: Refactor storage interface for rf1 (#13415) + * fix(operator): Watch for CredentialsRequests on CCOAuthEnv only (#13299) + * chore: use read-only index store for ingester RF1 (#13419) + * chore: Update CHANGELOG.md (#13417) + * feat: Drain uses different tokenizer based on log format (#13384) + * test: Fix flaky congestion test (#13410) + * feat(loki): Do not enforce max-query-bytes-read and max-querier-bytes-read in limited tripperware (#13406) + * chore: Improve performance of structured metadata (#13404) + * docs: update _index.md to reflect config file name and location change (#13390) + * fix: querier address in SingleBinary mode (#13297) + * feat: Use prefixed WAL storage path in Object Storage (#13377) + * chore: adjusted SegmentWriter to the reader conversion (#13342) + * feat: Ingester RF-1 (#13365) + * chore: Update Docker images to Go 1.22.5 (#13398) + * feat: exclude in pattern tokens (#13397) + * build: Update Loki build image to 0.33.4 (#13396) + * feat: exclude and from creating new tokens in patterns (#13395) + * perf: Limit tokens per pattern to 128 (#13376) + * fix(blooms): Delete outdated metas during planning (#13363) + * chore: Make dedicated iterator package (#13273) + * fix(blooms): Suppress error from resolving server addresses for blocks (#13385) + * feat(operator): Add support for the volume API (#13369) + * docs: Loki 3.1 release notes (#13386) + * docs: update Promtail doc (#13330) + * docs: fix broken link and add alt text (#13322) + * docs: More Alloy updates (#13336) + * perf: Gather aggregate per-line and per-tenant metrics for Drain patterns (#13368) + * chore(deps): update module github.com/azure/azure-sdk-for-go/sdk/azidentity to v1.6.0 [security] (main) (#13199) + * fix(blooms): ensure tokenizer cache is reset between series (#13370) + * chore(deps): update module github.com/hashicorp/go-retryablehttp to v0.7.7 [security] (main) (#13304) + * refactor(blooms): Better task naming (#13361) + * docs: Updated bucket names and added warning (#13347) + * refactor(blooms): Fix and improve build metrics (#13360) + * fix(sharding): use without() grouping when merging `avg_over_time` shard results (#12176) + * fix(retry): fix retries when using protobuf encoding (#13316) + * docs: Label filter expression: Change unit suffix suffix to proper case whe… (#13344) + * fix: support multi-zone ingesters when converting global to local limits for streams in limiter.go (#13321) + * perf: Prune unused pattern branches (#13329) + * fix(blooms): Remove unused arg (#13343) + * feat: convert WalSegmentWriter to io.ReadSeeker (#13340) + * fix(blooms): Minor fixes and improvements for testing in dev (#13341) + * fix: stream ownership check (#13314) + * refactor: Introduce context cause to our code (#13224) + * refactor(blooms): more easily testable day partitioning (#13331) + * chore(blooms): Various minor code cleanups (#13332) + * feat: Collect duplicate log line metrics (#13084) + * fix: Lint issues after merge to main (#13326) + * refactor(blooms): Implement retry in builder (#13306) + * refactor(blooms): Do not use sleeps on integration test (#13308) + * docs: Clarify Unit Requirement for Duration Comparison in Label Values (#13318) + * chore(mempool): Wait for buffer instead of returning error (#13298) + * docs: Update configuration.md (#13309) + * docs: Replace instances of k6.io/docs with grafana.com/docs/k6 (#13302) + * fix(blooms): Fix panic in bloom gateway (#13303) + * perf(blooms): always return bloom pages to allocator (#13288) + * refactor(blooms): Bloom building integration test (#13296) + * feat(wal): Benchmark and improve WAL writes using Reset. (#13272) + * feat(helm): Make gateway container port configurable. (#13294) + * perf(mempool): Replace `sync.Mutex` with `sync.Once` (#13293) + * fix(blooms): ignores bloom filtering errors in bounded shard query planning (#13285) + * perf(blooms): mempool no longer zeroes out buffers unnecessarily (#13282) + * fix(blooms): improves mempool metrics (#13283) + * refactor: Remove unnecessary spanlogger usage (#13255) + * feat: Add settings for cpu/mutex/block profiling options (#13278) + * chore(index-gateway): Improve instrumentation of index download/sync (#13194) + * feat(ingester): Smooth out chunk flush operations (#9994) + * chore(index-gateway): Download then extract in separate steps (#13202) + * feat(wal): Add sizing information to writer and reader. (#13267) + * fix: remove tenant label tagging from profiles to reduce cardinality (#13270) + * docs: Fix typos and style (#13230) + * chore: Update upgrade docs for -ruler.alertmanager-use-v2 (#13264) + * docs: fix typo causing broken link (#13258) + * perf: Re-introduce fixed size memory pool for bloom querier (#13172) + * refactor(blooms): Add metrics for per-tenant tasks progress to planner (#13078) + * feat: Introduce a new Object Storage WAL format. (#13253) + * feat: collect and serve pre-aggregated bytes and counts (#13020) + * chore: Change default version to Alertmanager APIv2 (#13263) + * feat: flush not owned streams (#13254) + * fix(mixin): various latency panels in operational dashboard should have ms unit type instead of seconds (#13260) + * feat: improve Owned Streams feature observability (#13232) + * fix(helm): fix extraObjects (#13107) + * fix: update fixed limit once streams ownership re-checked (#13231) + * fix: separates directory creation from permission checks (#13248) + * feat: Added getting started video for ingesting Otel logs (#13226) + * fix: Redo ingester profile tagging (#13239) + * docs: Update timestamp topic (#13207) + * docs: Update OTLP endpoint (#13235) + * ci: fix accidentally skipped package failures (#13240) + * chore: Checkin missing etcd.io/bbolt vendor files (#13228) + * chore: Update go.etcd.io/bbolt to v1.3.8 (#13227) + * fix: Init internal server log along with loki's server instance (#13221) + ------------------------------------------------------------------- Mon Sep 16 10:20:22 UTC 2024 - Michal Hrusecky diff --git a/loki.spec b/loki.spec index 0242367..802191d 100644 --- a/loki.spec +++ b/loki.spec @@ -21,7 +21,7 @@ %global promtail_datadir /var/lib/promtail Name: loki -Version: 3.1.1+git.1723126694.89fe788d +Version: 3.2.1 Release: 0 Summary: Loki: like Prometheus, but for logs License: Apache-2.0 @@ -39,6 +39,8 @@ BuildRequires: golang-packaging BuildRequires: systemd-devel BuildRequires: golang(API) = 1.21 Requires: logcli = %{version} +Requires(pre): group(loki) +Requires(pre): user(loki) Requires: group(loki) Requires: user(loki) Requires(post): %fillup_prereq @@ -83,13 +85,16 @@ This package contains the lokitool command-line tool. %build %define buildpkg github.com/grafana/loki/pkg/build +DATE_FMT="+%%Y-%%m-%%dT%%H:%%M:%%SZ" +BUILD_DATE=$(date -u -d "@${SOURCE_DATE_EPOCH}" "${DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "${DATE_FMT}" 2>/dev/null || date -u "${DATE_FMT}") + export CGO_ENABLED=0 export GOFLAGS="-mod=vendor -buildmode=pie -tags=netgo" -export GOLDFLAGS="-s -w -X %{buildpkg}.Version=%{version} \ - -X %{buildpkg}.Revision=%{release} \ - -X %{buildpkg}.Branch=NA \ - -X %{buildpkg}.BuildUser=NA \ - -X %{buildpkg}.BuildDate=NA" +export GOLDFLAGS="-X %{buildpkg}.Version=%{version} \ + -X %{buildpkg}.Revision=v%{version} \ + -X %{buildpkg}.Branch=main \ + -X %{buildpkg}.BuildUser=openSUSE \ + -X %{buildpkg}.BuildDate=${BUILD_DATE}" go build -ldflags="$GOLDFLAGS" ./cmd/loki go build -ldflags="$GOLDFLAGS" ./cmd/logcli diff --git a/proper-data-directories.patch b/proper-data-directories.patch index 7a4dce7..3a935a0 100644 --- a/proper-data-directories.patch +++ b/proper-data-directories.patch @@ -1,8 +1,8 @@ -Index: loki-3.1.1+git.1723126694.89fe788d/cmd/loki/loki-local-config.yaml +Index: loki/cmd/loki/loki-local-config.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/cmd/loki/loki-local-config.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/cmd/loki/loki-local-config.yaml -@@ -6,11 +6,11 @@ server: +--- loki.orig/cmd/loki/loki-local-config.yaml ++++ loki/cmd/loki/loki-local-config.yaml +@@ -8,11 +8,11 @@ server: common: instance_addr: 127.0.0.1 @@ -17,10 +17,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/cmd/loki/loki-local-config.yaml replication_factor: 1 ring: kvstore: -Index: loki-3.1.1+git.1723126694.89fe788d/docs/sources/operations/storage/filesystem.md +Index: loki/docs/sources/operations/storage/filesystem.md =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/docs/sources/operations/storage/filesystem.md -+++ loki-3.1.1+git.1723126694.89fe788d/docs/sources/operations/storage/filesystem.md +--- loki.orig/docs/sources/operations/storage/filesystem.md ++++ loki/docs/sources/operations/storage/filesystem.md @@ -13,7 +13,7 @@ Very simply it stores all the objects (c ```yaml storage_config: @@ -30,10 +30,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/docs/sources/operations/storage/filesy ``` A folder is created for every tenant all the chunks for one tenant are stored in that directory. -Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-cloudflare.yaml +Index: loki/clients/cmd/promtail/promtail-cloudflare.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-cloudflare.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-cloudflare.yaml +--- loki.orig/clients/cmd/promtail/promtail-cloudflare.yaml ++++ loki/clients/cmd/promtail/promtail-cloudflare.yaml @@ -3,7 +3,7 @@ server: grpc_listen_port: 0 @@ -43,10 +43,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-cloudfla clients: - url: http://localhost:3100/loki/api/v1/push -Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-docker-config.yaml +Index: loki/clients/cmd/promtail/promtail-docker-config.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-docker-config.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-docker-config.yaml +--- loki.orig/clients/cmd/promtail/promtail-docker-config.yaml ++++ loki/clients/cmd/promtail/promtail-docker-config.yaml @@ -3,7 +3,7 @@ server: grpc_listen_port: 0 @@ -56,10 +56,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-docker-c clients: - url: http://loki:3100/loki/api/v1/push -Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-config.yaml +Index: loki/clients/cmd/promtail/promtail-local-config.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-local-config.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-config.yaml +--- loki.orig/clients/cmd/promtail/promtail-local-config.yaml ++++ loki/clients/cmd/promtail/promtail-local-config.yaml @@ -3,7 +3,7 @@ server: grpc_listen_port: 0 @@ -69,10 +69,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-co clients: - url: http://localhost:3100/loki/api/v1/push -Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-limit-config.yaml +Index: loki/clients/cmd/promtail/promtail-local-limit-config.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-local-limit-config.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-limit-config.yaml +--- loki.orig/clients/cmd/promtail/promtail-local-limit-config.yaml ++++ loki/clients/cmd/promtail/promtail-local-limit-config.yaml @@ -3,7 +3,7 @@ server: grpc_listen_port: 0 @@ -82,10 +82,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-li clients: - url: http://localhost:3100/loki/api/v1/push -Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-pubsub-config.yaml +Index: loki/clients/cmd/promtail/promtail-local-pubsub-config.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-local-pubsub-config.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-pubsub-config.yaml +--- loki.orig/clients/cmd/promtail/promtail-local-pubsub-config.yaml ++++ loki/clients/cmd/promtail/promtail-local-pubsub-config.yaml @@ -3,7 +3,7 @@ server: grpc_listen_port: 0 @@ -95,10 +95,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-local-pu clients: - url: http://localhost:3100/loki/api/v1/push -Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/config/build_test.go +Index: loki/operator/internal/manifests/internal/config/build_test.go =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/operator/internal/manifests/internal/config/build_test.go -+++ loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/config/build_test.go +--- loki.orig/operator/internal/manifests/internal/config/build_test.go ++++ loki/operator/internal/manifests/internal/config/build_test.go @@ -40,7 +40,7 @@ common: instance_port: 9095 compactor: @@ -108,7 +108,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c frontend: tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100 compress_responses: true -@@ -165,8 +165,8 @@ server: +@@ -164,8 +164,8 @@ server: log_level: info storage_config: boltdb_shipper: @@ -118,8 +118,8 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c + cache_location: /var/lib/loki/index_cache cache_ttl: 24h resync_interval: 5m - shared_store: s3 -@@ -298,7 +298,7 @@ common: + index_gateway_client: +@@ -297,7 +297,7 @@ common: instance_port: 9095 compactor: compaction_interval: 2h @@ -128,7 +128,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c frontend: tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100 compress_responses: true -@@ -423,8 +423,8 @@ server: +@@ -421,8 +421,8 @@ server: log_level: info storage_config: boltdb_shipper: @@ -138,8 +138,8 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c + cache_location: /var/lib/loki/index_cache cache_ttl: 24h resync_interval: 5m - shared_store: s3 -@@ -725,7 +725,7 @@ common: + index_gateway_client: +@@ -723,7 +723,7 @@ common: instance_port: 9095 compactor: compaction_interval: 2h @@ -148,7 +148,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c frontend: tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100 compress_responses: true -@@ -878,15 +878,15 @@ ruler: +@@ -875,15 +875,15 @@ ruler: min_backoff: 30ms max_backoff: 100ms wal: @@ -167,7 +167,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c ring: kvstore: store: memberlist -@@ -904,8 +904,8 @@ server: +@@ -901,8 +901,8 @@ server: log_level: info storage_config: boltdb_shipper: @@ -177,8 +177,8 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c + cache_location: /var/lib/loki/index_cache cache_ttl: 24h resync_interval: 5m - shared_store: s3 -@@ -975,7 +975,7 @@ overrides: + index_gateway_client: +@@ -972,7 +972,7 @@ overrides: }, Ruler: Ruler{ Enabled: true, @@ -187,7 +187,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c EvaluationInterval: "1m", PollInterval: "1m", AlertManager: &AlertManagerConfig{ -@@ -1084,7 +1084,7 @@ common: +@@ -1081,7 +1081,7 @@ common: instance_port: 9095 compactor: compaction_interval: 2h @@ -196,7 +196,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c frontend: tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100 compress_responses: true -@@ -1237,15 +1237,15 @@ ruler: +@@ -1233,15 +1233,15 @@ ruler: min_backoff: 30ms max_backoff: 100ms wal: @@ -215,7 +215,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c ring: kvstore: store: memberlist -@@ -1263,8 +1263,8 @@ server: +@@ -1259,8 +1259,8 @@ server: log_level: info storage_config: boltdb_shipper: @@ -225,8 +225,8 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c + cache_location: /var/lib/loki/index_cache cache_ttl: 24h resync_interval: 5m - shared_store: s3 -@@ -1334,7 +1334,7 @@ overrides: + index_gateway_client: +@@ -1330,7 +1330,7 @@ overrides: }, Ruler: Ruler{ Enabled: true, @@ -235,7 +235,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c EvaluationInterval: "1m", PollInterval: "1m", AlertManager: &AlertManagerConfig{ -@@ -1444,7 +1444,7 @@ common: +@@ -1440,7 +1440,7 @@ common: instance_port: 9095 compactor: compaction_interval: 2h @@ -244,7 +244,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c frontend: tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100 compress_responses: true -@@ -1610,15 +1610,15 @@ ruler: +@@ -1605,15 +1605,15 @@ ruler: min_backoff: 30ms max_backoff: 100ms wal: @@ -263,7 +263,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c ring: kvstore: store: memberlist -@@ -1636,8 +1636,8 @@ server: +@@ -1631,8 +1631,8 @@ server: log_level: info storage_config: boltdb_shipper: @@ -273,8 +273,8 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c + cache_location: /var/lib/loki/index_cache cache_ttl: 24h resync_interval: 5m - shared_store: s3 -@@ -1707,7 +1707,7 @@ overrides: + index_gateway_client: +@@ -1702,7 +1702,7 @@ overrides: }, Ruler: Ruler{ Enabled: true, @@ -283,7 +283,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c EvaluationInterval: "1m", PollInterval: "1m", AlertManager: &AlertManagerConfig{ -@@ -1834,7 +1834,7 @@ common: +@@ -1829,7 +1829,7 @@ common: instance_port: 9095 compactor: compaction_interval: 2h @@ -292,7 +292,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c retention_enabled: true retention_delete_delay: 4h retention_delete_worker_count: 50 -@@ -1967,8 +1967,8 @@ server: +@@ -1962,8 +1962,8 @@ server: log_level: info storage_config: boltdb_shipper: @@ -302,8 +302,8 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c + cache_location: /var/lib/loki/index_cache cache_ttl: 24h resync_interval: 5m - shared_store: s3 -@@ -2173,7 +2173,7 @@ common: + index_gateway_client: +@@ -2168,7 +2168,7 @@ common: instance_port: 9095 compactor: compaction_interval: 2h @@ -312,7 +312,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c frontend: tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100 compress_responses: true -@@ -2352,15 +2352,15 @@ ruler: +@@ -2346,15 +2346,15 @@ ruler: min_backoff: 30ms max_backoff: 100ms wal: @@ -331,7 +331,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c ring: kvstore: store: memberlist -@@ -2378,8 +2378,8 @@ server: +@@ -2372,8 +2372,8 @@ server: log_level: info storage_config: boltdb_shipper: @@ -341,8 +341,8 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c + cache_location: /var/lib/loki/index_cache cache_ttl: 24h resync_interval: 5m - shared_store: s3 -@@ -2449,7 +2449,7 @@ overrides: + index_gateway_client: +@@ -2443,7 +2443,7 @@ overrides: }, Ruler: Ruler{ Enabled: true, @@ -351,7 +351,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c EvaluationInterval: "1m", PollInterval: "1m", AlertManager: &AlertManagerConfig{ -@@ -2592,7 +2592,7 @@ common: +@@ -2586,7 +2586,7 @@ common: instance_port: 9095 compactor: compaction_interval: 2h @@ -360,7 +360,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c frontend: tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100 tail_tls_config: -@@ -2767,8 +2767,8 @@ server: +@@ -2760,8 +2760,8 @@ server: log_level: info storage_config: boltdb_shipper: @@ -370,8 +370,8 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c + cache_location: /var/lib/loki/index_cache cache_ttl: 24h resync_interval: 5m - shared_store: s3 -@@ -2938,7 +2938,7 @@ common: + index_gateway_client: +@@ -2931,7 +2931,7 @@ common: instance_port: 9095 compactor: compaction_interval: 2h @@ -380,7 +380,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c frontend: tail_proxy_url: http://loki-querier-http-lokistack-dev.default.svc.cluster.local:3100 compress_responses: true -@@ -3117,15 +3117,15 @@ ruler: +@@ -3109,15 +3109,15 @@ ruler: min_backoff: 30ms max_backoff: 100ms wal: @@ -399,7 +399,7 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c ring: kvstore: store: memberlist -@@ -3143,8 +3143,8 @@ server: +@@ -3135,8 +3135,8 @@ server: log_level: info storage_config: boltdb_shipper: @@ -409,8 +409,8 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c + cache_location: /var/lib/loki/index_cache cache_ttl: 24h resync_interval: 5m - shared_store: s3 -@@ -3290,7 +3290,7 @@ overrides: + index_gateway_client: +@@ -3282,7 +3282,7 @@ overrides: }, Ruler: Ruler{ Enabled: true, @@ -419,10 +419,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/internal/c EvaluationInterval: "1m", PollInterval: "1m", -Index: loki-3.1.1+git.1723126694.89fe788d/clients/pkg/promtail/promtail_test.go +Index: loki/clients/pkg/promtail/promtail_test.go =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/clients/pkg/promtail/promtail_test.go -+++ loki-3.1.1+git.1723126694.89fe788d/clients/pkg/promtail/promtail_test.go +--- loki.orig/clients/pkg/promtail/promtail_test.go ++++ loki/clients/pkg/promtail/promtail_test.go @@ -55,7 +55,7 @@ func TestPromtail(t *testing.T) { util_log.Logger = logger @@ -432,10 +432,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/clients/pkg/promtail/promtail_test.go positionsFileName := dirName + "/positions.yml" err := os.MkdirAll(dirName, 0o750) -Index: loki-3.1.1+git.1723126694.89fe788d/operator/docs/enhancements/ruler_support.md +Index: loki/operator/docs/enhancements/ruler_support.md =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/operator/docs/enhancements/ruler_support.md -+++ loki-3.1.1+git.1723126694.89fe788d/operator/docs/enhancements/ruler_support.md +--- loki.orig/operator/docs/enhancements/ruler_support.md ++++ loki/operator/docs/enhancements/ruler_support.md @@ -769,7 +769,7 @@ spec: volumeMounts: - name: "rules" @@ -454,10 +454,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/docs/enhancements/ruler_suppo /application/ns-a-recording-rule-a-kube-uid-b.yaml /infrastructure/ns-b-alerting-rule-b-kube-uid-c.yaml /infrastructure/ns-b-recording-rule-b-kube-uid-d.yaml -Index: loki-3.1.1+git.1723126694.89fe788d/pkg/logcli/client/file_test.go +Index: loki/pkg/logcli/client/file_test.go =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/pkg/logcli/client/file_test.go -+++ loki-3.1.1+git.1723126694.89fe788d/pkg/logcli/client/file_test.go +--- loki.orig/pkg/logcli/client/file_test.go ++++ loki/pkg/logcli/client/file_test.go @@ -20,8 +20,8 @@ func TestFileClient_QueryRangeLogQueries input := []string{ `level=info event="loki started" caller=main.go ts=1625995076`, @@ -480,10 +480,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/pkg/logcli/client/file_test.go `level=info event="loki ready" caller=main.go ts=1625996095`, } -Index: loki-3.1.1+git.1723126694.89fe788d/pkg/loki/config_wrapper_test.go +Index: loki/pkg/loki/config_wrapper_test.go =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/pkg/loki/config_wrapper_test.go -+++ loki-3.1.1+git.1723126694.89fe788d/pkg/loki/config_wrapper_test.go +--- loki.orig/pkg/loki/config_wrapper_test.go ++++ loki/pkg/loki/config_wrapper_test.go @@ -561,15 +561,15 @@ memberlist: fsConfig := `common: storage: @@ -504,10 +504,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/pkg/loki/config_wrapper_test.go // should remain empty assert.EqualValues(t, defaults.Ruler.StoreConfig.GCS, config.Ruler.StoreConfig.GCS) -Index: loki-3.1.1+git.1723126694.89fe788d/pkg/loki/loki_test.go +Index: loki/pkg/loki/loki_test.go =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/pkg/loki/loki_test.go -+++ loki-3.1.1+git.1723126694.89fe788d/pkg/loki/loki_test.go +--- loki.orig/pkg/loki/loki_test.go ++++ loki/pkg/loki/loki_test.go @@ -187,7 +187,7 @@ server: grpc_listen_port: %d common: @@ -517,10 +517,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/pkg/loki/loki_test.go ring: kvstore: store: inmemory -Index: loki-3.1.1+git.1723126694.89fe788d/production/ksonnet/loki/config.libsonnet +Index: loki/production/ksonnet/loki/config.libsonnet =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/production/ksonnet/loki/config.libsonnet -+++ loki-3.1.1+git.1723126694.89fe788d/production/ksonnet/loki/config.libsonnet +--- loki.orig/production/ksonnet/loki/config.libsonnet ++++ loki/production/ksonnet/loki/config.libsonnet @@ -374,7 +374,7 @@ }, @@ -530,10 +530,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/production/ksonnet/loki/config.libsonn enable_api: true, alertmanager_url: 'http://alertmanager.%s.svc.cluster.local/alertmanager' % $._config.namespace, enable_sharding: true, -Index: loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki-distributed/config.yml +Index: loki/production/nomad/loki-distributed/config.yml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/production/nomad/loki-distributed/config.yml -+++ loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki-distributed/config.yml +--- loki.orig/production/nomad/loki-distributed/config.yml ++++ loki/production/nomad/loki-distributed/config.yml @@ -113,7 +113,7 @@ ruler: enable_alertmanager_v2: true enable_api: true @@ -543,10 +543,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki-distributed/conf storage: type: local local: -Index: loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki-simple/config.yml +Index: loki/production/nomad/loki-simple/config.yml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/production/nomad/loki-simple/config.yml -+++ loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki-simple/config.yml +--- loki.orig/production/nomad/loki-simple/config.yml ++++ loki/production/nomad/loki-simple/config.yml @@ -64,7 +64,7 @@ ruler: enable_alertmanager_v2: true enable_api: true @@ -556,10 +556,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki-simple/config.ym storage: type: local local: -Index: loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki/config.yml +Index: loki/production/nomad/loki/config.yml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/production/nomad/loki/config.yml -+++ loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki/config.yml +--- loki.orig/production/nomad/loki/config.yml ++++ loki/production/nomad/loki/config.yml @@ -64,7 +64,7 @@ ruler: enable_alertmanager_v2: true enable_api: true @@ -569,10 +569,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/production/nomad/loki/config.yml storage: type: local local: -Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-journal.yaml +Index: loki/clients/cmd/promtail/promtail-journal.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/clients/cmd/promtail/promtail-journal.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-journal.yaml +--- loki.orig/clients/cmd/promtail/promtail-journal.yaml ++++ loki/clients/cmd/promtail/promtail-journal.yaml @@ -3,7 +3,7 @@ server: grpc_listen_port: 0 @@ -582,10 +582,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/clients/cmd/promtail/promtail-journal. clients: - url: http://localhost:3100/loki/api/v1/push -Index: loki-3.1.1+git.1723126694.89fe788d/docs/sources/operations/troubleshooting.md +Index: loki/docs/sources/operations/troubleshooting.md =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/docs/sources/operations/troubleshooting.md -+++ loki-3.1.1+git.1723126694.89fe788d/docs/sources/operations/troubleshooting.md +--- loki.orig/docs/sources/operations/troubleshooting.md ++++ loki/docs/sources/operations/troubleshooting.md @@ -35,7 +35,7 @@ Promtail yet. There may be one of many r them off. Here is what you can do: - Start Promtail after Loki, e.g., 60 seconds later. @@ -595,10 +595,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/docs/sources/operations/troubleshootin - Promtail is ignoring targets and isn't reading any logs because of a configuration issue. - This can be detected by turning on debug logging in Promtail and looking -Index: loki-3.1.1+git.1723126694.89fe788d/examples/promtail-heroku/config.yml +Index: loki/examples/promtail-heroku/config.yml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/examples/promtail-heroku/config.yml -+++ loki-3.1.1+git.1723126694.89fe788d/examples/promtail-heroku/config.yml +--- loki.orig/examples/promtail-heroku/config.yml ++++ loki/examples/promtail-heroku/config.yml @@ -4,7 +4,7 @@ server: log_level: "info" @@ -608,10 +608,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/examples/promtail-heroku/config.yml # This bit indicates what Loki instance to write the logs to. We’ll inject the # details and credentials through environment variables -Index: loki-3.1.1+git.1723126694.89fe788d/operator/hack/addons_dev.yaml +Index: loki/operator/hack/addons_dev.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/operator/hack/addons_dev.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/operator/hack/addons_dev.yaml +--- loki.orig/operator/hack/addons_dev.yaml ++++ loki/operator/hack/addons_dev.yaml @@ -87,7 +87,7 @@ spec: volumeMounts: - mountPath: /etc/promtail @@ -630,10 +630,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/hack/addons_dev.yaml server: http_listen_port: 3100 grpc_listen_port: 9095 -Index: loki-3.1.1+git.1723126694.89fe788d/operator/hack/addons_ocp.yaml +Index: loki/operator/hack/addons_ocp.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/operator/hack/addons_ocp.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/operator/hack/addons_ocp.yaml +--- loki.orig/operator/hack/addons_ocp.yaml ++++ loki/operator/hack/addons_ocp.yaml @@ -84,7 +84,7 @@ spec: volumeMounts: - mountPath: /etc/promtail @@ -652,10 +652,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/hack/addons_ocp.yaml server: http_listen_port: 3100 grpc_listen_port: 9095 -Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/var.go +Index: loki/operator/internal/manifests/var.go =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/operator/internal/manifests/var.go -+++ loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/var.go +--- loki.orig/operator/internal/manifests/var.go ++++ loki/operator/internal/manifests/var.go @@ -47,9 +47,9 @@ const ( storageVolumeName = "storage" rulePartsSeparator = "___" @@ -669,10 +669,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/operator/internal/manifests/var.go rulerContainerName = "loki-ruler" -Index: loki-3.1.1+git.1723126694.89fe788d/pkg/storage/hack/main.go +Index: loki/pkg/storage/hack/main.go =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/pkg/storage/hack/main.go -+++ loki-3.1.1+git.1723126694.89fe788d/pkg/storage/hack/main.go +--- loki.orig/pkg/storage/hack/main.go ++++ loki/pkg/storage/hack/main.go @@ -36,7 +36,7 @@ var ( func main() { cm := storage.NewClientMetrics() @@ -693,10 +693,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/pkg/storage/hack/main.go } schemaCfg := config.SchemaConfig{ -Index: loki-3.1.1+git.1723126694.89fe788d/pkg/storage/store_test.go +Index: loki/pkg/storage/store_test.go =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/pkg/storage/store_test.go -+++ loki-3.1.1+git.1723126694.89fe788d/pkg/storage/store_test.go +--- loki.orig/pkg/storage/store_test.go ++++ loki/pkg/storage/store_test.go @@ -51,7 +51,7 @@ var ( m runtime.MemStats ctx = user.InjectOrgID(context.Background(), "fake") @@ -715,10 +715,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/pkg/storage/store_test.go // go run -mod=vendor ./pkg/storage/hack/main.go // go test -benchmem -run=^$ -mod=vendor ./pkg/storage -bench=Benchmark_store_SelectSample -memprofile memprofile.out -cpuprofile cpuprofile.out func Benchmark_store_SelectSample(b *testing.B) { -Index: loki-3.1.1+git.1723126694.89fe788d/vendor/github.com/baidubce/bce-sdk-go/util/log/logger.go +Index: loki/vendor/github.com/baidubce/bce-sdk-go/util/log/logger.go =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/vendor/github.com/baidubce/bce-sdk-go/util/log/logger.go -+++ loki-3.1.1+git.1723126694.89fe788d/vendor/github.com/baidubce/bce-sdk-go/util/log/logger.go +--- loki.orig/vendor/github.com/baidubce/bce-sdk-go/util/log/logger.go ++++ loki/vendor/github.com/baidubce/bce-sdk-go/util/log/logger.go @@ -18,7 +18,7 @@ // log to file with rotating. It is safe to be called by multiple goroutines. // By using the package level function to use the default logger: @@ -737,10 +737,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/vendor/github.com/baidubce/bce-sdk-go/ ROTATE_SIZE_FILE_PREFIX = "rotating" ) -Index: loki-3.1.1+git.1723126694.89fe788d/examples/getting-started/loki-config.yaml +Index: loki/examples/getting-started/loki-config.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/examples/getting-started/loki-config.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/examples/getting-started/loki-config.yaml +--- loki.orig/examples/getting-started/loki-config.yaml ++++ loki/examples/getting-started/loki-config.yaml @@ -22,7 +22,7 @@ schema_config: prefix: index_ period: 24h @@ -757,10 +757,10 @@ Index: loki-3.1.1+git.1723126694.89fe788d/examples/getting-started/loki-config.y - working_directory: /tmp/compactor \ No newline at end of file + working_directory: /var/lib/loki/compactor -Index: loki-3.1.1+git.1723126694.89fe788d/production/docker/config/loki.yaml +Index: loki/production/docker/config/loki.yaml =================================================================== ---- loki-3.1.1+git.1723126694.89fe788d.orig/production/docker/config/loki.yaml -+++ loki-3.1.1+git.1723126694.89fe788d/production/docker/config/loki.yaml +--- loki.orig/production/docker/config/loki.yaml ++++ loki/production/docker/config/loki.yaml @@ -8,7 +8,7 @@ server: log_level: info