mirror of
https://github.com/prometheus-community/postgres_exporter
synced 2025-05-04 17:08:02 +00:00
Finish renaming elements to index and table size
Signed-off-by: Felix Yuan <felix.yuan@reddit.com>
This commit is contained in:
parent
b9505389e7
commit
34b93cf34b
@ -150,15 +150,15 @@ var (
|
|||||||
[]string{"datname", "schemaname", "relname"},
|
[]string{"datname", "schemaname", "relname"},
|
||||||
prometheus.Labels{},
|
prometheus.Labels{},
|
||||||
)
|
)
|
||||||
statUserTablesTotalSize = prometheus.NewDesc(
|
statUserIndexSize = prometheus.NewDesc(
|
||||||
prometheus.BuildFQName(namespace, userTableSubsystem, "size_bytes"),
|
prometheus.BuildFQName(namespace, userTableSubsystem, "index_size_bytes"),
|
||||||
"Total disk space used by this table, in bytes, including all indexes and TOAST data",
|
"Total disk space used by this index, in bytes",
|
||||||
[]string{"datname", "schemaname", "relname"},
|
[]string{"datname", "schemaname", "relname"},
|
||||||
prometheus.Labels{},
|
prometheus.Labels{},
|
||||||
)
|
)
|
||||||
statUserTablesOnlySize = prometheus.NewDesc(
|
statUserTableSize = prometheus.NewDesc(
|
||||||
prometheus.BuildFQName(namespace, userTableSubsystem, "table_size_bytes"),
|
prometheus.BuildFQName(namespace, userTableSubsystem, "table_size_bytes"),
|
||||||
"Total disk space used by only this table, in bytes",
|
"Total disk space used by this table, in bytes",
|
||||||
[]string{"datname", "schemaname", "relname"},
|
[]string{"datname", "schemaname", "relname"},
|
||||||
prometheus.Labels{},
|
prometheus.Labels{},
|
||||||
)
|
)
|
||||||
@ -205,10 +205,10 @@ func (c *PGStatUserTablesCollector) Update(ctx context.Context, instance *instan
|
|||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var datname, schemaname, relname sql.NullString
|
var datname, schemaname, relname sql.NullString
|
||||||
var seqScan, seqTupRead, idxScan, idxTupFetch, nTupIns, nTupUpd, nTupDel, nTupHotUpd, nLiveTup, nDeadTup,
|
var seqScan, seqTupRead, idxScan, idxTupFetch, nTupIns, nTupUpd, nTupDel, nTupHotUpd, nLiveTup, nDeadTup,
|
||||||
nModSinceAnalyze, vacuumCount, autovacuumCount, analyzeCount, autoanalyzeCount, totalSize, tableOnlySize sql.NullInt64
|
nModSinceAnalyze, vacuumCount, autovacuumCount, analyzeCount, autoanalyzeCount, indexSize, tableSize sql.NullInt64
|
||||||
var lastVacuum, lastAutovacuum, lastAnalyze, lastAutoanalyze sql.NullTime
|
var lastVacuum, lastAutovacuum, lastAnalyze, lastAutoanalyze sql.NullTime
|
||||||
|
|
||||||
if err := rows.Scan(&datname, &schemaname, &relname, &seqScan, &seqTupRead, &idxScan, &idxTupFetch, &nTupIns, &nTupUpd, &nTupDel, &nTupHotUpd, &nLiveTup, &nDeadTup, &nModSinceAnalyze, &lastVacuum, &lastAutovacuum, &lastAnalyze, &lastAutoanalyze, &vacuumCount, &autovacuumCount, &analyzeCount, &autoanalyzeCount, &totalSize, &tableOnlySize); err != nil {
|
if err := rows.Scan(&datname, &schemaname, &relname, &seqScan, &seqTupRead, &idxScan, &idxTupFetch, &nTupIns, &nTupUpd, &nTupDel, &nTupHotUpd, &nLiveTup, &nDeadTup, &nModSinceAnalyze, &lastVacuum, &lastAutovacuum, &lastAnalyze, &lastAutoanalyze, &vacuumCount, &autovacuumCount, &analyzeCount, &autoanalyzeCount, &indexSize, &tableSize); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -434,25 +434,25 @@ func (c *PGStatUserTablesCollector) Update(ctx context.Context, instance *instan
|
|||||||
datnameLabel, schemanameLabel, relnameLabel,
|
datnameLabel, schemanameLabel, relnameLabel,
|
||||||
)
|
)
|
||||||
|
|
||||||
totalSizeMetric := 0.0
|
indexSizeMetric := 0.0
|
||||||
if totalSize.Valid {
|
if indexSize.Valid {
|
||||||
totalSizeMetric = float64(totalSize.Int64)
|
indexSizeMetric = float64(indexSize.Int64)
|
||||||
}
|
}
|
||||||
ch <- prometheus.MustNewConstMetric(
|
ch <- prometheus.MustNewConstMetric(
|
||||||
statUserTablesTotalSize,
|
statUserIndexSize,
|
||||||
prometheus.GaugeValue,
|
prometheus.GaugeValue,
|
||||||
totalSizeMetric,
|
indexSizeMetric,
|
||||||
datnameLabel, schemanameLabel, relnameLabel,
|
datnameLabel, schemanameLabel, relnameLabel,
|
||||||
)
|
)
|
||||||
|
|
||||||
tableOnlySizeMetric := 0.0
|
tableSizeMetric := 0.0
|
||||||
if tableOnlySize.Valid {
|
if tableSize.Valid {
|
||||||
tableOnlySizeMetric = float64(tableOnlySize.Int64)
|
tableSizeMetric = float64(tableSize.Int64)
|
||||||
}
|
}
|
||||||
ch <- prometheus.MustNewConstMetric(
|
ch <- prometheus.MustNewConstMetric(
|
||||||
statUserTablesOnlySize,
|
statUserTableSize,
|
||||||
prometheus.GaugeValue,
|
prometheus.GaugeValue,
|
||||||
tableOnlySizeMetric,
|
tableSizeMetric,
|
||||||
datnameLabel, schemanameLabel, relnameLabel,
|
datnameLabel, schemanameLabel, relnameLabel,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -72,8 +72,8 @@ func TestPGStatUserTablesCollector(t *testing.T) {
|
|||||||
"autovacuum_count",
|
"autovacuum_count",
|
||||||
"analyze_count",
|
"analyze_count",
|
||||||
"autoanalyze_count",
|
"autoanalyze_count",
|
||||||
"total_size",
|
"index_size",
|
||||||
"table_only_size"}
|
"table_size"}
|
||||||
rows := sqlmock.NewRows(columns).
|
rows := sqlmock.NewRows(columns).
|
||||||
AddRow("postgres",
|
AddRow("postgres",
|
||||||
"public",
|
"public",
|
||||||
@ -177,8 +177,8 @@ func TestPGStatUserTablesCollectorNullValues(t *testing.T) {
|
|||||||
"autovacuum_count",
|
"autovacuum_count",
|
||||||
"analyze_count",
|
"analyze_count",
|
||||||
"autoanalyze_count",
|
"autoanalyze_count",
|
||||||
"total_size",
|
"index_size",
|
||||||
"table_only_size"}
|
"table_size"}
|
||||||
rows := sqlmock.NewRows(columns).
|
rows := sqlmock.NewRows(columns).
|
||||||
AddRow("postgres",
|
AddRow("postgres",
|
||||||
nil,
|
nil,
|
||||||
|
Loading…
Reference in New Issue
Block a user