fix(pgbouncer): fix setting db name in collectDatabases() (#751)

netdata · Aug 7, 2022 · 2c12f65 · 2c12f65
1 parent 03f9133
commit 2c12f65
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/modules/pgbouncer/charts.go b/modules/pgbouncer/charts.go
@@ -214,12 +214,13 @@ var (
 	}
 )
 
-func newDatabaseCharts(dbname string) *module.Charts {
+func newDatabaseCharts(dbname, pgDBName string) *module.Charts {
 	charts := dbChartsTmpl.Copy()
 	for _, c := range *charts {
 		c.ID = fmt.Sprintf(c.ID, dbname)
 		c.Labels = []module.Label{
 			{Key: "database", Value: dbname},
+			{Key: "postgres_database", Value: pgDBName},
 		}
 		for _, d := range c.Dims {
 			d.ID = fmt.Sprintf(d.ID, dbname)
@@ -228,8 +229,8 @@ func newDatabaseCharts(dbname string) *module.Charts {
 	return charts
 }
 
-func (p *PgBouncer) addNewDatabaseCharts(dbname string) {
-	charts := newDatabaseCharts(dbname)
+func (p *PgBouncer) addNewDatabaseCharts(dbname, pgDBName string) {
+	charts := newDatabaseCharts(dbname, pgDBName)
 	if err := p.Charts().Add(*charts...); err != nil {
 		p.Warning(err)
 	}

diff --git a/modules/pgbouncer/collect.go b/modules/pgbouncer/collect.go
@@ -83,7 +83,7 @@ func (p *PgBouncer) collectMetrics(mx map[string]int64) {
 		}
 		if !db.hasCharts {
 			db.hasCharts = true
-			p.addNewDatabaseCharts(name)
+			p.addNewDatabaseCharts(name, db.pgDBName)
 		}
 
 		mx["db_"+name+"_total_xact_count"] = db.totalXactCount
@@ -124,9 +124,11 @@ func (p *PgBouncer) collectDatabases() error {
 	var db string
 	return p.collectQuery(q, func(column, value string) {
 		switch column {
-		case "database":
+		case "name":
 			db = value
 			p.getDBMetrics(db).updated = true
+		case "database":
+			p.getDBMetrics(db).pgDBName = value
 		case "max_connections":
 			p.getDBMetrics(db).maxConnections = parseInt(value)
 		case "current_connections":
@@ -315,6 +317,7 @@ func (p *PgBouncer) resetMetrics() {
 	for name, db := range p.metrics.dbs {
 		p.metrics.dbs[name] = &dbMetrics{
 			name:      db.name,
+			pgDBName:  db.pgDBName,
 			hasCharts: db.hasCharts,
 		}
 	}

diff --git a/modules/pgbouncer/metrics.go b/modules/pgbouncer/metrics.go
@@ -6,8 +6,11 @@ type metrics struct {
 	dbs map[string]*dbMetrics
 }
 
+// dbMetrics represents PgBouncer database (not the PostgreSQL database of the outgoing connection).
 type dbMetrics struct {
-	name      string
+	name     string
+	pgDBName string
+
 	updated   bool
 	hasCharts bool