Merge branch 'nolockfile' into dev-2.0

8 years ago · 5cd37fe36f
parent cdfd9c829d be32afd6df
commit 5cd37fe36f
1 changed files with 3 additions and 0 deletions
--- a/cmd/prometheus/main.go
+++ b/cmd/prometheus/main.go
@ -146,6 +146,9 @@ func main() {
 	a.Flag("storage.tsdb.retention", "How long to retain samples in the storage.").
 		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.").
 		Default("10000").IntVar(&cfg.notifier.QueueCapacity)