mirror of
https://github.com/prometheus-community/postgres_exporter
synced 2025-05-12 04:48:03 +00:00
Fix mapping for database/relation names
Signed-off-by: Moritz Wirth <mw@flanga.io>
This commit is contained in:
parent
0e82878223
commit
3b3ea1c644
@ -45,7 +45,7 @@ var (
|
|||||||
"total_relation",
|
"total_relation",
|
||||||
),
|
),
|
||||||
"Total Relation Size of the table",
|
"Total Relation Size of the table",
|
||||||
[]string{"schemaname", "datname", "relname"}, nil,
|
[]string{"schemaname", "relname", "datname"}, nil,
|
||||||
)
|
)
|
||||||
pgTableIndexSizeDesc = prometheus.NewDesc(
|
pgTableIndexSizeDesc = prometheus.NewDesc(
|
||||||
prometheus.BuildFQName(
|
prometheus.BuildFQName(
|
||||||
@ -54,7 +54,7 @@ var (
|
|||||||
"index",
|
"index",
|
||||||
),
|
),
|
||||||
"Indexes Size of the Table",
|
"Indexes Size of the Table",
|
||||||
[]string{"schemaname", "datname", "relname"}, nil,
|
[]string{"schemaname", "relname", "datname"}, nil,
|
||||||
)
|
)
|
||||||
pgRelationSizeDesc = prometheus.NewDesc(
|
pgRelationSizeDesc = prometheus.NewDesc(
|
||||||
prometheus.BuildFQName(
|
prometheus.BuildFQName(
|
||||||
@ -63,11 +63,11 @@ var (
|
|||||||
"relation",
|
"relation",
|
||||||
),
|
),
|
||||||
"Relation Size of the table",
|
"Relation Size of the table",
|
||||||
[]string{"schemaname", "datname", "relname"}, nil,
|
[]string{"schemaname", "relname", "datname"}, nil,
|
||||||
)
|
)
|
||||||
pgTableSizeQuery = `SELECT
|
pgTableSizeQuery = `SELECT
|
||||||
table_catalog datname,
|
table_catalog relname,
|
||||||
table_name relname,
|
table_name datname,
|
||||||
table_schema schemaname,
|
table_schema schemaname,
|
||||||
pg_total_relation_size('"'||table_schema||'"."'||table_name||'"') total_relation_size,
|
pg_total_relation_size('"'||table_schema||'"."'||table_name||'"') total_relation_size,
|
||||||
pg_relation_size('"'||table_schema||'"."'||table_name||'"') relation_size,
|
pg_relation_size('"'||table_schema||'"."'||table_name||'"') relation_size,
|
||||||
@ -86,14 +86,14 @@ func (c PGTableSizeCollector) Update(ctx context.Context, instance *instance, ch
|
|||||||
}
|
}
|
||||||
defer rows.Close()
|
defer rows.Close()
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var tableSchema, tableName, databaseName sql.NullString
|
var schemaName, relName, databaseName sql.NullString
|
||||||
var totalRelationSize, relationSize, indexesSize sql.NullInt64
|
var totalRelationSize, relationSize, indexesSize sql.NullInt64
|
||||||
|
|
||||||
if err := rows.Scan(&databaseName, &tableName, &tableSchema, &totalRelationSize, &relationSize, &indexesSize); err != nil {
|
if err := rows.Scan(&databaseName, &relName, &schemaName, &totalRelationSize, &relationSize, &indexesSize); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if !tableSchema.Valid || !tableName.Valid || !databaseName.Valid {
|
if !schemaName.Valid || !relName.Valid || !databaseName.Valid {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -115,19 +115,19 @@ func (c PGTableSizeCollector) Update(ctx context.Context, instance *instance, ch
|
|||||||
ch <- prometheus.MustNewConstMetric(
|
ch <- prometheus.MustNewConstMetric(
|
||||||
pgTableTotalRelationDesc,
|
pgTableTotalRelationDesc,
|
||||||
prometheus.CounterValue, totalRelationsSizeMetric,
|
prometheus.CounterValue, totalRelationsSizeMetric,
|
||||||
tableSchema.String, databaseName.String, tableName.String,
|
schemaName.String, relName.String, databaseName.String,
|
||||||
)
|
)
|
||||||
|
|
||||||
ch <- prometheus.MustNewConstMetric(
|
ch <- prometheus.MustNewConstMetric(
|
||||||
pgRelationSizeDesc,
|
pgRelationSizeDesc,
|
||||||
prometheus.CounterValue, relationSizeMetric,
|
prometheus.CounterValue, relationSizeMetric,
|
||||||
tableSchema.String, databaseName.String, tableName.String,
|
schemaName.String, relName.String, databaseName.String,
|
||||||
)
|
)
|
||||||
|
|
||||||
ch <- prometheus.MustNewConstMetric(
|
ch <- prometheus.MustNewConstMetric(
|
||||||
pgTableIndexSizeDesc,
|
pgTableIndexSizeDesc,
|
||||||
prometheus.CounterValue, indexesSizeMetric,
|
prometheus.CounterValue, indexesSizeMetric,
|
||||||
tableSchema.String, databaseName.String, tableName.String,
|
schemaName.String, relName.String, databaseName.String,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user