diff options
Diffstat (limited to 'internal/praefect/config/config.go')
| -rw-r--r-- | internal/praefect/config/config.go | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/internal/praefect/config/config.go b/internal/praefect/config/config.go index 5af6eccdb..c63ff7db3 100644 --- a/internal/praefect/config/config.go +++ b/internal/praefect/config/config.go @@ -140,16 +140,10 @@ type Config struct { Sentry sentry.Config `toml:"sentry,omitempty"` PrometheusListenAddr string `toml:"prometheus_listen_addr,omitempty"` Prometheus prometheus.Config `toml:"prometheus,omitempty"` - // PrometheusExcludeDatabaseFromDefaultMetrics excludes database-related metrics from the - // default metrics. If set to `false`, then database metrics will be available both via - // `/metrics` and `/db_metrics`. Otherwise, they will only be accessible via `/db_metrics`. - // Defaults to `true`. This is used as a transitory configuration key: eventually, database - // metrics will always be removed from the standard metrics endpoint. - PrometheusExcludeDatabaseFromDefaultMetrics bool `toml:"prometheus_exclude_database_from_default_metrics,omitempty"` - Auth auth.Config `toml:"auth,omitempty"` - TLS config.TLS `toml:"tls,omitempty"` - DB `toml:"database,omitempty"` - Failover Failover `toml:"failover,omitempty"` + Auth auth.Config `toml:"auth,omitempty"` + TLS config.TLS `toml:"tls,omitempty"` + DB `toml:"database,omitempty"` + Failover Failover `toml:"failover,omitempty"` // Keep for legacy reasons: remove after Omnibus has switched FailoverEnabled bool `toml:"failover_enabled,omitempty"` MemoryQueueEnabled bool `toml:"memory_queue_enabled,omitempty"` @@ -181,7 +175,6 @@ func FromFile(filePath string) (Config, error) { Reconciliation: DefaultReconciliationConfig(), Replication: DefaultReplicationConfig(), Prometheus: prometheus.DefaultConfig(), - PrometheusExcludeDatabaseFromDefaultMetrics: true, // Sets the default Failover, to be overwritten when deserializing the TOML Failover: Failover{Enabled: true, ElectionStrategy: ElectionStrategyPerRepository}, RepositoriesCleanup: DefaultRepositoriesCleanup(), |