From 2072c26a96badbe45d6df56a4cd68ffd1b6fb12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Fri, 16 Nov 2018 17:58:24 +0200 Subject: cmd, core, params: add support for Goerli (cherry picked from commit b0ed083ead2d58cc25754eacdb48046eb2bc81cb) --- cmd/geth/main.go | 1 + 1 file changed, 1 insertion(+) (limited to 'cmd/geth/main.go') diff --git a/cmd/geth/main.go b/cmd/geth/main.go index ebaeba9f4..c62fd87f2 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -121,6 +121,7 @@ var ( utils.DeveloperPeriodFlag, utils.TestnetFlag, utils.RinkebyFlag, + utils.GoerliFlag, utils.VMEnableDebugFlag, utils.NetworkIdFlag, utils.ConstantinopleOverrideFlag, -- cgit v1.2.3 From 4f908db69e8cb69cdf45775c7c75e74244e91653 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Tue, 29 Jan 2019 09:14:24 +0100 Subject: cmd/utils: allow for multiple influxdb tags (#18520) This PR is replacing the metrics.influxdb.host.tag cmd-line flag with metrics.influxdb.tags - a comma-separated key/value tags, that are passed to the InfluxDB reporter, so that we can index measurements with multiple tags, and not just one host tag. This will be useful for Swarm, where we want to index measurements not just with the host tag, but also with bzzkey and git commit version (for long-running deployments). (cherry picked from commit 21acf0bc8d4f179397bb7d06d6f36df3cbee4a8e) --- cmd/geth/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd/geth/main.go') diff --git a/cmd/geth/main.go b/cmd/geth/main.go index c62fd87f2..e60a27e43 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -38,7 +38,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/node" - "gopkg.in/urfave/cli.v1" + cli "gopkg.in/urfave/cli.v1" ) const ( @@ -165,7 +165,7 @@ var ( utils.MetricsInfluxDBDatabaseFlag, utils.MetricsInfluxDBUsernameFlag, utils.MetricsInfluxDBPasswordFlag, - utils.MetricsInfluxDBHostTagFlag, + utils.MetricsInfluxDBTagsFlag, } ) -- cgit v1.2.3