Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: grafana/loki
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.9.3
Choose a base ref
...
head repository: grafana/loki
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.9.4
Choose a head ref
  • 15 commits
  • 465 files changed
  • 11 contributors

Commits on Dec 12, 2023

  1. [release-2.9.x] Add note about use of object storage (#11456)

    Backport 7c4882a from #11443
    
    ---
    
    PR #9031 from @Alex3k has gone quite stale as the topic has been revised
    since it was submitted.
    
    This PR attempts to get at least part of Alex's update into the
    documentation so that we can close his original PR.
    
    Co-authored-by: J Stickler <julie.stickler@grafana.com>
    grafanabot and JStickler authored Dec 12, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    kwasniew Mateusz Kwasniewski
    Copy the full SHA
    0f45321 View commit details

Commits on Jan 5, 2024

  1. Manual backport #11581 (#11594)

    **What this PR does / why we need it**:
     
    Manual backport of #11581
    JStickler authored Jan 5, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    kwasniew Mateusz Kwasniewski
    Copy the full SHA
    c601756 View commit details

Commits on Jan 8, 2024

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1b8fb27 View commit details

Commits on Jan 10, 2024

  1. [release-2.9.x] Documentation: Update template_functions.md (#11627)

    Backport 3cb2a6b from #11615
    
    ---
    
    Fix incorrect example
    
    **What this PR does / why we need it**:
    Fix incorrect example in [Template
    functions](https://grafana.com/docs/loki/latest/query/template_functions/)
    
    **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: Oğuzcan Küçükbayrak <o.kucukbayrak@icloud.com>
    grafanabot and okb1100 authored Jan 10, 2024
    Copy the full SHA
    ce4065b View commit details
  2. [release-2.9.x] Update _index.md (#11644)

    Backport 37a2f73 from #11548
    
    ---
    
    **What this PR does / why we need it**:
    
    doc is confusing/lacking detail on setting up regular fluentbit
    container and we needed an example config for fluent-bit that works with
    HG Loki.
    
    **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)
    
    Co-authored-by: deresolution20 <85902399+deresolution20@users.noreply.github.com>
    grafanabot and deresolution20 authored Jan 10, 2024
    Copy the full SHA
    732e799 View commit details

Commits on Jan 11, 2024

  1. [release-2.9.x] Cache: correctly check background cache size (#11656)

    Backport 88aaa7d from #11654
    
    ---
    
    **What this PR does / why we need it**:
    The size check was not being performed atomically, which led to
    flakiness in the `TestBackgroundSizeLimit` test.
    
    ---------
    
    Co-authored-by: Danny Kopping <danny.kopping@grafana.com>
    grafanabot and dannykopping authored Jan 11, 2024
    Copy the full SHA
    80e0c18 View commit details
  2. [release-2.9.x] docs: Update _index.md addressing #11575 (#11664)

    Backport 3b2278d from #11626
    
    ---
    
    **What this PR does / why we need it**:
    It improves the docs by addressing #11575 allowing users to use the
    official fluent-bit helm chart over the deprecated grafana one
    
    **Which issue(s) this PR fixes**:
    Fixes #11575 
    
    **Special notes for your reviewer**:
    @JStickler wanted to take a look at this.
    
    **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: Peter Stolz <50801264+PeterStolz@users.noreply.github.com>
    grafanabot and PeterStolz authored Jan 11, 2024
    Copy the full SHA
    96c31d6 View commit details

Commits on Jan 12, 2024

  1. [release-2.9.x] Update query_examples.md (#11674)

    Backport edba360 from #11670
    
    Co-authored-by: Alexey Solodkiy <alexey@solodkiy.by>
    grafanabot and solodkiy authored Jan 12, 2024
    Copy the full SHA
    6518c52 View commit details

Commits on Jan 16, 2024

  1. [release-2.9.x] fix: align semantics of metric and log query label ex…

    …traction (#11667)
    
    Backport 9759c13 from #11587
    
    ---
    
    **What this PR does / why we need it**:
    Fix label parsing logic so metric and log queries both only extract the first instance of a label that is requested multiple times.
    
    **Which issue(s) this PR fixes**:
    Fixes #11647
    
    ---------
    
    Co-authored-by: Trevor Whitney <trevorjwhitney@gmail.com>
    grafanabot and trevorwhitney authored Jan 16, 2024
    Copy the full SHA
    3560f86 View commit details

Commits on Jan 17, 2024

  1. [release-2.9.x] fix(log results cache): compose empty response based …

    …on the request (#11659)
    
    Backport e915efc from #11657
    
    ---
    
    **What this PR does / why we need it**:
    Log results cache when handling a hit composes an empty response based
    on the cached request.
    But the limit or direction fields in the cached request need not match
    with the current request being served.
    
    This causes the log results cache to return a response with incorrect
    limit. This incorrect limit could then get applied when merging
    responses upstream (split by interval mw for ex.)
    
    This pr fixes this by composing the response based on the request being
    served.
    
    I also thought about updating the cache key to include both limit and
    direction to have a clear separation, but I left it as is for the
    following reason: if a time range contains no log lines, that result
    would not change irrespective of a different limit or direction
    
    **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
    - [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)
    
    ---------
    
    Co-authored-by: Ashwanth <iamashwanth@gmail.com>
    Co-authored-by: Poyzan <31743851+poyzannur@users.noreply.github.com>
    3 people authored Jan 17, 2024
    Copy the full SHA
    e9003e2 View commit details
  2. [release-2.9.x] chore(promtail): Use minimal init config in rpm/deb p…

    …ackaging. (#11676)
    
    Backport 86f2001 from #11511
    
    ---
    
    **What this PR does / why we need it**:
    Related issue: #11398
    
    This minimal config scrape only single file thus not overloading the
    systems as described in the issue
    
    **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)
    
    Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>
    Co-authored-by: Poyzan <31743851+poyzannur@users.noreply.github.com>
    3 people authored Jan 17, 2024
    Copy the full SHA
    c28f12b View commit details

Commits on Jan 19, 2024

  1. [release-2.9.x] Ruler: catering for another data race in tenant config (

    #11714)
    
    Backport 61a4205 from #11612
    
    ---
    
    Expands on #11601
    
    **What this PR does / why we need it**:
    Turns out the previous tests didn't expose all possible causes for data
    races (another one occurs at
    https://github.com/grafana/loki/blob/5a55158cc751465846383bc758aa0c169363b292/pkg/ruler/registry.go#L204).
    Moving the mutex to the calling function adds more safety.
    
    **Which issue(s) this PR fixes**:
    Fixes #11569
    
    Co-authored-by: Danny Kopping <danny.kopping@grafana.com>
    grafanabot and dannykopping authored Jan 19, 2024
    Copy the full SHA
    94f97fb View commit details

Commits on Jan 23, 2024

  1. Update golang.org/x/crypto for v2.9.x #11743 (#11745)

    **What this PR does / why we need it**:
    Updates the `golang.org/x/crypto` dependency to its latest version
    `v0.18.0`
    
    **Which issue(s) this PR fixes**:
    Resolves
    [CVE-2023-48795](GHSA-45x7-px36-x8w8)
    Medium golang.org/x/crypto Go
    grafana/support-escalations#8977
    **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`
    - [ ] 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)
    poyzannur authored Jan 23, 2024
    Copy the full SHA
    c9a0bd2 View commit details

Commits on Jan 24, 2024

  1. Release 2.9.4 (#11758)

    **What this PR does / why we need it**:
    Updates changelog and release notes for 2.9.4 patch release
    
    **Checklist**
    - [x] Reviewed the
    [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
    guide (**required**)
    - [x] Documentation added
    - [x] `CHANGELOG.md` updated
    poyzannur authored Jan 24, 2024
    Copy the full SHA
    ddee543 View commit details
  2. Update patch version in docs and yaml files for v2.9.4 (#11760)

    **What this PR does / why we need it**:
    Ran recently introduced tag updater `tools/release_update_tags.sh`
    (#10646) to update version tags in
    docs and yaml files
    poyzannur authored Jan 24, 2024
    Copy the full SHA
    f599ebc View commit details
Loading