[main] Merge upstream prometheus/main to 1b5649f869f0

[mimir-github-bot]

Merge Conflicts Detected

This PR was automatically created by the merge-upstream-prometheus workflow due to merge conflicts.

For reviewers: After conflicts are resolved, the author should post a comment with the output of git show --remerge-diff. This shows how merge conflicts were manually resolved compared to what Git would have done automatically, making conflict resolution transparent and allowing validation that conflicts were resolved correctly.

Details

• Upstream branch: main
• Local branch: main
• Latest upstream commit: 1b5649f869f06eded7e0989d8b1ec4d08ab2cce8
• Latest upstream commit date: 2026-09-11

[mimir-github-bot]

Action Required

This closed PR serves as a placeholder that holds the branch and instructions for conflict resolution. Follow these steps to resolve conflicts and reopen this PR:

# 1. Fetch and check out the empty branch created by CI
git fetch origin
git checkout bot/main/merge-upstream-main-202609111053

# 2. Fetch and merge the upstream commit to trigger conflicts
git remote add upstream https://github.com/prometheus/prometheus.git # Omit this step if you already have a remote configured for prometheus/prometheus.
git fetch upstream
git merge 1b5649f869f06eded7e0989d8b1ec4d08ab2cce8 --no-edit

# 3. If conflicts occur:
#    - Edit conflicted files and resolve conflicts
#    - Look for conflict markers: <<<<<<< HEAD, =======, >>>>>>>
#    - Remove conflict markers after resolving
#    - Run: git add . && git merge --continue

# 4. Push your resolved merge (no force-push needed)
git push

# 5. Re-open the closed PR

# 6. Post the remerge diff as a comment for reviewers:
gh pr comment --repo "grafana/mimir-prometheus" --body "## Merge Conflict Resolution

You can review how conflicts were resolved using:

\`\`\`bash
git show --remerge-diff
\`\`\`

<details>
<summary>Click to expand remerge diff output</summary>

\`\`\`diff
$(git show --remerge-diff)
\`\`\`

</details>" 1312

[mimir-vendoring]

I'm approving this upstream merge PR.
This PR merges changes from prometheus/prometheus upstream repository.
Related GitHub action is defined here.

[github-actions]

Signed commits report

4 of 15 commits between main and bot/main/merge-upstream-main-202609111053 could not be fully verified:

Commit	Author	Reason	Message
3b40fbeb	manon	unsigned	promql: add tests for histogram_fraction with a le="0" custom bucket
e3a04208	manon	unsigned	promql: fix histogram_fraction for custom buckets bounded at zero
1157c8d6	manon	unsigned	histogram: keep span gaps empty when unrolling an integer NHCB
4e362112	Michael Hoffmann	unsigned	web: retain float histograms during federation

This repository requires all commits to be signed. See GitHub docs on commit signature verification.

[cla-assistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
3 out of 6 committers have signed the CLA.

✅ duricanikolic
✅ krajorama
✅ roidelapluie
❌ MichaHoffmann
❌ youdie006
❌ bwplotka
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[duricanikolic]

Merge Conflict Resolution

You can review how conflicts were resolved using:

git show --remerge-diff

Click to expand remerge diff output

commit a0061114116d0cb24031bdc8b5a23fe675685dd1
Merge: 7d14de8bd 1b5649f86
Author: Yuri Nikolic <durica.nikolic@grafana.com>
Date:   Fri Sep 11 13:10:07 2026 +0200

    Merge commit '1b5649f869f06eded7e0989d8b1ec4d08ab2cce8' into bot/main/merge-upstream-main-202609111053
    
    # Conflicts:
    #       cmd/prometheus/main.go

diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go
remerge CONFLICT (content): Merge conflict in cmd/prometheus/main.go
index 316baa9e7..e64355d24 100644
--- a/cmd/prometheus/main.go
+++ b/cmd/prometheus/main.go
@@ -2151,7 +2151,6 @@ type tsdbOptions struct {
 
 func (opts tsdbOptions) ToTSDBOptions() tsdb.Options {
 	return tsdb.Options{
-<<<<<<< 7d14de8bd (Merge pull request #1310 from grafana/bot/main/merge-upstream-main-202609100930)
 		WALSegmentSize:                       int(opts.WALSegmentSize),
 		MaxBlockChunkSegmentSize:             int64(opts.MaxBlockChunkSegmentSize),
 		RetentionDuration:                    int64(time.Duration(opts.RetentionDuration) / time.Millisecond),
@@ -2181,40 +2180,9 @@ func (opts tsdbOptions) ToTSDBOptions() tsdb.Options {
 		StaleSeriesCompactionThreshold:       opts.StaleSeriesCompactionThreshold,
 		EnableFastStartup:                    opts.EnableFastStartup,
 		FloatChunkEncoding:                   opts.FloatChunkEncoding,
+		EnableMetadataWALRecords:             opts.EnableMetadataWALRecords,
 		HeadPostingsForMatchersCacheMetrics:  tsdb.NewPostingsForMatchersCacheMetrics(nil),
 		BlockPostingsForMatchersCacheMetrics: tsdb.NewPostingsForMatchersCacheMetrics(nil),
-=======
-		WALSegmentSize:                 int(opts.WALSegmentSize),
-		MaxBlockChunkSegmentSize:       int64(opts.MaxBlockChunkSegmentSize),
-		RetentionDuration:              int64(time.Duration(opts.RetentionDuration) / time.Millisecond),
-		MaxBytes:                       int64(opts.MaxBytes),
-		MaxPercentage:                  opts.MaxPercentage,
-		NoLockfile:                     opts.NoLockfile,
-		WALCompression:                 opts.WALCompressionType,
-		HeadChunksWriteQueueSize:       opts.HeadChunksWriteQueueSize,
-		SamplesPerChunk:                opts.SamplesPerChunk,
-		StripeSize:                     opts.StripeSize,
-		MinBlockDuration:               int64(time.Duration(opts.MinBlockDuration) / time.Millisecond),
-		MaxBlockDuration:               int64(time.Duration(opts.MaxBlockDuration) / time.Millisecond),
-		EnableExemplarStorage:          opts.EnableExemplarStorage,
-		MaxExemplars:                   opts.MaxExemplars,
-		EnableMemorySnapshotOnShutdown: opts.EnableMemorySnapshotOnShutdown,
-		OutOfOrderTimeWindow:           opts.OutOfOrderTimeWindow,
-		EnableDelayedCompaction:        opts.EnableDelayedCompaction,
-		CompactionDelayMaxPercent:      opts.CompactionDelayMaxPercent,
-		EnableOverlappingCompaction:    opts.EnableOverlappingCompaction,
-		UseUncachedIO:                  opts.UseUncachedIO,
-		BlockCompactionExcludeFunc:     opts.BlockCompactionExcludeFunc,
-		BlockReloadInterval:            time.Duration(opts.BlockReloadInterval),
-		FeatureRegistry:                features.DefaultRegistry,
-		EnableSTAsZeroSample:           opts.EnableSTAsZeroSample,
-		EnableSTStorage:                opts.EnableSTStorage,
-		EnableHistogramSTEncoding:      opts.EnableHistogramSTEncoding,
-		StaleSeriesCompactionThreshold: opts.StaleSeriesCompactionThreshold,
-		EnableFastStartup:              opts.EnableFastStartup,
-		FloatChunkEncoding:             opts.FloatChunkEncoding,
-		EnableMetadataWALRecords:       opts.EnableMetadataWALRecords,
->>>>>>> 1b5649f86 (Merge pull request #19680 from roidelapluie/roidelapluie/pr19672-snapshot-comments)
 	}
 }