Commit 536dfb62 by Julien Pivotto

Add an experimental, hidden flag

Signed-off-by: 's avatarJulien Pivotto <roidelapluie@inuits.eu>
parent b90c7a55
...@@ -239,6 +239,9 @@ func main() { ...@@ -239,6 +239,9 @@ func main() {
a.Flag("rules.alert.resend-delay", "Minimum amount of time to wait before resending an alert to Alertmanager."). a.Flag("rules.alert.resend-delay", "Minimum amount of time to wait before resending an alert to Alertmanager.").
Default("1m").SetValue(&cfg.resendDelay) Default("1m").SetValue(&cfg.resendDelay)
a.Flag("scrape.timestamp-tolerance", "Tolerance applied to scrapes timestamp to improve timestamp compression. Experimental.").
Hidden().Default("2ms").DurationVar(&scrape.ScrapeTimestampTolerance)
a.Flag("alertmanager.notification-queue-capacity", "The capacity of the queue for pending Alertmanager notifications."). a.Flag("alertmanager.notification-queue-capacity", "The capacity of the queue for pending Alertmanager notifications.").
Default("10000").IntVar(&cfg.notifier.QueueCapacity) Default("10000").IntVar(&cfg.notifier.QueueCapacity)
......
...@@ -50,7 +50,7 @@ import ( ...@@ -50,7 +50,7 @@ import (
// Temporary tolerance for scrape appends timestamps alignment, to enable better // Temporary tolerance for scrape appends timestamps alignment, to enable better
// compression at the TSDB level. // compression at the TSDB level.
// See https://github.com/prometheus/prometheus/issues/7846 // See https://github.com/prometheus/prometheus/issues/7846
const scrapeTimestampTolerance = 2 * time.Millisecond var ScrapeTimestampTolerance = 2 * time.Millisecond
var errNameLabelMandatory = fmt.Errorf("missing metric name (%s label)", labels.MetricName) var errNameLabelMandatory = fmt.Errorf("missing metric name (%s label)", labels.MetricName)
...@@ -1009,14 +1009,14 @@ mainLoop: ...@@ -1009,14 +1009,14 @@ mainLoop:
// increase in TSDB. // increase in TSDB.
// See https://github.com/prometheus/prometheus/issues/7846 // See https://github.com/prometheus/prometheus/issues/7846
scrapeTime := time.Now() scrapeTime := time.Now()
if interval > 100*scrapeTimestampTolerance { if interval > 100*ScrapeTimestampTolerance {
// For some reason, a tick might have been skipped, in which case we // For some reason, a tick might have been skipped, in which case we
// would call alignedScrapeTime.Add(interval) multiple times. // would call alignedScrapeTime.Add(interval) multiple times.
for scrapeTime.Sub(alignedScrapeTime) >= interval { for scrapeTime.Sub(alignedScrapeTime) >= interval {
alignedScrapeTime = alignedScrapeTime.Add(interval) alignedScrapeTime = alignedScrapeTime.Add(interval)
} }
// Align the scrape time if we are in the tolerance boundaries. // Align the scrape time if we are in the tolerance boundaries.
if scrapeTime.Sub(alignedScrapeTime) <= scrapeTimestampTolerance { if scrapeTime.Sub(alignedScrapeTime) <= ScrapeTimestampTolerance {
scrapeTime = alignedScrapeTime scrapeTime = alignedScrapeTime
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment