forked from pool/golang-github-prometheus-prometheus
076e8aae29
- Upgrade to upstream version 2.26.0
- Add vendor and web_assets tarballs
- Uyuni: Read formula data from exporters map
- Uyuni: Add support for TLS targets
+ Changed:
* 0003-Add-Uyuni-service-discovery.patch
OBS-URL: https://build.opensuse.org/request/show/890467
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=40
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
From 7860b67a0a684d2d51087e323b780410031d83af Mon Sep 17 00:00:00 2001
|
|
From: Jan Fajerski <jfajerski@suse.com>
|
|
Date: Fri, 8 Feb 2019 09:28:12 +0100
|
|
Subject: [PATCH 2/3] Default settings
|
|
|
|
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
|
|
---
|
|
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 37a7f3535..ae43ded89 100644
|
|
--- a/cmd/prometheus/main.go
|
|
+++ b/cmd/prometheus/main.go
|
|
@@ -187,7 +187,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)
|
|
@@ -219,10 +219,10 @@ func main() {
|
|
Default("false").BoolVar(&cfg.web.EnableAdminAPI)
|
|
|
|
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)
|
|
@@ -231,7 +231,7 @@ func main() {
|
|
Default(".*").StringVar(&cfg.corsRegexString)
|
|
|
|
a.Flag("storage.tsdb.path", "Base path for metrics storage.").
|
|
- Default("data/").StringVar(&cfg.localStoragePath)
|
|
+ Default("/var/lib/prometheus/metrics/").StringVar(&cfg.localStoragePath)
|
|
|
|
a.Flag("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.26.2
|
|
|