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

Update dskit #3002

Merged
merged 2 commits into from
Oct 11, 2023
Merged

Update dskit #3002

merged 2 commits into from
Oct 11, 2023

Conversation

mapno
Copy link
Member

@mapno mapno commented Oct 10, 2023

What this PR does:

Update grafana/dskit

@mapno mapno marked this pull request as ready for review October 10, 2023 16:08
@mapno mapno enabled auto-merge (squash) October 11, 2023 07:34
@mapno mapno merged commit 03ba7fa into grafana:main Oct 11, 2023
@mapno mapno deleted the update-dskit branch October 11, 2023 07:52
yvrhdn pushed a commit that referenced this pull request Oct 11, 2023
* disable parquet trace index by default (#2990)

* Update parquet-go to include page header caching fix (#2981)

* Tempo: add dedicated columns to block analyze (#2994)

* adde dedicated columns to block analysize

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

* load

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

* lint

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

---------

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

* Bump jaeger-query docker image to 1.50 (#2998)

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

* TraceQL: Experimental "not structural" operators (#2993)

* first pass add

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

* fix and tests

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

* removed ancestor/descendant due to parsing issues

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

* added tempodb lvl tests

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

* parse tests

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

* consolidated code

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

* tests

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

* docs

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

* changelog

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

* not ancestor/descendant

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

* tempodb tests and docs

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

* remove load

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

* Apply suggestions from code review

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

---------

Signed-off-by: Joe Elliott <[email protected]>
Co-authored-by: Kim Nylander <[email protected]>

* Update dskit (#3002)

* Update dskit

* fmt

* Update prometheus to latest release v2.47.1 (c4d1a8b) (#3001)

* Update prometheus to latest release v2.47.1 (c4d1a8b)

I ran
```
go get github.com/prometheus/prometheus@c4d1a8b
```
And fixed any compilation issues

* Checkin .test files from prometheus

* go mod tidy

* More fixes

* Final set of fixes? 🤞

* Lint

---------

Co-authored-by: Mario <[email protected]>

---------

Signed-off-by: Joe Elliott <[email protected]>
Signed-off-by: Pavol Loffay <[email protected]>
Co-authored-by: Martin Disibio <[email protected]>
Co-authored-by: Mario <[email protected]>
Co-authored-by: Joe Elliott <[email protected]>
Co-authored-by: Pavol Loffay <[email protected]>
Co-authored-by: Kim Nylander <[email protected]>
sonisr pushed a commit to sonisr/tempo that referenced this pull request Oct 11, 2023
* Update dskit

* fmt
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.

2 participants