mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-28 23:19:41 -08:00
updates
This commit is contained in:
parent
48683d32f1
commit
787bb74076
|
@ -161,17 +161,24 @@ func (m *Manager) reloader() {
|
||||||
func (m *Manager) reload() {
|
func (m *Manager) reload() {
|
||||||
m.mtxScrape.Lock()
|
m.mtxScrape.Lock()
|
||||||
defer m.mtxScrape.Unlock()
|
defer m.mtxScrape.Unlock()
|
||||||
var err error
|
// var err error
|
||||||
if m.opts.NameEscapingScheme != "" {
|
// if m.opts.UTF8Names {
|
||||||
model.NameEscapingScheme, err = model.ToEscapingScheme(m.opts.NameEscapingScheme)
|
// model.NameValidationScheme = model.UTF8Validation
|
||||||
if err != nil {
|
// } else {
|
||||||
level.Error(m.logger).Log("msg", "error setting escaping scheme", "err", err)
|
// model.NameValidationScheme = model.LegacyValidation
|
||||||
return
|
// }
|
||||||
}
|
// level.Info(m.logger).Log("msg", "validation scheme", "scheme", model.NameValidationScheme, "arg", m.opts.UTF8Names)
|
||||||
} else {
|
// XXXXX the problem with this is that agent does not really use scrape.Options. Also too, this is like per-scrape not per-instance, so it's not really the right place for this at all.
|
||||||
model.NameEscapingScheme = DefaultNameEscapingScheme
|
// if m.opts.NameEscapingScheme != "" {
|
||||||
}
|
// model.NameEscapingScheme, err = model.ToEscapingScheme(m.opts.NameEscapingScheme)
|
||||||
level.Info(m.logger).Log("msg", "ESCAPING SCHEME", "scheme", model.NameEscapingScheme.String(), "arg", m.opts.NameEscapingScheme)
|
// if err != nil {
|
||||||
|
// level.Error(m.logger).Log("msg", "error setting escaping scheme", "err", err)
|
||||||
|
// return
|
||||||
|
// }
|
||||||
|
// } else {
|
||||||
|
// model.NameEscapingScheme = DefaultNameEscapingScheme
|
||||||
|
// }
|
||||||
|
level.Info(m.logger).Log("msg", "ESCAPING SCHEME", "scheme", model.NameEscapingScheme.String())
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
for setName, groups := range m.targetSets {
|
for setName, groups := range m.targetSets {
|
||||||
|
|
Loading…
Reference in a new issue