Merge branch 'nolockfile' into dev-2.0

This commit is contained in:
Fabian Reinartz 2017-06-23 11:38:08 +02:00
commit 5cd37fe36f

View file

@ -146,6 +146,9 @@ func main() {
a.Flag("storage.tsdb.retention", "How long to retain samples in the storage."). a.Flag("storage.tsdb.retention", "How long to retain samples in the storage.").
Default("15d").SetValue(&cfg.tsdb.Retention) Default("15d").SetValue(&cfg.tsdb.Retention)
a.Flag("storage.tsdb.no-lockfile", "Do not create lockfile in data directory.").
Default("false").BoolVar(&cfg.tsdb.NoLockfile)
a.Flag("alertmanager.notification-queue-capacity", "The capacity of the queue for pending alert manager notifications."). a.Flag("alertmanager.notification-queue-capacity", "The capacity of the queue for pending alert manager notifications.").
Default("10000").IntVar(&cfg.notifier.QueueCapacity) Default("10000").IntVar(&cfg.notifier.QueueCapacity)