Sync with upstream v3.0 #741
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
doc: fix formatting
* tsdb.CircularExemplarStorage: Avoid racing --------- Signed-off-by: Arve Knudsen <[email protected]>
Signed-off-by: shenpengfeng <[email protected]>
chore: fix function name in comment
* [REFACTOR] simplify appender commit Signed-off-by: Nicolas Takashi <[email protected]> Signed-off-by: Arthur Silva Sens <[email protected]> Co-authored-by: George Krajcsovits <[email protected]> Co-authored-by: Arthur Silva Sens <[email protected]>
Signed-off-by: Jan Fajerski <[email protected]>
Signed-off-by: Oleg Zaytsev <[email protected]>
…s-delete-with-gomaxprocs-workers Revert "Process `MemPostings.Delete()` with `GOMAXPROCS` workers"
Signed-off-by: Juraj Michalek <[email protected]>
Signed-off-by: Juraj Michalek <[email protected]>
Signed-off-by: Juraj Michalek <[email protected]>
Signed-off-by: Juraj Michalek <[email protected]>
Signed-off-by: Arthur Silva Sens <[email protected]>
Signed-off-by: Arthur Silva Sens <[email protected]>
Signed-off-by: Jan Fajerski <[email protected]>
Prepare release 3.0.0 rc.0
bugfix: Fix otlp translator for foreign characters
tracing: add tcp events to remote store span
log last series labelset when hitting OOO series labels
…b.com/envoyproxy/go-control-plane-0.13.0
…b.com/scaleway/scaleway-sdk-go-1.0.0-beta.30
…g.org/x/oauth2-0.23.0
…g.org/x/tools-0.24.0
…b.com/prometheus/common-0.59.0
…entation/examples/remote_storage/github.com/prometheus/client_golang-1.20.2
…b.com/prometheus/exporter-toolkit-0.12.0
…b.com/prometheus/common-0.59.1
…b.com/digitalocean/godo-1.122.0 Signed-off-by: Arve Knudsen <[email protected]>
…entelemetry-io-14eb93439b
…s-delete-with-gomaxprocs-workers
Signed-off-by: Arve Knudsen <[email protected]>
aknuds1
force-pushed
the
arve/sync-upstream-individually
branch
from
9624637 to
6314392
Compare
Signed-off-by: Bryan Boreham <[email protected]>
Also grafana/regexp sorts alternates alphabetically. Signed-off-by: Bryan Boreham <[email protected]>
Signed-off-by: Bryan Boreham <[email protected]>
bboreham
approved these changes
Nov 5, 2024
krajorama
approved these changes
Nov 6, 2024
|
We should create an alias for |
|
We don't really need to do that here in |
@colega how can we do it in Mimir? |
aknuds1
force-pushed
the
arve/sync-upstream-individually
branch
from
ea3b08c to
35ab16f
Compare
7 tasks
|
You can do it in Mimir through: func init() {
parser.Functions["holt_winters"] = parser.Functions["double_exponential_smoothing"]
promql.FunctionCalls["holt_winters"] = promql.FunctionCalls["double_exponential_smoothing"]
} |
|
@colega hm yeah, maybe it is that simple. I'll check. |
bboreham
approved these changes
Nov 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sync with Prometheus upstream main branch (e2e01c1). My method was to list all the commits added to upstream's main branch after the last merge, and merge every single one of them, resolving conflicts per commit as necessary.
There were difficult merge conflicts in the following files/commits, and I could use help making sure they're done correctly in retrospect:
model/labels/regexp_test.go:
Included commits:
CreatedTimestampfunction (#14965)CreatedTimestamps(#15097)MemPostings.AddandMemPostings.Getdata race (#15141)p.isCreatedSeries()(#15150)