Skip to content

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

Merged
yvrhdn merged 8 commits intografana:mainfrom
yvrhdn:kvrhdn/update-prometheus
Oct 11, 2023
Merged

Update prometheus to latest release v2.47.1 (c4d1a8b)#3001
yvrhdn merged 8 commits intografana:mainfrom
yvrhdn:kvrhdn/update-prometheus

Conversation

@yvrhdn
Copy link
Copy Markdown
Contributor

@yvrhdn yvrhdn commented Oct 10, 2023

What this PR does:

I ran

go get github.com/prometheus/prometheus@c4d1a8b

And fixed any compilation issues

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]

Koenraad Verheyden added 4 commits October 10, 2023 14:30
I ran
```
go get github.com/prometheus/prometheus@c4d1a8b
```
And fixed any compilation issues

// NewServicePrincipalTokenFromFederatedToken creates a ServicePrincipalToken from the supplied federated OIDC JWT.
//
// Deprecated: Use NewServicePrincipalTokenFromFederatedTokenWithCallback to refresh jwt dynamically.
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updating the Azure SDK added this deprecation warning which is causing the linter to fail. This is part of the v1 Azure implementation. Since we are replacing this SDK anyway and will delete the code soon, I suggest we ignore it for now.

@yvrhdn yvrhdn marked this pull request as ready for review October 10, 2023 14:57
# Conflicts:
#	go.mod
#	go.sum
@yvrhdn yvrhdn enabled auto-merge (squash) October 11, 2023 13:15
@yvrhdn yvrhdn merged commit b20c612 into grafana:main Oct 11, 2023
@yvrhdn yvrhdn deleted the kvrhdn/update-prometheus branch October 11, 2023 13:16
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 <number101010@gmail.com>

* load

Signed-off-by: Joe Elliott <number101010@gmail.com>

* lint

Signed-off-by: Joe Elliott <number101010@gmail.com>

---------

Signed-off-by: Joe Elliott <number101010@gmail.com>

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

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>

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

* first pass add

Signed-off-by: Joe Elliott <number101010@gmail.com>

* fix and tests

Signed-off-by: Joe Elliott <number101010@gmail.com>

* removed ancestor/descendant due to parsing issues

Signed-off-by: Joe Elliott <number101010@gmail.com>

* added tempodb lvl tests

Signed-off-by: Joe Elliott <number101010@gmail.com>

* parse tests

Signed-off-by: Joe Elliott <number101010@gmail.com>

* consolidated code

Signed-off-by: Joe Elliott <number101010@gmail.com>

* tests

Signed-off-by: Joe Elliott <number101010@gmail.com>

* docs

Signed-off-by: Joe Elliott <number101010@gmail.com>

* changelog

Signed-off-by: Joe Elliott <number101010@gmail.com>

* not ancestor/descendant

Signed-off-by: Joe Elliott <number101010@gmail.com>

* tempodb tests and docs

Signed-off-by: Joe Elliott <number101010@gmail.com>

* remove load

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Apply suggestions from code review

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

---------

Signed-off-by: Joe Elliott <number101010@gmail.com>
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

* 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 <mariorvinas@gmail.com>

---------

Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
Co-authored-by: Martin Disibio <martin.disibio@grafana.com>
Co-authored-by: Mario <mariorvinas@gmail.com>
Co-authored-by: Joe Elliott <number101010@gmail.com>
Co-authored-by: Pavol Loffay <p.loffay@gmail.com>
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
sonisr pushed a commit to sonisr/tempo that referenced this pull request Oct 11, 2023
* 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 <mariorvinas@gmail.com>
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