Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main branch #2

Merged
merged 126 commits into from
Dec 20, 2023
Merged

Merge main branch #2

merged 126 commits into from
Dec 20, 2023

Conversation

mariodietner
Copy link
Owner

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

owen-d and others added 30 commits November 17, 2023 13:04
Rebuilds tokenizers based on an iterable approach. This ends up being
significantly faster -- benchmarks below.

This PR doesn't remove the old tokenizers, just adds the new ones.
Revamping tokenizer consumers & removing the old variants can be done in
a separate PR.

Roughly, raw tokenizers complete in 66% of the time and chunkID prefixed
tokenizers in ~55-60% of the time.

```
pkg: github.com/grafana/loki/pkg/storage/bloom/v1
BenchmarkTokens/three/v1-10      	  134811	      8648 ns/op	       0 B/op	       0 allocs/op
BenchmarkTokens/three/v2-10      	  179797	      5728 ns/op	       0 B/op	       0 allocs/op
BenchmarkTokens/threeSkip1/v1-10 	  215822	      5260 ns/op	       0 B/op	       0 allocs/op
BenchmarkTokens/threeSkip1/v2-10 	  343784	      3514 ns/op	       0 B/op	       0 allocs/op
BenchmarkTokens/threeChunk/v1-10 	   82394	     14559 ns/op	       0 B/op	       0 allocs/op
BenchmarkTokens/threeChunk/v2-10 	  146973	      8138 ns/op	     128 B/op	       1 allocs/op
BenchmarkTokens/threeSkip1Chunk/v1-10      	  152475	      7878 ns/op	       0 B/op	       0 allocs/op
BenchmarkTokens/threeSkip1Chunk/v2-10      	  251373	      4776 ns/op	     128 B/op	       1 allocs/op
PASS
ok  	github.com/grafana/loki/pkg/storage/bloom/v1	10.206s
```
returns the list of chunks in the bloom which failed the test so we can
merge these results across blocks
Adds a few utilities for comparing fingerprints to blocks that cover a
specific fingerprint range. Will likely need to be refactored with more
comprehensive types, but the logic still applies.
…9884)

**What this PR does / why we need it**:
Currently, we perform compaction and apply retention in the same loop.
Although we have a flag for not applying retention every time we perform
compaction, we still see compaction getting blocked when processing some
intensive delete requests(processed while applying retention).

This PR separates out the compaction and retention to run in a separate
loop. I have added a table-locking feature to avoid compaction and
retention from processing the same tables at a time. However, compaction
and retention would treat locked tables differently, as explained below:
* When compaction sees a table is locked: It would skip the table and
move on to the following table. However, before skipping, it would check
if the table has any uncompacted files and increment the newly added
counter called `loki_compactor_skipped_compacting_locked_tables_total`
to track how often we are skipping compacting tables which have
uncompacted files.
* When retention sees a table is locked: It would wait for the lock to
be released since we can't skip any tables while processing delete
requests.

**Special notes for your reviewer**:
* The check for tables with uncompacted files looks for count > 1
because initially, we did not support per tenant index in
`boltdb-shipper`, so a table can have a single compacted multi-tenant
index file. In a rare case where we have a single file which was
supposed to be compacted away, it is okay to have a single uncompacted
file for a while. The aim here is to not block compaction for too long
in a large cell with too many uncompacted files.
* Retention only works on the compacted index, so we first compact down
any uncompacted files while applying retention.

**Checklist**
- [x] Tests updated

---------

Co-authored-by: Ashwanth <[email protected]>
…1243)

**What this PR does / why we need it**:
logging: Add extra metadata to inflight requests

This adds extra metadata (similar to what we have in `metrics.go`) but
for queries in in-flight (both started and retrying)

Changes:
    Adds following data
    1. Query Hash
    2. Start and End time
    3. Start and End delta
    4. Length of the query
5. Moved the helper util to `queryutil` package because of cyclic
dependencies with `logql` package.
   
**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:
Find the screenshots of log entries looks like (both in `retry.go` and
`roundtrip.go`)

