Remove influx from gold, ingestion and tracedb
BUG=skia:
Change-Id: I7e779c8a3a51e96858a5d1c2f8cc3d3e30bced13
Reviewed-on: https://skia-review.googlesource.com/8963
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
diff --git a/golden/go/skiacorrectness/main.go b/golden/go/skiacorrectness/main.go
index c8fc3fe..b7faf04 100644
--- a/golden/go/skiacorrectness/main.go
+++ b/golden/go/skiacorrectness/main.go
@@ -21,7 +21,6 @@
"go.skia.org/infra/go/gerrit"
"go.skia.org/infra/go/git/gitinfo"
"go.skia.org/infra/go/httputils"
- "go.skia.org/infra/go/influxdb"
"go.skia.org/infra/go/issues"
"go.skia.org/infra/go/login"
"go.skia.org/infra/go/metadata"
@@ -76,11 +75,6 @@
serviceAccountFile = flag.String("service_account_file", "", "Credentials file for service account.")
showBotProgress = flag.Bool("show_bot_progress", true, "Query status.skia.org for the progress of bot results.")
traceservice = flag.String("trace_service", "localhost:10000", "The address of the traceservice endpoint.")
-
- influxHost = flag.String("influxdb_host", influxdb.DEFAULT_HOST, "The InfluxDB hostname.")
- influxUser = flag.String("influxdb_name", influxdb.DEFAULT_USER, "The InfluxDB username.")
- influxPassword = flag.String("influxdb_password", influxdb.DEFAULT_PASSWORD, "The InfluxDB password.")
- influxDatabase = flag.String("influxdb_database", influxdb.DEFAULT_DATABASE, "The InfluxDB database.")
)
const (
@@ -98,10 +92,9 @@
// Setup DB flags.
dbConf := database.ConfigFromFlags(db.PROD_DB_HOST, db.PROD_DB_PORT, database.USER_RW, db.PROD_DB_NAME, db.MigrationSteps())
- // Global init to initialize influx, prometheus and cloud logging.
+ // Global init to initialize prometheus and cloud logging.
_, appName := filepath.Split(os.Args[0])
common.InitWithMust(appName,
- common.InfluxOpt(influxHost, influxUser, influxPassword, influxDatabase, local),
common.PrometheusOpt(promPort),
common.CloudLoggingOpt(),
)
diff --git a/tracedb/go/skia_ingestion/main.go b/tracedb/go/skia_ingestion/main.go
index d823384..d362f61 100644
--- a/tracedb/go/skia_ingestion/main.go
+++ b/tracedb/go/skia_ingestion/main.go
@@ -16,7 +16,6 @@
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/eventbus"
"go.skia.org/infra/go/geventbus"
- "go.skia.org/infra/go/influxdb"
"go.skia.org/infra/go/ingestion"
"go.skia.org/infra/go/sharedconfig"
"go.skia.org/infra/go/sklog"
@@ -29,10 +28,6 @@
// Command line flags.
var (
configFilename = flag.String("config_filename", "default.toml", "Configuration file in TOML format.")
- influxDatabase = flag.String("influxdb_database", influxdb.DEFAULT_DATABASE, "The InfluxDB database.")
- influxHost = flag.String("influxdb_host", influxdb.DEFAULT_HOST, "The InfluxDB hostname.")
- influxPassword = flag.String("influxdb_password", influxdb.DEFAULT_PASSWORD, "The InfluxDB password.")
- influxUser = flag.String("influxdb_name", influxdb.DEFAULT_USER, "The InfluxDB username.")
local = flag.Bool("local", false, "Running locally if true. As opposed to in production.")
memProfile = flag.Duration("memprofile", 0, "Duration for which to profile memory. After this duration the program writes the memory profile and exits.")
nsqdAddress = flag.String("nsqd", "", "Address and port of nsqd instance.")
@@ -44,9 +39,8 @@
defer common.LogPanic()
_, appName := filepath.Split(os.Args[0])
- // Global init to initialize influx, prometheus and cloud logging.
+ // Global init to initialize prometheus and cloud logging.
common.InitWithMust(appName,
- common.InfluxOpt(influxHost, influxUser, influxPassword, influxDatabase, local),
common.PrometheusOpt(promPort),
common.CloudLoggingOpt(),
)
diff --git a/tracedb/go/traceserver/main.go b/tracedb/go/traceserver/main.go
index cbd5687..cb3ab21 100644
--- a/tracedb/go/traceserver/main.go
+++ b/tracedb/go/traceserver/main.go
@@ -12,7 +12,6 @@
"syscall"
"go.skia.org/infra/go/common"
- "go.skia.org/infra/go/influxdb"
"go.skia.org/infra/go/sharedb"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/trace/service"
@@ -21,21 +20,16 @@
// flags
var (
- cpuprofile = flag.String("cpuprofile", "", "Write cpu profile to file.")
- db_file = flag.String("db_file", "", "The name of the BoltDB file that will store the traces.")
- influxDatabase = flag.String("influxdb_database", influxdb.DEFAULT_DATABASE, "The InfluxDB database.")
- influxHost = flag.String("influxdb_host", influxdb.DEFAULT_HOST, "The InfluxDB hostname.")
- influxPassword = flag.String("influxdb_password", influxdb.DEFAULT_PASSWORD, "The InfluxDB password.")
- influxUser = flag.String("influxdb_name", influxdb.DEFAULT_USER, "The InfluxDB username.")
- local = flag.Bool("local", false, "Running locally if true. As opposed to in production.")
- port = flag.String("port", ":9090", "The port to serve the gRPC endpoint on.")
- promPort = flag.String("prom_port", ":20000", "Metrics service address (e.g., ':10110')")
- sharedbDir = flag.String("sharedb_dir", "", "Directory used by shareDB. If empty shareDB service will not enabled.")
+ cpuprofile = flag.String("cpuprofile", "", "Write cpu profile to file.")
+ db_file = flag.String("db_file", "", "The name of the BoltDB file that will store the traces.")
+ local = flag.Bool("local", false, "Running locally if true. As opposed to in production.")
+ port = flag.String("port", ":9090", "The port to serve the gRPC endpoint on.")
+ promPort = flag.String("prom_port", ":20000", "Metrics service address (e.g., ':10110')")
+ sharedbDir = flag.String("sharedb_dir", "", "Directory used by shareDB. If empty shareDB service will not enabled.")
)
func main() {
common.InitWithMust(filepath.Base(os.Args[0]),
- common.InfluxOpt(influxHost, influxUser, influxPassword, influxDatabase, local),
common.PrometheusOpt(promPort),
common.CloudLoggingOpt(),
)
