mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-12 06:17:27 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Flag changes for 2.0

Browse source 
Fixes: prometheus/prometheus#2087

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
This commit is contained in:
Goutham Veeramachaneni 2017-06-16 20:21:41 +05:30
parent d407bd150c
commit 67dc73fd59
No known key found for this signature in database
GPG key ID: F1C217E8E9023CAD
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/prometheus/main.go
View file

@ -99,10 +99,6 @@ func newRootCmd() *cobra.Command {
&cfg.web.RoutePrefix, "web.route-prefix", "",
"Prefix for the internal routes of web endpoints. Defaults to path of -web.external-url.",
)
rootCmd.PersistentFlags().StringVar(
&cfg.web.MetricsPath, "web.telemetry-path", "/metrics",
"Path under which to expose metrics.",
)
rootCmd.PersistentFlags().StringVar(
&cfg.web.UserAssetsPath, "web.user-assets", "",
"Path to static asset directory, available at /user.",
@ -122,7 +118,7 @@ func newRootCmd() *cobra.Command {
// Storage.
rootCmd.PersistentFlags().StringVar(
&cfg.localStoragePath, "storage.local.path", "data",
&cfg.localStoragePath, "storage.tsdb.path", "data",
"Base path for metrics storage.",
)
rootCmd.PersistentFlags().BoolVar(
@ -141,10 +137,6 @@ func newRootCmd() *cobra.Command {
&cfg.tsdb.Retention, "storage.tsdb.retention",
"How long to retain samples in the storage.",
)
rootCmd.PersistentFlags().StringVar(
&cfg.localStorageEngine, "storage.local.engine", "persisted",
"Local storage engine. Supported values are: 'persisted' (full local storage with on-disk persistence) and 'none' (no local storage).",
)
// Alertmanager.
rootCmd.PersistentFlags().IntVar(

3
web/web.go
View file

@ -121,7 +121,6 @@ type Options struct {
MaxConnections int
ExternalURL *url.URL
RoutePrefix string
MetricsPath string
UseLocalAssets bool
UserAssetsPath string
ConsoleTemplatesPath string
@ -186,7 +185,7 @@ func New(o *Options) *Handler {
router.Get("/heap", instrf("heap", dumpHeap))
router.Get(o.MetricsPath, prometheus.Handler().ServeHTTP)
router.Get("/metrics", prometheus.Handler().ServeHTTP)
router.Get("/federate", instrh("federate", httputil.CompressionHandler{
Handler: http.HandlerFunc(h.federation),