forked from pool/golang-github-prometheus-prometheus
Eric Schirra
80c7fe49de
massive update to 2.41.0; fails to build with golang-github-prometheus-promu OBS-URL: https://build.opensuse.org/request/show/1057939 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=62
50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
From 06585754d2707a31fd4ab86b9b1ce82f7d55e78c Mon Sep 17 00:00:00 2001
|
|
From: Jan Fajerski <jfajerski@suse.com>
|
|
Date: Fri, 8 Feb 2019 09:28:12 +0100
|
|
Subject: [PATCH] Default settings
|
|
|
|
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
|
|
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
|
---
|
|
cmd/prometheus/main.go | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go
|
|
index 9f4c50071..f7ec14c5f 100644
|
|
--- a/cmd/prometheus/main.go
|
|
+++ b/cmd/prometheus/main.go
|
|
@@ -226,7 +226,7 @@ func main() {
|
|
a.HelpFlag.Short('h')
|
|
|
|
a.Flag("config.file", "Prometheus configuration file path.").
|
|
- Default("prometheus.yml").StringVar(&cfg.configFile)
|
|
+ Default("/etc/prometheus/prometheus.yml").StringVar(&cfg.configFile)
|
|
|
|
a.Flag("web.listen-address", "Address to listen on for UI, API, and telemetry.").
|
|
Default("0.0.0.0:9090").StringVar(&cfg.web.ListenAddress)
|
|
@@ -261,10 +261,10 @@ func main() {
|
|
Default("false").BoolVar(&cfg.web.EnableRemoteWriteReceiver)
|
|
|
|
a.Flag("web.console.templates", "Path to the console template directory, available at /consoles.").
|
|
- Default("consoles").StringVar(&cfg.web.ConsoleTemplatesPath)
|
|
+ Default("/etc/prometheus/consoles").StringVar(&cfg.web.ConsoleTemplatesPath)
|
|
|
|
a.Flag("web.console.libraries", "Path to the console library directory.").
|
|
- Default("console_libraries").StringVar(&cfg.web.ConsoleLibrariesPath)
|
|
+ Default("/etc/prometheus/console_libraries").StringVar(&cfg.web.ConsoleLibrariesPath)
|
|
|
|
a.Flag("web.page-title", "Document title of Prometheus instance.").
|
|
Default("Prometheus Time Series Collection and Processing Server").StringVar(&cfg.web.PageTitle)
|
|
@@ -273,7 +273,7 @@ func main() {
|
|
Default(".*").StringVar(&cfg.corsRegexString)
|
|
|
|
serverOnlyFlag(a, "storage.tsdb.path", "Base path for metrics storage.").
|
|
- Default("data/").StringVar(&cfg.serverStoragePath)
|
|
+ Default("/var/lib/prometheus/metrics/").StringVar(&cfg.serverStoragePath)
|
|
|
|
serverOnlyFlag(a, "storage.tsdb.min-block-duration", "Minimum duration of a data block before being persisted. For use in testing.").
|
|
Hidden().Default("2h").SetValue(&cfg.tsdb.MinBlockDuration)
|
|
--
|
|
2.39.0
|
|
|