diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-06-23 15:29:49 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-06-23 15:29:49 -0700 |
| commit | d5560f2705b4cc8a07051836af7bf1be9259a2de (patch) | |
| tree | e85bd0bbffeba38f19f267ffb8aac74fa24f807c /weed/command/server.go | |
| parent | 6f8b3350078299e833a2bac644df151fc716abf8 (diff) | |
| download | seaweedfs-d5560f2705b4cc8a07051836af7bf1be9259a2de.tar.xz seaweedfs-d5560f2705b4cc8a07051836af7bf1be9259a2de.zip | |
simplify metrics settings
Diffstat (limited to 'weed/command/server.go')
| -rw-r--r-- | weed/command/server.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/weed/command/server.go b/weed/command/server.go index 983e45175..c44bc67a6 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -63,8 +63,6 @@ var ( serverRack = cmdServer.Flag.String("rack", "", "current volume server's rack name") serverWhiteListOption = cmdServer.Flag.String("whiteList", "", "comma separated Ip addresses having write permission. No limit if empty.") serverDisableHttp = cmdServer.Flag.Bool("disableHttp", false, "disable http requests, only gRPC operations are allowed.") - serverMetricsAddress = cmdServer.Flag.String("metrics.address", "", "Prometheus gateway address") - serverMetricsIntervalSec = cmdServer.Flag.Int("metrics.intervalSeconds", 15, "Prometheus push interval in seconds") volumeDataFolders = cmdServer.Flag.String("dir", os.TempDir(), "directories to store data files. dir[,dir]...") volumeMaxDataVolumeCounts = cmdServer.Flag.String("volume.max", "7", "maximum numbers of volumes, count[,count]...") pulseSeconds = cmdServer.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") @@ -84,6 +82,8 @@ func init() { masterOptions.volumePreallocate = cmdServer.Flag.Bool("master.volumePreallocate", false, "Preallocate disk space for volumes.") masterOptions.defaultReplication = cmdServer.Flag.String("master.defaultReplication", "000", "Default replication type if not specified.") masterOptions.garbageThreshold = cmdServer.Flag.Float64("garbageThreshold", 0.3, "threshold to vacuum and reclaim spaces") + masterOptions.metricsAddress = cmdServer.Flag.String("metrics.address", "", "Prometheus gateway address") + masterOptions.metricsIntervalSec = cmdServer.Flag.Int("metrics.intervalSeconds", 15, "Prometheus push interval in seconds") filerOptions.collection = cmdServer.Flag.String("filer.collection", "", "all data will be stored in this collection") filerOptions.port = cmdServer.Flag.Int("filer.port", 8888, "filer server http listen port") @@ -153,11 +153,6 @@ func runServer(cmd *Command, args []string) bool { filerOptions.disableHttp = serverDisableHttp masterOptions.disableHttp = serverDisableHttp - filerOptions.metricsAddress = serverMetricsAddress - filerOptions.metricsIntervalSec = serverMetricsIntervalSec - masterOptions.metricsAddress = serverMetricsAddress - masterOptions.metricsIntervalSec = serverMetricsIntervalSec - filerAddress := fmt.Sprintf("%s:%d", *serverIp, *filerOptions.port) s3Options.filer = &filerAddress |