![Screenshot 2023-11-16 at 13 01
32](https://github.com/grafana/loki/assets/3735252/177e97ed-6ee8-41dd-b088-2e4f49562ba0)
![Screenshot 2023-11-16 at 13 02
15](https://github.com/grafana/loki/assets/3735252/fb328a37-dbe3-483e-b083-f21327858029)

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [x] Tests updated
- [x] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

---------

Signed-off-by: Kaviraj <[email protected]>
…11263)

**What this PR does / why we need it**:
In PR #9884, we separated the retention loop from compaction to avoid
blocking compaction for too long due to some intensive delete requests.
Currently, we track retention and compaction using the same metrics.
This PR adds separate metrics for monitoring retention operation. I have
also updated the Retention dashboard to use the new metrics.
The changes in #10688 did not
propage the trace ID from the context. `Frontend.RoundTripGRPC` would
inject the trace ID into the request. That's not done in `Frontend.Do`.
This changes extends the `codec.EncodeRequest` to inject the trace ID
there. This is more inline with other metadata.
**What this PR does / why we need it**:
Removes all usage of v1 tokenizers, renames v2 to v1 since we never
released this in a production way.

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [ ] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)
**What this PR does / why we need it**:

In this PR, I fixed the grammatical mistake in an _index.md file.

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

Signed-off-by: Bilal Khan <[email protected]>
Co-authored-by: J Stickler <[email protected]>
**What this PR does / why we need it**:

