mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2024-11-29 17:51:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Database metrics

Browse source
This commit is contained in:
Neil Alexander 2022-10-04 13:31:51 +01:00
parent 3da182212e
commit 7c4e01e5c4
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
9 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/sqlutil/sqlutil.go
View file

@ -6,6 +6,7 @@ import (
"regexp" "regexp"
"github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/setup/config"
"github.com/prometheus/client_golang/prometheus/collectors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -47,5 +48,6 @@ func Open(dbProperties *config.DatabaseOptions, writer Writer) (*sql.DB, error)
db.SetMaxIdleConns(dbProperties.MaxIdleConns()) db.SetMaxIdleConns(dbProperties.MaxIdleConns())
db.SetConnMaxLifetime(dbProperties.ConnMaxLifetime()) db.SetConnMaxLifetime(dbProperties.ConnMaxLifetime())
} }
collectors.NewDBStatsCollector(db, fmt.Sprintf("dendrite_%s", dbProperties.Name))
return db, nil return db, nil
} }

1
setup/config/config_federationapi.go
View file

@ -40,6 +40,7 @@ func (c *FederationAPI) Defaults(opts DefaultOpts) {
c.InternalAPI.Listen = "http://localhost:7772" c.InternalAPI.Listen = "http://localhost:7772"
c.InternalAPI.Connect = "http://localhost:7772" c.InternalAPI.Connect = "http://localhost:7772"
c.ExternalAPI.Listen = "http://[::]:8072" c.ExternalAPI.Listen = "http://[::]:8072"
c.Database.Name = "federation_api"
c.Database.Defaults(10) c.Database.Defaults(10)
} }
c.FederationMaxRetries = 16 c.FederationMaxRetries = 16

3
setup/config/config_global.go
View file

@ -96,6 +96,7 @@ func (c *Global) Defaults(opts DefaultOpts) {
} }
c.KeyValidityPeriod = time.Hour * 24 * 7 c.KeyValidityPeriod = time.Hour * 24 * 7
if opts.Monolithic { if opts.Monolithic {
c.DatabaseOptions.Name = "global"
c.DatabaseOptions.Defaults(90) c.DatabaseOptions.Defaults(90)
} }
c.JetStream.Defaults(opts) c.JetStream.Defaults(opts)
@ -237,6 +238,8 @@ func (c *Sentry) Verify(configErrs *ConfigErrors, isMonolith bool) {
} }
type DatabaseOptions struct { type DatabaseOptions struct {
// Which database is this? For use in prometheus collectors.
Name string `json:"-"`
// The connection string, file:filename.db or postgres://server.... // The connection string, file:filename.db or postgres://server....
ConnectionString DataSource `yaml:"connection_string"` ConnectionString DataSource `yaml:"connection_string"`
// Maximum open connections to the DB (0 = use default, negative means unlimited) // Maximum open connections to the DB (0 = use default, negative means unlimited)

1
setup/config/config_keyserver.go
View file

@ -12,6 +12,7 @@ func (c *KeyServer) Defaults(opts DefaultOpts) {
if !opts.Monolithic { if !opts.Monolithic {
c.InternalAPI.Listen = "http://localhost:7779" c.InternalAPI.Listen = "http://localhost:7779"
c.InternalAPI.Connect = "http://localhost:7779" c.InternalAPI.Connect = "http://localhost:7779"
c.Database.Name = "keyserver"
c.Database.Defaults(10) c.Database.Defaults(10)
} }
if opts.Generate { if opts.Generate {

1
setup/config/config_mediaapi.go
View file

@ -43,6 +43,7 @@ func (c *MediaAPI) Defaults(opts DefaultOpts) {
c.InternalAPI.Listen = "http://localhost:7774" c.InternalAPI.Listen = "http://localhost:7774"
c.InternalAPI.Connect = "http://localhost:7774" c.InternalAPI.Connect = "http://localhost:7774"
c.ExternalAPI.Listen = "http://[::]:8074" c.ExternalAPI.Listen = "http://[::]:8074"
c.Database.Name = "media_api"
c.Database.Defaults(5) c.Database.Defaults(5)
} }
c.MaxFileSizeBytes = DefaultMaxFileSizeBytes c.MaxFileSizeBytes = DefaultMaxFileSizeBytes

1
setup/config/config_mscs.go
View file

@ -15,6 +15,7 @@ type MSCs struct {
func (c *MSCs) Defaults(opts DefaultOpts) { func (c *MSCs) Defaults(opts DefaultOpts) {
if !opts.Monolithic { if !opts.Monolithic {
c.Database.Name = "mscs"
c.Database.Defaults(5) c.Database.Defaults(5)
} }
if opts.Generate { if opts.Generate {

1
setup/config/config_roomserver.go
View file

@ -12,6 +12,7 @@ func (c *RoomServer) Defaults(opts DefaultOpts) {
if !opts.Monolithic { if !opts.Monolithic {
c.InternalAPI.Listen = "http://localhost:7770" c.InternalAPI.Listen = "http://localhost:7770"
c.InternalAPI.Connect = "http://localhost:7770" c.InternalAPI.Connect = "http://localhost:7770"
c.Database.Name = "roomserver"
c.Database.Defaults(20) c.Database.Defaults(20)
} }
if opts.Generate { if opts.Generate {

1
setup/config/config_syncapi.go
View file

@ -18,6 +18,7 @@ func (c *SyncAPI) Defaults(opts DefaultOpts) {
c.InternalAPI.Listen = "http://localhost:7773" c.InternalAPI.Listen = "http://localhost:7773"
c.InternalAPI.Connect = "http://localhost:7773" c.InternalAPI.Connect = "http://localhost:7773"
c.ExternalAPI.Listen = "http://localhost:8073" c.ExternalAPI.Listen = "http://localhost:8073"
c.Database.Name = "sync_api"
c.Database.Defaults(20) c.Database.Defaults(20)
} }
c.Fulltext.Defaults(opts) c.Fulltext.Defaults(opts)

1
setup/config/config_userapi.go
View file

@ -27,6 +27,7 @@ func (c *UserAPI) Defaults(opts DefaultOpts) {
if !opts.Monolithic { if !opts.Monolithic {
c.InternalAPI.Listen = "http://localhost:7781" c.InternalAPI.Listen = "http://localhost:7781"
c.InternalAPI.Connect = "http://localhost:7781" c.InternalAPI.Connect = "http://localhost:7781"
c.AccountDatabase.Name = "user_api"
c.AccountDatabase.Defaults(10) c.AccountDatabase.Defaults(10)
} }
c.BCryptCost = bcrypt.DefaultCost c.BCryptCost = bcrypt.DefaultCost