Browse Source

Merge pull request #15328 from prometheus/deadcode

chore: Remove dead code
pull/12826/head
Arthur Silva Sens 2 weeks ago committed by GitHub
parent
commit
96c2fe04e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 10
      cmd/prometheus/main.go
  2. 2
      scrape/manager.go

10
cmd/prometheus/main.go

@ -190,7 +190,6 @@ type flagConfig struct {
queryConcurrency int queryConcurrency int
queryMaxSamples int queryMaxSamples int
RemoteFlushDeadline model.Duration RemoteFlushDeadline model.Duration
nameEscapingScheme string
maxNotificationsSubscribers int maxNotificationsSubscribers int
enableAutoReload bool enableAutoReload bool
@ -551,15 +550,6 @@ func main() {
os.Exit(1) os.Exit(1)
} }
if cfg.nameEscapingScheme != "" {
scheme, err := model.ToEscapingScheme(cfg.nameEscapingScheme)
if err != nil {
fmt.Fprintf(os.Stderr, `Invalid name escaping scheme: %q; Needs to be one of "values", "underscores", or "dots"`, cfg.nameEscapingScheme)
os.Exit(1)
}
model.NameEscapingScheme = scheme
}
if agentMode && len(serverOnlyFlags) > 0 { if agentMode && len(serverOnlyFlags) > 0 {
fmt.Fprintf(os.Stderr, "The following flag(s) can not be used in agent mode: %q", serverOnlyFlags) fmt.Fprintf(os.Stderr, "The following flag(s) can not be used in agent mode: %q", serverOnlyFlags)
os.Exit(3) os.Exit(3)

2
scrape/manager.go

@ -94,8 +94,6 @@ type Options struct {
skipOffsetting bool skipOffsetting bool
} }
const DefaultNameEscapingScheme = model.ValueEncodingEscaping
// Manager maintains a set of scrape pools and manages start/stop cycles // Manager maintains a set of scrape pools and manages start/stop cycles
// when receiving new target groups from the discovery manager. // when receiving new target groups from the discovery manager.
type Manager struct { type Manager struct {

Loading…
Cancel
Save