forked from pool/golang-github-prometheus-prometheus
3f0a33246a
- Refresh patches
- Upgrade to upstream version 2.27.1
+ Bugfix:
* SECURITY: Fix arbitrary redirects under the /new endpoint (CVE-2021-29622)
- Upgrade to upstream version 2.27.0
+ Features:
* Promtool: Retroactive rule evaluation functionality. #7675
* Configuration: Environment variable expansion for external labels. Behind --enable-feature=expand-external-labels flag. #8649
* TSDB: Add a flag(--storage.tsdb.max-block-chunk-segment-size) to control the max chunks file size of the blocks for small Prometheus instances. #8478
* UI: Add a dark theme. #8604
* AWS Lightsail Discovery: Add AWS Lightsail Discovery. #8693
* Docker Discovery: Add Docker Service Discovery. #8629
* OAuth: Allow OAuth 2.0 to be used anywhere an HTTP client is used. #8761
* Remote Write: Send exemplars via remote write. Experimental and disabled by default. #8296
+ Enhancements:
* Digital Ocean Discovery: Add __meta_digitalocean_vpc label. #8642
* Scaleway Discovery: Read Scaleway secret from a file. #8643
* Scrape: Add configurable limits for label size and count. #8777
* UI: Add 16w and 26w time range steps. #8656
* Templating: Enable parsing strings in humanize functions. #8682
+ Bugfixes:
* UI: Provide errors instead of blank page on TSDB Status Page. #8654 #8659
* TSDB: Do not panic when writing very large records to the WAL. #8790
* TSDB: Avoid panic when mmaped memory is referenced after the file is closed. #8723
* Scaleway Discovery: Fix nil pointer dereference. #8737
* Consul Discovery: Restart no longer required after config update with no targets. #8766
OBS-URL: https://build.opensuse.org/request/show/895359
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=43
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
From f858a01d7d9ca8c28be8a9d6251e6dd7f0717272 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 9fbd6e76b..6283c4057 100644
|
|
--- a/cmd/prometheus/main.go
|
|
+++ b/cmd/prometheus/main.go
|
|
@@ -191,7 +191,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)
|
|
@@ -223,10 +223,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)
|
|
@@ -235,7 +235,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.31.1
|
|
|