diff --git a/database/gorm/client.go b/database/gorm/client.go index 5c9a2a2..70cc8a7 100644 --- a/database/gorm/client.go +++ b/database/gorm/client.go @@ -73,20 +73,16 @@ func NewGormClient(cfg *conf.Bootstrap, l *log.Helper, migrates []interface{}) * } if cfg.Data.Database.GetEnableMetrics() { - db.Use(prometheus.New(prometheus.Config{ - DBName: "db1", // `DBName` as metrics label - RefreshInterval: 15, // refresh metrics interval (default 15 seconds) - PushAddr: "prometheus pusher address", // push metrics if `PushAddr` configured - StartServer: true, // start http server to expose metrics - HTTPServerPort: 8080, // configure http server port, default port 8080 (if you have configured multiple instances, only the first `HTTPServerPort` will be used to start server) - MetricsCollector: []prometheus.MetricsCollector{ - &prometheus.MySQL{VariableNames: []string{"Threads_running"}}, - }, - Labels: map[string]string{ - "instance": "127.0.0.1", // config custom labels if necessary - }, - })) - + if err = db.Use(prometheus.New(prometheus.Config{ + RefreshInterval: 15, // refresh metrics interval (default 15 seconds) + StartServer: true, // start http server to expose metrics + DBName: cfg.Data.Database.GetPrometheusDbName(), // `DBName` as metrics label + PushAddr: cfg.Data.Database.GetPrometheusPushAddr(), // push metrics if `PushAddr` configured + HTTPServerPort: cfg.Data.Database.GetPrometheusHttpPort(), // configure http server port, default port 8080 (if you have configured multiple instances, only the first `HTTPServerPort` will be used to start server) + })); err != nil { + l.Fatalf("failed enable metrics: %v", err) + return nil + } } sqlDB, err := db.DB() diff --git a/tag.bat b/tag.bat index b73d33d..6c1f55c 100644 --- a/tag.bat +++ b/tag.bat @@ -1,4 +1,4 @@ -git tag api/v0.0.7 --force +git tag api/v0.0.8 --force git tag utils/v0.1.0 --force @@ -10,8 +10,8 @@ git tag logger/v0.0.7 --force git tag rpc/v0.0.5 --force git tag tracer/v0.0.5 --force -git tag database/ent/v0.0.1 --force -git tag database/gorm/v0.0.1 --force +git tag database/ent/v0.0.2 --force +git tag database/gorm/v0.0.2 --force git tag database/mongodb/v0.0.1 --force git tag database/influxdb/v0.0.1 --force git tag database/cassandra/v0.0.1 --force