From e5dbac7972265c4de679c8eccab522b3db8e9f93 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Wed, 10 Apr 2019 14:22:05 +0200 Subject: [PATCH] cmd/prometheus: group flags properly (#5419) Signed-off-by: Simon Pasquier --- cmd/prometheus/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go index 10ec894fe..e002cff31 100644 --- a/cmd/prometheus/main.go +++ b/cmd/prometheus/main.go @@ -171,6 +171,9 @@ func main() { a.Flag("web.page-title", "Document title of Prometheus instance."). Default("Prometheus Time Series Collection and Processing Server").StringVar(&cfg.web.PageTitle) + a.Flag("web.cors.origin", `Regex for CORS origin. It is fully anchored. Eg. 'https?://(domain1|domain2)\.com'`). + Default(".*").StringVar(&cfg.corsRegexString) + a.Flag("storage.tsdb.path", "Base path for metrics storage."). Default("data/").StringVar(&cfg.localStoragePath) @@ -235,9 +238,6 @@ func main() { a.Flag("query.max-samples", "Maximum number of samples a single query can load into memory. Note that queries will fail if they would load more samples than this into memory, so this also limits the number of samples a query can return."). Default("50000000").IntVar(&cfg.queryMaxSamples) - a.Flag("web.cors.origin", `Regex for CORS origin. It is fully anchored. Eg. 'https?://(domain1|domain2)\.com'`). - Default(".*").StringVar(&cfg.corsRegexString) - promlogflag.AddFlags(a, &cfg.promlogConfig) _, err := a.Parse(os.Args[1:])