Fixing the small typo in the provided example
[here](https://grafana.com/docs/loki/latest/setup/install/helm/configure-storage/#configure-storage).
This PR just updates the doc.

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

Co-authored-by: Michel Hollands <[email protected]>
…dex file names (#11277)

**What this PR does / why we need it**:
In PR #9884, we split the compaction and retention loop to run them
concurrently. Although we make sure we do not work on the same index
from compaction and retention loop, there is a chance that one could run
immediately after the other and finish quickly enough to build the index
with the same name as the previous one because in `boltdb-shipper`
index, we use epoch with `Seconds` precision while building the name of
the compacted index file. Since compaction uploads the new file first
and then deletes the old file, if the index is built with the same name,
we end up uploading the file and deleting it afterwards.

This PR fixes the issue by using ns precision for the timestamp in the
filenames.

**Special notes for your reviewer**:
This is not a problem for TSDB since we also add a checksum to the
filenames of the index during compaction.
**What this PR does / why we need it**:

This PR allows user to enable tracing in the new SSD setup and fixes
incorrect documentation because it is currently impossible to enable
tracing in this chart (cf.
https://github.com/grafana/loki/blob/766f27645d2610a36eaaca8418482b740ae14215/cmd/loki/main.go#L81)

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [x] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

---------

Signed-off-by: QuentinBisson <[email protected]>
…on (#11276)

Previously, the `calculatePrefix` function was used to generate the
token buffer used, but this wouldn't necessarily have enough space to
append the ngram afterwards without reallocating+copying the token
buffer. This PR ensures we allocate enough space for both prefix and
ngram in the token buffer.
**What this PR does / why we need it**:
Do not run retention loop when retention is not enabled
**What this PR does / why we need it**:
Following #11123 and in order to
enable #10417 the query frontend
should send the serialized LogQL AST instead of the query string to the
queriers. This enables the frontend to change the AST and inject
expressions that are not expressible in LogQL.

**Checklist**
- [ ] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [x] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

---------

Signed-off-by: Callum Styan <[email protected]>
Co-authored-by: Callum Styan <[email protected]>
**What this PR does / why we need it**:
Update dskit to latest version
**What this PR does / why we need it**:
The recent change #11246 requires
that `LokiRequest.Plan` is always set.

**Checklist**
- [ ] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [x] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)
**What this PR does / why we need it**:
Compress bloom blocks when writing to object storage, and uncompress
when reading from object storage.

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [ ] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)
…e it occurred to me and may occur to others also. (#11131)

**What this PR does / why we need it**:

This PR contains a paragraph in which there is a remember guide when
running the `make docs` command. For some users, it may give an error
because they have not added the `/tmp` path into the Docker settings.
Without this setting, running the
`http://localhost:3002/docs/loki/latest/` URL won't work.

That's why I added this guide so it becomes easy for others also.

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

---------

Signed-off-by: Bilal Khan <[email protected]>
Co-authored-by: J Stickler <[email protected]>
Co-authored-by: Michel Hollands <[email protected]>
Co-authored-by: Jack Baldry <[email protected]>
This PR fixes the check in the bloom compactor startup to ignore all
other index types than TSDB.

When updating an existing Loki installation that uses BoltDB Shipper in
the schema config, you get the following error:

```
invalid tsdb path:
/data/boltdb-shipper-cache/XXXXXXXXX_index_19682/write-0-1639160260677624223-1700595900
││ create index shipper
││ github.com/grafana/loki/pkg/bloomcompactor.New
││     /src/loki/pkg/bloomcompactor/bloomcompactor.go:159
││ github.com/grafana/loki/pkg/loki.(*Loki).initBloomCompactor
││     /src/loki/pkg/loki/modules.go:1406
││ github.com/grafana/dskit/modules.(*Manager).initModule
││     /src/loki/vendor/github.com/grafana/dskit/modules/modules.go:136
││ github.com/grafana/dskit/modules.(*Manager).InitModuleServices
││     /src/loki/vendor/github.com/grafana/dskit/modules/modules.go:108
││ github.com/grafana/loki/pkg/loki.(*Loki).Run
```

---------

Signed-off-by: Christian Haudum <[email protected]>
**What this PR does / why we need it**:
It bumps the version for the MinIO Helm Chart to v4.0.15. 
The current MinIO version (4.0.12) has a bug where it throws warnings
for incorrect types.

```
coalesce.go:237: warning: skipped value for loki.minio.additionalLabels: Not a table.
coalesce.go:237: warning: skipped value for loki.minio.additionalAnnotations: Not a table.
``` 

**Which issue(s) this PR fixes**:
None

**Special notes for your reviewer**:

**Checklist**
- [X] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [X] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

---------

Co-authored-by: Michel Hollands <[email protected]>
**What this PR does / why we need it**:

There were some typo mistakes that I fixed in the **caching.md** file
and it was mentioned in the issue that I have given below.

**Which issue(s) this PR fixes**:
Fixes [Issue #9073](#9073)

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

Signed-off-by: Bilal Khan <[email protected]>
Co-authored-by: J Stickler <[email protected]>
Replacing the invalid (404) promtail-ec2.yaml with the valid one.

**What this PR does / why we need it**:
This PR does - updates the invalid url of the promtail-ec2.yaml with the
valid one.
Why it is needed - [While implementing this
doc](https://grafana.com/docs/loki/latest/send-data/promtail/cloud/ec2/),
the curl won't work.

**Which issue(s) this PR fixes**:
Fixes #<issue number>
No issue has been raised for this
**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

Co-authored-by: J Stickler <[email protected]>
**What this PR does / why we need it**:
Follow up from #11285, where Loki
doesn't start up due to duplicate metric registration.
```
2023-11-22 22:43:32     /src/loki/vendor/github.com/prometheus/client_golang/prometheus/promauto/auto.go:276 +0x178
2023-11-22 22:43:32 github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/downloads.newMetrics({0x2a62040, 0x4001baa660})
2023-11-22 22:43:32     /src/loki/pkg/storage/stores/shipper/indexshipper/downloads/metrics.go:21 +0xa4
2023-11-22 22:43:32 github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/downloads.NewTableManager({{0x4000cdae58, 0x18}, 0x45d964b800, 0x4e94914f0000, 0x0, {0xffff4f32e908, 0x40009c6750}}, 0x24192e0, {0x2a89f50?, 0x40004e7320}, ...)
2023-11-22 22:43:32     /src/loki/pkg/storage/stores/shipper/indexshipper/downloads/table_manager.go:92 +0xa8
2023-11-22 22:43:32 github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper.(*indexShipper).init(0x4001b9a480, {0x231b106?, 0x0?}, {0x2a80bf8?, 0x40018b9340?}, {0xffff4f32e908, 0x40009c6750}, 0x0?, {0x0?, 0x0?, ...}, ...)
2023-11-22 22:43:32     /src/loki/pkg/storage/stores/shipper/indexshipper/shipper.go:190 +0x28c
2023-11-22 22:43:32 github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper.NewIndexShipper({_, _}, {{0x4000685900, 0x19}, {0x4000cdae58, 0x18}, 0x4e94914f0000, 0x45d964b800, 0x0, {{0x2313cd3, ...}, ...}, ...}, ...)
2023-11-22 22:43:32     /src/loki/pkg/storage/stores/shipper/indexshipper/shipper.go:155 +0x194
2023-11-22 22:43:32 github.com/grafana/loki/pkg/bloomcompactor.New({{{{0x232535d, 0xa}, {0x232789e, 0xb}, {{...}, {...}, {...}, _}, {_, _}}, ...}, ...}, ...)
2023-11-22 22:43:32     /src/loki/pkg/bloomcompactor/bloomcompactor.go:142 +0x6d4
2023-11-22 22:43:32 github.com/grafana/loki/pkg/loki.(*Loki).initBloomCompactor(0x40006dc000)
2023-11-22 22:43:32     /src/loki/pkg/loki/modules.go:1404 +0x358
2023-11-22 22:43:32 github.com/grafana/dskit/modules.(*Manager).initModule(0x4000b48318, {0xffffe15d6f7d, 0x4}, 0x403b88?, 0x2313cb3?)
2023-11-22 22:43:32     /src/loki/vendor/github.com/grafana/dskit/modules/modules.go:136 +0x1a4
2023-11-22 22:43:32 github.com/grafana/dskit/modules.(*Manager).InitModuleServices(0x4000b1a718?, {0x400071c520, 0x1, 0x4000946ec0?})
2023-11-22 22:43:32     /src/loki/vendor/github.com/grafana/dskit/modules/modules.go:108 +0xb4
2023-11-22 22:43:32 github.com/grafana/loki/pkg/loki.(*Loki).Run(0x40006dc000, {0x0?, {0x4?, 0x3?, 0x3ff40c0?}})
2023-11-22 22:43:32     /src/loki/pkg/loki/loki.go:416 +0x74
2023-11-22 22:43:32 main.main()
2023-11-22 22:43:32     /src/loki/cmd/loki/main.go:114 +0xcdc
2023-11-22 22:43:33 panic: a previously registered descriptor with the same fully-qualified name as Desc{fqName: "loki_tsdb_shipper_query_time_table_download_duration_seconds", help: "Time (in seconds) spent in downloading of files per table at query time", constLabels: {}, variableLabels: [{table <nil>}]} has different label names or a different help string
```

Plus a sneaky fix to our loki config, removing a deprecated field. See
deprecation clean up here:
https://github.com/grafana/loki/pull/11038/files

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [ ] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)
**What this PR does / why we need it**:
Updates the Helm Charts documentation to include `backend` target
Fixes broken links

**Which issue(s) this PR fixes**:
Fixes #11189

**Special notes for your reviewer**:
I walked through this with @monodot earlier today.

Co-authored-by: Michel Hollands <[email protected]>
**What this PR does / why we need it**:
#9427 discusses a few notable
gotchas and differences between `v2.x` and `v3.x` helm charts. In this
PR, I would like to propose aggregation of the information from the
mentioned issue and appending that to the upgrade guide.

**Which issue(s) this PR fixes**:
see also: #9427

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [x] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`

---------

Signed-off-by: Jan Wozniak <[email protected]>
Co-authored-by: J Stickler <[email protected]>
Co-authored-by: Michel Hollands <[email protected]>
…te (#11290)

**What this PR does / why we need it**:

This PR adds three per tenant configs:
- `bloom_ngram_length`: Configures the n-gram length.
- `bloom_ngram_skip`: Configures the n-gram skip factor.
- `bloom_false_positive_rate`: Configures the target false-positive rate
of the scalable bloom filters.

Since the n-gram length and skip factor are now configurable, these
values are written into the block metadata so queriers can use the
n-gram settings used when creating the blocks to build n-grams
compatible with the block.
trevorwhitney and others added 24 commits December 13, 2023 15:10
**What this PR does / why we need it**:

Adds trivy filesystem scanning to our Makefile and PR pipelines. This
will scan the `go.mod` file for vulnerabilities in dependencies, which
are sometimes missed by just scanning the image.

PS @dannykopping this also adds the changes to the vulnerabilities
output we talked about that should make it easier to identify a) where
the vulnerability is (ie. docker image / os dep vs go.mod dep), and b)
what version the dependency needs to be updated to in order to fix it.
**What this PR does / why we need it**:
This fixes the last known regression for `protobuf` encoding.

**Checklist**
- [ ] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [x] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)
**Which issue(s) this PR fixes**:
Fixes #11431 

**Checklist**
- [X] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [X] Documentation added
- [ ] Tests updated
- [x] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

---------

Signed-off-by: Michel Hollands <[email protected]>
This can be used as a default visitor for use cases where you only want
to visit specific expression without the needing to implement the
traversal logic of each and every expression, see implementation in test
case.

Signed-off-by: Christian Haudum <[email protected]>
Signed-off-by: Matthew Penner <[email protected]>
Co-authored-by: Periklis Tsirakidis <[email protected]>
Co-authored-by: J Stickler <[email protected]>
This allows us to duplicate (i.e. "tee") some of the log streams from the `Distributor` by introducing an optional interface in a follow-up PR.
This PR adds the deployment of the bloom-compactor and the bloom-gateway
to the Loki jsonnet lib.

Both components are deployed as StatefulSets, using disks backed by
PersistentVolumeClaims. Additionally, the bloom-gateways can also be
configured with local SSDs when available.

Signed-off-by: Christian Haudum <[email protected]>
**What this PR does / why we need it**:
Originally we would not set the matcher of a label filter if the name or
value was empty. However , `post != ""` is a valid filter expression
with an empty value.

**Checklist**
- [ ] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [x] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)
…chart (#11458)

**What this PR does / why we need it**:
Currently the Loki helm chart does not support defining s3 backoff
config settings. This PR adds support to the loki.commonStorageConfig
helper to add backoff config options when they're specified in the helm
values
**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [x] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

---------

Co-authored-by: Michel Hollands <[email protected]>
…ok (#11490)

**What this PR does / why we need it**:

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [x] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [x] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)
This PR implements interfaces to inject new pipelines/extractors into
the query path of queriers and ingesters.
…11484)

If we look at profiling of ingesters in some of our production
deployments during which we have high ingester load from querying we see
that we spend roughly 15-20% of our CPU time on GC related work.

Looking at different `runtime` memory related calls, it looks like ~50%
of all CPU time during Pipeline stage processing is the creation of the
map for labels that is then passed to text template parsing. This change
will make the pipeline processing itself ~15% faster but hopefully will
also reduce (very slightly) the impact of GC in heavy query load
situations.

```
goos: linux
goarch: amd64
pkg: github.com/grafana/loki/pkg/logql/log
cpu: AMD Ryzen 9 5950X 16-Core Processor
                                    │     base     │                mapPool                │
                                    │    sec/op    │    sec/op     vs base                 │
_Pipeline/pipeline_bytes-32           7.749µ ± ∞ ¹   6.464µ ± ∞ ¹        ~ (p=1.000 n=1) ²
_Pipeline/pipeline_string-32          7.691µ ± ∞ ¹   6.549µ ± ∞ ¹        ~ (p=1.000 n=1) ²
_Pipeline/line_extractor_bytes-32     7.922µ ± ∞ ¹   6.882µ ± ∞ ¹        ~ (p=1.000 n=1) ²
_Pipeline/line_extractor_string-32    7.900µ ± ∞ ¹   6.878µ ± ∞ ¹        ~ (p=1.000 n=1) ²
_Pipeline/label_extractor_bytes-32    7.952µ ± ∞ ¹   6.976µ ± ∞ ¹        ~ (p=1.000 n=1) ²
_Pipeline/label_extractor_string-32   7.940µ ± ∞ ¹   7.102µ ± ∞ ¹        ~ (p=1.000 n=1) ²
geomean                               7.858µ         6.805µ        -13.41%
¹ need >= 6 samples for confidence interval at level 0.95
² need >= 4 samples to detect a difference at alpha level 0.05

                                    │     base      │                mapPool                 │
                                    │     B/op      │     B/op       vs base                 │
_Pipeline/pipeline_bytes-32           4.963Ki ± ∞ ¹   1.413Ki ± ∞ ¹        ~ (p=1.000 n=1) ²
_Pipeline/pipeline_string-32          5.025Ki ± ∞ ¹   1.476Ki ± ∞ ¹        ~ (p=1.000 n=1) ²
_Pipeline/line_extractor_bytes-32     5.030Ki ± ∞ ¹   1.478Ki ± ∞ ¹        ~ (p=1.000 n=1) ²
_Pipeline/line_extractor_string-32    5.028Ki ± ∞ ¹   1.478Ki ± ∞ ¹        ~ (p=1.000 n=1) ²
_Pipeline/label_extractor_bytes-32    5.027Ki ± ∞ ¹   1.478Ki ± ∞ ¹        ~ (p=1.000 n=1) ²
_Pipeline/label_extractor_string-32   5.027Ki ± ∞ ¹   1.478Ki ± ∞ ¹        ~ (p=1.000 n=1) ²
geomean                               5.017Ki         1.466Ki        -70.77%
¹ need >= 6 samples for confidence interval at level 0.95
² need >= 4 samples to detect a difference at alpha level 0.05

                                    │    base     │               mapPool               │
                                    │  allocs/op  │  allocs/op   vs base                │
_Pipeline/pipeline_bytes-32           37.00 ± ∞ ¹   35.00 ± ∞ ¹       ~ (p=1.000 n=1) ²
_Pipeline/pipeline_string-32          38.00 ± ∞ ¹   36.00 ± ∞ ¹       ~ (p=1.000 n=1) ²
_Pipeline/line_extractor_bytes-32     37.00 ± ∞ ¹   35.00 ± ∞ ¹       ~ (p=1.000 n=1) ²
_Pipeline/line_extractor_string-32    37.00 ± ∞ ¹   35.00 ± ∞ ¹       ~ (p=1.000 n=1) ²
_Pipeline/label_extractor_bytes-32    37.00 ± ∞ ¹   35.00 ± ∞ ¹       ~ (p=1.000 n=1) ²
_Pipeline/label_extractor_string-32   37.00 ± ∞ ¹   35.00 ± ∞ ¹       ~ (p=1.000 n=1) ²
geomean                               37.16         35.16        -5.38%
¹ need >= 6 samples for confidence interval at level 0.95
² need >= 4 samples to detect a difference at alpha level 0.05
```

---------

Signed-off-by: Callum Styan <[email protected]>
This allows us to inject a Tee in the Distributor that can duplicate all of the incoming log stream, before they are replicated.
Co-authored-by: Robert Jacob <[email protected]>
Co-authored-by: Periklis Tsirakidis <[email protected]>
**What this PR does / why we need it**:
The Protobuf map type is encodied as a repeated field of map entries.
Decoding them to a slice is much faster than decoding them into a map.
Since Loki is not using the fast key check for a map we can use the
slice decoding.

This change also allows us to decode the JSON directly into the right
protobuf struct. This doulbes the JSON decoding speed and reduces the
memory pressure by ~40%.

```
› go test -bench=. -run=^$ -count=10 ./pkg/querier/queryrange > before.log
› go test -bench=. -run=^$ -count=10 ./pkg/querier/queryrange > after.log
› benchstat before.log after.log
goos: darwin
goarch: arm64
pkg: github.com/grafana/loki/pkg/querier/queryrange
                                                             │  before.log  │              after.log               │
                                                             │    sec/op    │    sec/op     vs base                │
ResponseMerge/mergeStreams_unlimited-10                         32.36m ± 0%   32.63m ±  2%        ~ (p=0.393 n=10)
ResponseMerge/mergeOrderedNonOverlappingStreams_unlimited-10    1.050m ± 1%   1.080m ±  3%   +2.84% (p=0.005 n=10)
ResponseMerge/mergeStreams_limited-10                           33.02m ± 0%   32.60m ±  1%   -1.29% (p=0.004 n=10)
ResponseMerge/mergeOrderedNonOverlappingStreams_limited-10      15.11m ± 0%   15.07m ±  0%        ~ (p=0.075 n=10)
_CodecDecodeLogs-10                                             4.395m ± 1%   4.364m ±  0%   -0.72% (p=0.005 n=10)
_CodecDecodeSamples-10                                          16.97m ± 0%   16.84m ±  2%   -0.77% (p=0.023 n=10)
_CodecDecodeSeries/application/vnd.google.protobuf-10           745.8µ ± 8%   736.8µ ± 12%        ~ (p=0.739 n=10)
_CodecDecodeSeries/application/json;_charset=utf-8-10           15.37m ± 1%   10.60m ±  0%  -31.03% (p=0.000 n=10)
_MergeResponses-10                                             1186.9m ± 2%   149.8m ±  1%  -87.38% (p=0.000 n=10)
_UnwrapSeries-10                                                9.399m ± 1%   4.049m ±  0%  -56.92% (p=0.000 n=10)
_DecodeMergeEncodeCycle-10                                      666.0m ± 3%   194.6m ±  0%  -70.79% (p=0.000 n=10)
geomean                                                         18.87m        12.51m        -33.70%

                                                      │  before.log   │              after.log               │
                                                      │     B/op      │     B/op      vs base                │
_CodecDecodeLogs-10                                      3.649Mi ± 0%   3.649Mi ± 0%        ~ (p=0.364 n=10)
_CodecDecodeSamples-10                                   18.12Mi ± 0%   18.12Mi ± 0%        ~ (p=0.926 n=10)
_CodecDecodeSeries/application/vnd.google.protobuf-10    7.647Mi ± 0%   7.647Mi ± 0%        ~ (p=0.587 n=10)
_CodecDecodeSeries/application/json;_charset=utf-8-10    27.94Mi ± 0%   16.99Mi ± 0%  -39.18% (p=0.000 n=10)
_MergeResponses-10                                       2.362Mi ± 0%   2.408Mi ± 0%   +1.98% (p=0.000 n=10)
_UnwrapSeries-10                                        19.495Mi ± 0%   8.595Mi ± 0%  -55.91% (p=0.000 n=10)
_DecodeMergeEncodeCycle-10                               772.3Mi ± 0%   772.3Mi ± 0%        ~ (p=0.912 n=10)
geomean                                                  17.50Mi        14.54Mi       -16.91%

                                                      │ before.log  │              after.log               │
                                                      │  allocs/op  │  allocs/op   vs base                 │
_CodecDecodeLogs-10                                     41.10k ± 0%   41.10k ± 0%       ~ (p=1.000 n=10) ¹
_CodecDecodeSamples-10                                  411.9k ± 0%   411.9k ± 0%       ~ (p=1.000 n=10)
_CodecDecodeSeries/application/vnd.google.protobuf-10    32.00 ± 0%    32.00 ± 0%       ~ (p=1.000 n=10) ¹
_CodecDecodeSeries/application/json;_charset=utf-8-10   304.2k ± 0%   298.1k ± 0%  -2.01% (p=0.000 n=10)
_MergeResponses-10                                      100.1k ± 0%   100.1k ± 0%  -0.00% (p=0.002 n=10)
_UnwrapSeries-10                                        201.1k ± 0%   198.0k ± 0%  -1.54% (p=0.000 n=10)
_DecodeMergeEncodeCycle-10                              203.1k ± 0%   203.1k ± 0%       ~ (p=0.621 n=10)
geomean                                                 48.95k        48.70k       -0.51%
¹ all samples are equal
```

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [x] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)
**What this PR does / why we need it**:
Upon changes to TSDB indexes, the existing blooms needs to be amended
with newly added chunks, or new series should be added to blocks.
This PR compares the existing meta information with the most up to date
TSDB information in the job. In case of no changes to indexes,
compaction is skipped; if there's any block needs amending, it does that
and merges all blocks in fp range; if there's no previous compaction, it
compacts from scratch.

**Special notes for your reviewer**:
This logic does not support cutting blocks upon topology changes to
bloom-compactors. It can create blocks with series outside of the fp
range of the compactor. Cutting blocks will be addressed in a follow-up
PR.
remove mistakenly committed files (benchmarking related) from #11484

Signed-off-by: Callum Styan <[email protected]>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from
0.14.0 to 0.17.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/golang/crypto/commit/9d2ee975ef9fe627bf0a6f01c1f69e8ef1d4f05d"><code>9d2ee97</code></a>
ssh: implement strict KEX protocol changes</li>
<li><a
href="https://github.com/golang/crypto/commit/4e5a26183ecb4f9a0f85c8f8dbe7982885435436"><code>4e5a261</code></a>
ssh: close net.Conn on all NewServerConn errors</li>
<li><a
href="https://github.com/golang/crypto/commit/152cdb1503ebc13bc0fbb68f92ee189ebf9e3d00"><code>152cdb1</code></a>
x509roots/fallback: update bundle</li>
<li><a
href="https://github.com/golang/crypto/commit/fdfe1f8531a1adcc300c8eba98cb372044826d62"><code>fdfe1f8</code></a>
ssh: defer channel window adjustment</li>
<li><a
href="https://github.com/golang/crypto/commit/b8ffc16e10063067bac0e15c6d7f7995937503ce"><code>b8ffc16</code></a>
blake2b: drop Go 1.6, Go 1.8 compatibility</li>
<li><a
href="https://github.com/golang/crypto/commit/7e6fbd82c804e1760feb603fe21caecb0af0a124"><code>7e6fbd8</code></a>
ssh: wrap errors from client handshake</li>
<li><a
href="https://github.com/golang/crypto/commit/bda2f3f5cfce3f27039acccd823693f6d67c2a74"><code>bda2f3f</code></a>
argon2: avoid clobbering BP</li>
<li><a
href="https://github.com/golang/crypto/commit/325b735346247f48971d2b37d24dd180a35f391f"><code>325b735</code></a>
ssh/test: skip TestSSHCLIAuth on Windows</li>
<li><a
href="https://github.com/golang/crypto/commit/1eadac50a566dfaa1b603ca15e8ad3cbd1c77b20"><code>1eadac5</code></a>
go.mod: update golang.org/x dependencies</li>
<li><a
href="https://github.com/golang/crypto/commit/b2d7c26edb17864f117d8b0ee73c1843bcc6090f"><code>b2d7c26</code></a>
ssh: add (*Client).DialContext method</li>
<li>Additional commits viewable in <a
href="https://github.com/golang/crypto/compare/v0.14.0...v0.17.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/crypto&package-manager=go_modules&previous-version=0.14.0&new-version=0.17.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts page](https://github.com/grafana/loki/network/alerts).

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Periklis Tsirakidis <[email protected]>
**What this PR does / why we need it**:
* Update our legacy panels (Loki/Logs and Loki/Operation) do use
`"type": "timeseries"` instead of `"type": "graph"`. The graph type is
deprecated on recent Grafana versions. I tested the changes with Grizzly
and it worked fine.
* Fix our p99 panel unit. I previously made it to be `s` instead of
`short` but when replicating the change on our source code I put the
change at the wrong identation level. This time I made sure to test the
change with Grizzly.
Adding the context here means the wrapping pipeline can know when the
query has stopped or been cancelled.
**What this PR does / why we need it**:

* The config block for storage is named `storage_config`, not `storage`.
* The replication factor for the bloom gateway is part of the `ring`
config.

Signed-off-by: Christian Haudum <[email protected]>
**What this PR does / why we need it**:
This little typo may confuse somebody if they would copy/paste the
example.

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

Co-authored-by: Michel Hollands <[email protected]>
@mariodietner mariodietner merged commit f39bf7f into mariodietner:main Dec 20, 2023
12 of 13 checks passed
Copy link

Trivy scan found the following vulnerabilities:

@coveralls
Copy link

Pull Request Test Coverage Report for Build 7274106443

Warning: This coverage report may be inaccurate.

We've detected an issue with your CI configuration that might affect the accuracy of this pull request's coverage report.
To ensure accuracy in future PRs, please see these guidelines.
A quick fix for this PR: rebase it; your next report should be accurate.

  • 321 of 355 (90.42%) changed or added relevant lines in 17 files are covered.
  • 10 unchanged lines in 3 files lost coverage.
  • Overall coverage increased (+0.3%) to 80.622%

Changes Missing Coverage Covered Lines Changed/Added Lines %
operator/internal/status/lokistack.go 24 25 96.0%
operator/internal/manifests/ruler.go 2 4 50.0%
operator/internal/manifests/storage/configure.go 144 146 98.63%
operator/internal/handlers/internal/storage/secrets.go 81 91 89.01%
operator/controllers/loki/lokistack_controller.go 0 19 0.0%
Files with Coverage Reduction New Missed Lines %
operator/internal/status/lokistack.go 1 94.19%
operator/controllers/loki/lokistack_controller.go 3 17.33%
operator/internal/manifests/storage/configure.go 6 93.36%
Totals Coverage Status
Change from base Build 7261517882: 0.3%
Covered Lines: 6453
Relevant Lines: 8004

💛 - Coveralls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.