Skip to content

Commit 8f1a3e0

Browse files
SticksmanSticksman
committed
Disable all new queries by default, rename marginalia -> summary
Signed-off-by: Felix Yuan <[email protected]>
1 parent 63b372e commit 8f1a3e0

18 files changed

+41
-41
lines changed

Diff for: ‎collector/pg_archiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
)
2121

2222
func init() {
23-
registerCollector("archiver", defaultEnabled, NewPGArchiverCollector)
23+
registerCollector("archiver", defaultDisabled, NewPGArchiverCollector)
2424
}
2525

2626
type PGArchiverCollector struct {

Diff for: ‎collector/pg_blocked.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const blockedSubsystem = "blocked"
2424

2525
func init() {
26-
registerCollector(blockedSubsystem, defaultEnabled, NewPGBlockedCollector)
26+
registerCollector(blockedSubsystem, defaultDisabled, NewPGBlockedCollector)
2727
}
2828

2929
type PGBlockedCollector struct {

Diff for: ‎collector/pg_database_wraparound.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const databaseWraparoundSubsystem = "database_wraparound"
2424

2525
func init() {
26-
registerCollector(databaseWraparoundSubsystem, defaultEnabled, NewPGDatabaseWraparoundCollector)
26+
registerCollector(databaseWraparoundSubsystem, defaultDisabled, NewPGDatabaseWraparoundCollector)
2727
}
2828

2929
type PGDatabaseWraparoundCollector struct {

Diff for: ‎collector/pg_index_size.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const indexSizeSubsystem = "index_size"
2424

2525
func init() {
26-
registerCollector(indexSizeSubsystem, defaultEnabled, NewPGIndexSizeCollector)
26+
registerCollector(indexSizeSubsystem, defaultDisabled, NewPGIndexSizeCollector)
2727
}
2828

2929
type PGIndexSizeCollector struct {

Diff for: ‎collector/pg_long_running_transactions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const longRunningTransactionsSubsystem = "long_running_transactions"
2424

2525
func init() {
26-
registerCollector(longRunningTransactionsSubsystem, defaultEnabled, NewPGLongRunningTransactionsCollector)
26+
registerCollector(longRunningTransactionsSubsystem, defaultDisabled, NewPGLongRunningTransactionsCollector)
2727
}
2828

2929
type PGLongRunningTransactionsCollector struct {

Diff for: ‎collector/pg_long_running_transactions_marginalia.go renamed to ‎collector/pg_long_running_transactions_summary.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,29 @@ import (
2020
"github.com/prometheus/client_golang/prometheus"
2121
)
2222

23-
const longRunningTransactionsMarginaliaSubsystem = "long_running_transactions_marginalia"
23+
const longRunningTransactionsSummarySubsystem = "long_running_transactions_summary"
2424

2525
func init() {
26-
registerCollector(longRunningTransactionsMarginaliaSubsystem, defaultEnabled, NewPGLongRunningTransactionsMarginaliaCollector)
26+
registerCollector(longRunningTransactionsSummarySubsystem, defaultDisabled, NewPGLongRunningTransactionsSummaryCollector)
2727
}
2828

29-
type PGLongRunningTransactionsMarginaliaCollector struct {
29+
type PGLongRunningTransactionsSummaryCollector struct {
3030
log log.Logger
3131
}
3232

33-
func NewPGLongRunningTransactionsMarginaliaCollector(config collectorConfig) (Collector, error) {
34-
return &PGLongRunningTransactionsMarginaliaCollector{log: config.logger}, nil
33+
func NewPGLongRunningTransactionsSummaryCollector(config collectorConfig) (Collector, error) {
34+
return &PGLongRunningTransactionsSummaryCollector{log: config.logger}, nil
3535
}
3636

3737
var (
38-
longRunningTransactionsMarginaliaMaxAgeInSeconds = prometheus.NewDesc(
39-
prometheus.BuildFQName(namespace, longRunningTransactionsMarginaliaSubsystem, "max_age_in_seconds"),
38+
longRunningTransactionsSummaryMaxAgeInSeconds = prometheus.NewDesc(
39+
prometheus.BuildFQName(namespace, longRunningTransactionsSummarySubsystem, "max_age_in_seconds"),
4040
"The current maximum transaction age in seconds",
4141
[]string{"application", "endpoint"},
4242
prometheus.Labels{},
4343
)
4444

45-
longRunningTransactionsMarginaliaQuery = `
45+
longRunningTransactionsSummaryQuery = `
4646
SELECT
4747
activity.matches[1] AS application,
4848
activity.matches[2] AS endpoint,
@@ -62,10 +62,10 @@ var (
6262
`
6363
)
6464

65-
func (PGLongRunningTransactionsMarginaliaCollector) Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error {
65+
func (PGLongRunningTransactionsSummaryCollector) Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error {
6666
db := instance.getDB()
6767
rows, err := db.QueryContext(ctx,
68-
longRunningTransactionsMarginaliaQuery)
68+
longRunningTransactionsSummaryQuery)
6969

7070
if err != nil {
7171
return err
@@ -81,7 +81,7 @@ func (PGLongRunningTransactionsMarginaliaCollector) Update(ctx context.Context,
8181
}
8282

8383
ch <- prometheus.MustNewConstMetric(
84-
longRunningTransactionsMarginaliaMaxAgeInSeconds,
84+
longRunningTransactionsSummaryMaxAgeInSeconds,
8585
prometheus.GaugeValue,
8686
maxAgeInSeconds,
8787
application, endpoint,

Diff for: ‎collector/pg_oldest_blocked.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const oldestBlockedSubsystem = "oldest_blocked"
2424

2525
func init() {
26-
registerCollector(oldestBlockedSubsystem, defaultEnabled, NewPGOldestBlockedCollector)
26+
registerCollector(oldestBlockedSubsystem, defaultDisabled, NewPGOldestBlockedCollector)
2727
}
2828

2929
type PGOldestBlockedCollector struct {

Diff for: ‎collector/pg_slow.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const slowSubsystem = "slow"
2424

2525
func init() {
26-
registerCollector(slowSubsystem, defaultEnabled, NewPGSlowCollector)
26+
registerCollector(slowSubsystem, defaultDisabled, NewPGSlowCollector)
2727
}
2828

2929
type PGSlowCollector struct {

Diff for: ‎collector/pg_stat_activity_autovacuum.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const statActivityAutovacuumSubsystem = "stat_activity_autovacuum"
2424

2525
func init() {
26-
registerCollector(statActivityAutovacuumSubsystem, defaultEnabled, NewPGStatActivityAutovacuumCollector)
26+
registerCollector(statActivityAutovacuumSubsystem, defaultDisabled, NewPGStatActivityAutovacuumCollector)
2727
}
2828

2929
type PGStatActivityAutovacuumCollector struct {

Diff for: ‎collector/pg_stat_activity_autovacuum_active.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const statActivityAutovacuumActiveSubsystem = "stat_activity_autovacuum_active"
2424

2525
func init() {
26-
registerCollector(statActivityAutovacuumActiveSubsystem, defaultEnabled, NewPGStatActivityAutovacuumActiveCollector)
26+
registerCollector(statActivityAutovacuumActiveSubsystem, defaultDisabled, NewPGStatActivityAutovacuumActiveCollector)
2727
}
2828

2929
type PGStatActivityAutovacuumActiveCollector struct {

Diff for: ‎collector/pg_stat_activity_marginalia.go renamed to ‎collector/pg_stat_activity_summary.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,35 @@ import (
2020
"github.com/prometheus/client_golang/prometheus"
2121
)
2222

23-
const statActivityMarginaliaSubsystem = "stat_activity_marginalia"
23+
const statActivitySummarySubsystem = "stat_activity_summary"
2424

2525
func init() {
26-
registerCollector(statActivityMarginaliaSubsystem, defaultEnabled, NewPGStatActivityMarginaliaCollector)
26+
registerCollector(statActivitySummarySubsystem, defaultEnabled, NewPGStatActivitySummaryCollector)
2727
}
2828

29-
type PGStatActivityMarginaliaCollector struct {
29+
type PGStatActivitySummaryCollector struct {
3030
log log.Logger
3131
}
3232

33-
func NewPGStatActivityMarginaliaCollector(config collectorConfig) (Collector, error) {
34-
return &PGStatActivityMarginaliaCollector{log: config.logger}, nil
33+
func NewPGStatActivitySummaryCollector(config collectorConfig) (Collector, error) {
34+
return &PGStatActivitySummaryCollector{log: config.logger}, nil
3535
}
3636

3737
var (
38-
statActivityMarginaliaActiveCount = prometheus.NewDesc(
39-
prometheus.BuildFQName(namespace, statActivityMarginaliaSubsystem, "active_count"),
38+
statActivitySummaryActiveCount = prometheus.NewDesc(
39+
prometheus.BuildFQName(namespace, statActivitySummarySubsystem, "active_count"),
4040
"Number of active queries at time of sample",
4141
[]string{"usename", "application", "endpoint", "command", "state", "wait_event", "wait_event_type"},
4242
prometheus.Labels{},
4343
)
44-
statActivityMarginaliaMaxTxAgeInSeconds = prometheus.NewDesc(
45-
prometheus.BuildFQName(namespace, statActivityMarginaliaSubsystem, "max_tx_age_in_seconds"),
44+
statActivitySummaryMaxTxAgeInSeconds = prometheus.NewDesc(
45+
prometheus.BuildFQName(namespace, statActivitySummarySubsystem, "max_tx_age_in_seconds"),
4646
"Number of active queries at time of sample",
4747
[]string{"usename", "application", "endpoint", "command", "state", "wait_event", "wait_event_type"},
4848
prometheus.Labels{},
4949
)
5050

51-
statActivityMarginaliaQuery = `
51+
statActivitySummaryQuery = `
5252
SELECT
5353
usename AS usename,
5454
a.matches[1] AS application,
@@ -75,10 +75,10 @@ var (
7575
`
7676
)
7777

78-
func (PGStatActivityMarginaliaCollector) Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error {
78+
func (PGStatActivitySummaryCollector) Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error {
7979
db := instance.getDB()
8080
rows, err := db.QueryContext(ctx,
81-
statActivityMarginaliaQuery)
81+
statActivitySummaryQuery)
8282

8383
if err != nil {
8484
return err
@@ -94,13 +94,13 @@ func (PGStatActivityMarginaliaCollector) Update(ctx context.Context, instance *i
9494
}
9595

9696
ch <- prometheus.MustNewConstMetric(
97-
statActivityMarginaliaActiveCount,
97+
statActivitySummaryActiveCount,
9898
prometheus.GaugeValue,
9999
count,
100100
usename, application, endpoint, command, state, waitEvent, waitEventType,
101101
)
102102
ch <- prometheus.MustNewConstMetric(
103-
statActivityMarginaliaMaxTxAgeInSeconds,
103+
statActivitySummaryMaxTxAgeInSeconds,
104104
prometheus.GaugeValue,
105105
maxTxAge,
106106
usename, application, endpoint, command, state, waitEvent, waitEventType,

Diff for: ‎collector/pg_stat_user_indexes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
)
2121

2222
func init() {
23-
registerCollector(statUserIndexesSubsystem, defaultEnabled, NewPGStatUserIndexesCollector)
23+
registerCollector(statUserIndexesSubsystem, defaultDisabled, NewPGStatUserIndexesCollector)
2424
}
2525

2626
type PGStatUserIndexesCollector struct {

Diff for: ‎collector/pg_stat_walreceiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
)
2121

2222
func init() {
23-
registerCollector(statWalReceiverSubsystem, defaultEnabled, NewPGStatWalReceiverCollector)
23+
registerCollector(statWalReceiverSubsystem, defaultDisabled, NewPGStatWalReceiverCollector)
2424
}
2525

2626
type PGStatWalReceiverCollector struct {

Diff for: ‎collector/pg_statio_user_indexes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
)
2121

2222
func init() {
23-
registerCollector(statioUserIndexesSubsystem, defaultEnabled, NewPGStatioUserIndexesCollector)
23+
registerCollector(statioUserIndexesSubsystem, defaultDisabled, NewPGStatioUserIndexesCollector)
2424
}
2525

2626
type PGStatioUserIndexesCollector struct {

Diff for: ‎collector/pg_stuck_idle_in_transaction.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const stuckIdleInTransactionSubsystem = "stuck_in_transaction"
2424

2525
func init() {
26-
registerCollector(stuckIdleInTransactionSubsystem, defaultEnabled, NewPGStuckIdleInTransactionCollector)
26+
registerCollector(stuckIdleInTransactionSubsystem, defaultDisabled, NewPGStuckIdleInTransactionCollector)
2727
}
2828

2929
type PGStuckIdleInTransactionCollector struct {

Diff for: ‎collector/pg_total_relation_size.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const totalRelationSizeSubsystem = "total_relation_size"
2424

2525
func init() {
26-
registerCollector(totalRelationSizeSubsystem, defaultEnabled, NewPGTotalRelationSizeCollector)
26+
registerCollector(totalRelationSizeSubsystem, defaultDisabled, NewPGTotalRelationSizeCollector)
2727
}
2828

2929
type PGTotalRelationSizeCollector struct {

Diff for: ‎collector/pg_xid.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const xidSubsystem = "xid"
2424

2525
func init() {
26-
registerCollector(xidSubsystem, defaultEnabled, NewPGXidCollector)
26+
registerCollector(xidSubsystem, defaultDisabled, NewPGXidCollector)
2727
}
2828

2929
type PGXidCollector struct {

Diff for: ‎collector/pg_xlog_location.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const xlogLocationSubsystem = "xlog_location"
2424

2525
func init() {
26-
registerCollector(xlogLocationSubsystem, defaultEnabled, NewPGXlogLocationCollector)
26+
registerCollector(xlogLocationSubsystem, defaultDisabled, NewPGXlogLocationCollector)
2727
}
2828

2929
type PGXlogLocationCollector struct {

0 commit comments

Comments
 (0)