mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-12-03 08:31:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17423 from geogrego/main

Browse Source 
docs: Fix typos
This commit is contained in:
Björn Rabenstein 2025-10-30 16:56:48 +01:00 committed by GitHub
commit 84d2007a08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/configuration/configuration.md
View File

@ -179,7 +179,7 @@ global:
# 1, but the resulting classic histogram or NHCB only has a sole bucket, the
# +Inf bucket. If scrape_native_histograms is true, however, the histogram is
# recognized as a pure native histogram and ingested as such. There will be
# no classic histgram ingested, no matter what
# no classic histogram ingested, no matter what
# always_scrape_classic_histograms is set to, and there will be no
# conversion to an NHCB, no matter what convert_classic_histograms_to_nhcb
# is set to.

2
promql/promqltest/testdata/extended_vectors.test vendored
View File

@ -169,7 +169,7 @@ eval instant at 110s increase(metric[1m] smoothed)
eval instant at 125s increase(metric[1m] smoothed)
{} 4.666666666
# Test that inverval is left-open.
# Test that interval is left-open.
clear
load 1m

2
promql/promqltest/testdata/native_histograms.test vendored
View File

@ -1580,7 +1580,7 @@ eval instant at 5m metric - 0.5 * metric
{id="1"} {{count:2 sum:2 counter_reset_hint:gauge buckets:[0.5 1 0.5]}}
{id="2"} {{count:2 sum:2 counter_reset_hint:gauge buckets:[0.5 1 0.5]}}
# Subtraction results in gauges, now with actually negtive result.
# Subtraction results in gauges, now with actually negative result.
eval instant at 5m metric - 2 * metric
expect no_warn
expect no_info

2
storage/interface.go
View File

@ -389,7 +389,7 @@ type SeriesSet interface {
Next() bool
// At returns full series. Returned series should be iterable even after Next is called.
At() Series
// The error that iteration as failed with.
// The error that iteration has failed with.
// When an error occurs, set cannot continue to iterate.
Err() error
// A collection of warnings for the whole set.

2
tsdb/tombstones/tombstones.go
View File

@ -353,7 +353,7 @@ func (in Intervals) Add(n Interval) Intervals {
return append(in, n)
}
// Find min and max indexes of intervals that overlap with the new interval.
// Intervals are closed [t1, t2] and t is discreet, so if neighbour intervals are 1 step difference
// Intervals are closed [t1, t2] and t is discrete, so if neighbour intervals are 1 step difference
// to the new one, we can merge those together.
mini := 0
if n.Mint != math.MinInt64 { // Avoid overflow.