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

[release-v2.2] Backport 2760 to release v2.2 #2870

Closed
wants to merge 26 commits into from

Conversation

joe-elliott
Copy link
Member

What this PR does:
Backports #2760 to v2.2

github-actions bot and others added 26 commits July 27, 2023 15:05
* Avoid panic in cachedWriter

Here we pass the cache.Delete() call on to the nextWriter instead of panic.

* Extend backend.Writer Delete() to include cache desires

* Update usage of Delete to avoid caching

* Add note about future interfaces changes

(cherry picked from commit 6a73dbb)

Co-authored-by: Zach Leslie <[email protected]>
Signed-off-by: Pavol Loffay <[email protected]>
(cherry picked from commit 7739c63)

Co-authored-by: Pavol Loffay <[email protected]>
Signed-off-by: modulitos <[email protected]>
(cherry picked from commit 2cb5a7b)

Co-authored-by: Lucas Swart <[email protected]>
Signed-off-by: Joe Elliott <[email protected]>
(cherry picked from commit cfb6e54)
* Add operator object storage docs

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

---------

Signed-off-by: Pavol Loffay <[email protected]>
(cherry picked from commit 06eeffd)

Co-authored-by: Pavol Loffay <[email protected]>
* Add operator minitor docs

Signed-off-by: Pavol Loffay <[email protected]>

* fix

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

* Fix comments

Signed-off-by: Pavol Loffay <[email protected]>

---------

Signed-off-by: Pavol Loffay <[email protected]>
(cherry picked from commit 21fcd21)

Co-authored-by: Pavol Loffay <[email protected]>
* Update TraceQL query editor doc

Co-authored-by: Cyrille Le Clerc <[email protected]>
(cherry picked from commit 9ca0a08)

Co-authored-by: Kim Nylander <[email protected]>
Signed-off-by: Pavol Loffay <[email protected]>
(cherry picked from commit 22cb958)

Co-authored-by: Pavol Loffay <[email protected]>
* Add metrics summary doc

* Fix doc-validator issues

* Update docs/sources/tempo/api_docs/metrics-summary.md

* fix metrics summary docs

Signed-off-by: Joe Elliott <[email protected]>

---------

Signed-off-by: Joe Elliott <[email protected]>
Co-authored-by: Joe Elliott <[email protected]>
(cherry picked from commit 832ede0)

Co-authored-by: Kim Nylander <[email protected]>
* [DOC] Doc updates for 2.2 release (#2740)

* Doc updates for 2.2 release

* Update v2-2.md

The page had the wrong content.

* Update docs/sources/tempo/release-notes/v2-2.md

* Fix doc-validator issues

* Update docs/sources/tempo/release-notes/v2-2.md

* Updated tag valutes to 10.2

* Apply suggestions from code review

Co-authored-by: Joe Elliott <[email protected]>
Co-authored-by: Jennifer Villa <[email protected]>

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Jennifer Villa <[email protected]>

* Updates for set up content

---------

Co-authored-by: Joe Elliott <[email protected]>
Co-authored-by: Jennifer Villa <[email protected]>
(cherry picked from commit a16d96b)

* Update docs/sources/tempo/setup/upgrade.md

* Update docs/sources/tempo/setup/upgrade.md
* Add blog link to release notes

* Added link to rel notes from TraceQL

(cherry picked from commit 12082eb)

Co-authored-by: Kim Nylander <[email protected]>
* Yet Another Way To Configure RouteOverHTTP

Signed-off-by: Joe Elliott <[email protected]>

* manifest

Signed-off-by: Joe Elliott <[email protected]>

* remove DoNotRouteHTTPToGRPC

Signed-off-by: Joe Elliott <[email protected]>

---------

Signed-off-by: Joe Elliott <[email protected]>
(cherry picked from commit f2382cc)
…efault overrides (#2786) (#2806)

* Modify concurrency test to consider multitenant / concurrent updateProcessors calls

* Copy desiredProcessors map before modifying it

* Update CHANGELOG.md

(cherry picked from commit 9af6bb2)

Co-authored-by: Koenraad Verheyden <[email protected]>
* Catch backend.ErrDoesNotExist from WriteTenantIndex

* Handle tenant index deletion when already deleted

* Capture notfound from azure.Delete

* Capture notfound from gcs.Delete

* Update changelog

* Add note for why we skip ErrDoesNotExist

* Avoid handling the error twice

(cherry picked from commit e960fd0)

Co-authored-by: Zach Leslie <[email protected]>
* Add service graph metrics queries

* Fix broken links

* Added intro

* Update docs/sources/tempo/metrics-generator/service_graphs/metrics-queries.md

* Update metrics-queries.md

Tried a small language tweak

* Apply suggestions from code review

Co-authored-by: Jennifer Villa <[email protected]>

---------

Co-authored-by: Jennifer Villa <[email protected]>
(cherry picked from commit f1c7e6b)

Co-authored-by: Kim Nylander <[email protected]>
(cherry picked from commit b28637b)

Co-authored-by: Kim Nylander <[email protected]>
(cherry picked from commit 3a35000)

Co-authored-by: Kim Nylander <[email protected]>
* Updated the tag values v2 docs

Clarified that a feature flag must be enabled for this `q` parameter to be accepted

* Update _index.md

* Apply suggestions from code review

Adding Kim's suggestions

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/api_docs/_index.md

---------

Co-authored-by: Kim Nylander <[email protected]>
(cherry picked from commit 7752ae3)

Co-authored-by: Jennifer Villa <[email protected]>
(cherry picked from commit 2c91ade)

Co-authored-by: Kim Nylander <[email protected]>
* Add a generator troubleshooting page

Signed-off-by: Joe Elliott <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* added more details

Signed-off-by: Joe Elliott <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/sources/tempo/operations/troubleshooting/metrics-generator.md

Co-authored-by: Kim Nylander <[email protected]>

* review notes

Signed-off-by: Joe Elliott <[email protected]>

---------

Signed-off-by: Joe Elliott <[email protected]>
Co-authored-by: Kim Nylander <[email protected]>
(cherry picked from commit 5e51eb7)

Co-authored-by: Joe Elliott <[email protected]>
(cherry picked from commit 53db273)

# Conflicts:
#	docs/sources/tempo/troubleshooting/_index.md
#	docs/sources/tempo/troubleshooting/metrics-generator.md
Fix broken link (missing parenthesis) for filtered tag values.

(cherry picked from commit 8b9446c)

Co-authored-by: Kim Nylander <[email protected]>
* Fix invalid query

* Chore

(cherry picked from commit a6a934f)

Co-authored-by: Fabrizio <[email protected]>
* Backport cortexproject/cortex#4897 to fix IDMSv1

Signed-off-by: Jakub Coufal <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Jakub Coufal <[email protected]>

---------

Signed-off-by: Jakub Coufal <[email protected]>
(cherry picked from commit ba621f6)
@joe-elliott joe-elliott deleted the backport-2760-to-release-v2.2 branch August 30, 2023 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants