Follow-up merge from main

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
This commit is contained in:
György Krajcsovits 2024-10-09 11:54:49 +02:00
parent a2805e7934
commit 4e911a3a05

View file

@ -180,7 +180,7 @@ func (m *Manager) reload() {
}
if scrapeConfig.ConvertClassicHistograms && m.opts.EnableCreatedTimestampZeroIngestion {
// TODO(krajorama): lift this limitation
level.Error(m.logger).Log("msg", "error reloading target set", "err", "cannot convert classic histograms to native histograms with custom buckets and ingest created timestamp zero samples at the same time")
m.logger.Error("msg", "error reloading target set", "err", "cannot convert classic histograms to native histograms with custom buckets and ingest created timestamp zero samples at the same time")
continue
}
m.metrics.targetScrapePools.Inc()