Skip to content

Update r118 with latest changes from main - #3027

Merged
yvrhdn merged 3 commits into
r118from
main
Oct 16, 2023
Merged

Update r118 with latest changes from main#3027
yvrhdn merged 3 commits into
r118from
main

Conversation

@yvrhdn

@yvrhdn yvrhdn commented Oct 16, 2023

Copy link
Copy Markdown
Contributor

What this PR does:
Update weekly release r118 with latest changes from main, mainly to include #3012

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]
github-actions Bot and others added 2 commits October 16, 2023 12:45
* Update `make docs` procedure

* Trigger CI

---------

Co-authored-by: grafanabot <bot@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
…nfoExcludedDimensions (#3012)

* fix: handle case when userconfigurableoverrides are enabled but empty

* Add CHANGELOG.md

* fix panic in test

* fix GetTargetInfoExcludedDimens & GetFilterPolicies

* update changelog
* Include distributor queue length in tempo-mixin

* Rebuild

* Compile jsonnet

* Compile jsonnet

* Use C jsonnet to format mixin
@yvrhdn
yvrhdn merged commit 852eaf8 into r118 Oct 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants