2018-01-29 13:36:06 +01:00
|
|
|
diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-prometheus-2.1.0/cmd/prometheus/main.go ./cmd/prometheus/main.go
|
|
|
|
--- ../orig-prometheus-2.1.0/cmd/prometheus/main.go 2018-01-19 12:54:28.000000000 +0100
|
|
|
|
+++ ./cmd/prometheus/main.go 2018-01-25 12:07:27.050849457 +0100
|
|
|
|
@@ -114,7 +114,7 @@
|
2017-11-18 18:00:03 +01:00
|
|
|
a.HelpFlag.Short('h')
|
2017-05-18 00:07:04 +02:00
|
|
|
|
2017-11-18 18:00:03 +01:00
|
|
|
a.Flag("config.file", "Prometheus configuration file path.").
|
|
|
|
- Default("prometheus.yml").StringVar(&cfg.configFile)
|
|
|
|
+ Default("/etc/prometheus/prometheus.yml").StringVar(&cfg.configFile)
|
2017-05-18 00:07:04 +02:00
|
|
|
|
2017-11-18 18:00:03 +01:00
|
|
|
a.Flag("web.listen-address", "Address to listen on for UI, API, and telemetry.").
|
|
|
|
Default("0.0.0.0:9090").StringVar(&cfg.web.ListenAddress)
|
2018-01-29 13:36:06 +01:00
|
|
|
@@ -144,13 +144,13 @@
|
2017-11-18 18:00:03 +01:00
|
|
|
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("storage.tsdb.path", "Base path for metrics storage.").
|
|
|
|
- Default("data/").StringVar(&cfg.localStoragePath)
|
|
|
|
+ Default("/var/lib/prometheus/metrics/").StringVar(&cfg.localStoragePath)
|
|
|
|
|
2018-01-29 13:36:06 +01:00
|
|
|
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)
|