Browse Source

Merge pull request #11181 from jingyih/fix_doc

doc: clarify metrics flag
Gyuho Lee 6 years ago
parent
commit
efd1fc634b
3 changed files with 3 additions and 3 deletions
  1. 1 1
      Documentation/op-guide/configuration.md
  2. 1 1
      etcdmain/config.go
  3. 1 1
      etcdmain/help.go

+ 1 - 1
Documentation/op-guide/configuration.md

@@ -411,7 +411,7 @@ Follow the instructions when using these flags.
 + env variable: ETCD_ENABLE_PPROF
 + env variable: ETCD_ENABLE_PPROF
 
 
 ### --metrics
 ### --metrics
-+ Set level of detail for exported metrics, specify 'extensive' to include histogram metrics.
++ Set level of detail for exported metrics, specify 'extensive' to include server side grpc histogram metrics.
 + default: basic
 + default: basic
 + env variable: ETCD_METRICS
 + env variable: ETCD_METRICS
 
 

+ 1 - 1
etcdmain/config.go

@@ -240,7 +240,7 @@ func newConfig() *config {
 	fs.BoolVar(&cfg.ec.EnablePprof, "enable-pprof", false, "Enable runtime profiling data via HTTP server. Address is at client URL + \"/debug/pprof/\"")
 	fs.BoolVar(&cfg.ec.EnablePprof, "enable-pprof", false, "Enable runtime profiling data via HTTP server. Address is at client URL + \"/debug/pprof/\"")
 
 
 	// additional metrics
 	// additional metrics
-	fs.StringVar(&cfg.ec.Metrics, "metrics", cfg.ec.Metrics, "Set level of detail for exported metrics, specify 'extensive' to include histogram metrics")
+	fs.StringVar(&cfg.ec.Metrics, "metrics", cfg.ec.Metrics, "Set level of detail for exported metrics, specify 'extensive' to include server side grpc histogram metrics")
 
 
 	// auth
 	// auth
 	fs.StringVar(&cfg.ec.AuthToken, "auth-token", cfg.ec.AuthToken, "Specify auth token specific options.")
 	fs.StringVar(&cfg.ec.AuthToken, "auth-token", cfg.ec.AuthToken, "Specify auth token specific options.")

+ 1 - 1
etcdmain/help.go

@@ -167,7 +167,7 @@ Profiling and Monitoring:
   --enable-pprof 'false'
   --enable-pprof 'false'
     Enable runtime profiling data via HTTP server. Address is at client URL + "/debug/pprof/"
     Enable runtime profiling data via HTTP server. Address is at client URL + "/debug/pprof/"
   --metrics 'basic'
   --metrics 'basic'
-    Set level of detail for exported metrics, specify 'extensive' to include histogram metrics.
+    Set level of detail for exported metrics, specify 'extensive' to include server side grpc histogram metrics.
   --listen-metrics-urls ''
   --listen-metrics-urls ''
     List of URLs to listen on for the metrics and health endpoints.
     List of URLs to listen on for the metrics and health endpoints.