Disable all new queries by default, rename marginalia -> summary

Sticksman · Sticksman · commit a1d71b64409b · 2023-06-23T11:48:38.000-07:00
Signed-off-by: Felix Yuan &lt;felix.yuan@reddit.com&gt;
diff --git a/collector/pg_archiver.go b/collector/pg_archiver.go
@@ -20,7 +20,7 @@ import (
 )
 
 func init() {
-	registerCollector("archiver", defaultEnabled, NewPGArchiverCollector)
+	registerCollector("archiver", defaultDisabled, NewPGArchiverCollector)
 }
 
 type PGArchiverCollector struct {
diff --git a/collector/pg_blocked.go b/collector/pg_blocked.go
@@ -23,7 +23,7 @@ import (
 const blockedSubsystem = "blocked"
 
 func init() {
-	registerCollector(blockedSubsystem, defaultEnabled, NewPGBlockedCollector)
+	registerCollector(blockedSubsystem, defaultDisabled, NewPGBlockedCollector)
 }
 
 type PGBlockedCollector struct {
diff --git a/collector/pg_database_wraparound.go b/collector/pg_database_wraparound.go
@@ -23,7 +23,7 @@ import (
 const databaseWraparoundSubsystem = "database_wraparound"
 
 func init() {
-	registerCollector(databaseWraparoundSubsystem, defaultEnabled, NewPGDatabaseWraparoundCollector)
+	registerCollector(databaseWraparoundSubsystem, defaultDisabled, NewPGDatabaseWraparoundCollector)
 }
 
 type PGDatabaseWraparoundCollector struct {
diff --git a/collector/pg_index_size.go b/collector/pg_index_size.go
@@ -23,7 +23,7 @@ import (
 const indexSizeSubsystem = "index_size"
 
 func init() {
-	registerCollector(indexSizeSubsystem, defaultEnabled, NewPGIndexSizeCollector)
+	registerCollector(indexSizeSubsystem, defaultDisabled, NewPGIndexSizeCollector)
 }
 
 type PGIndexSizeCollector struct {
diff --git a/collector/pg_long_running_transactions.go b/collector/pg_long_running_transactions.go
@@ -23,7 +23,7 @@ import (
 const longRunningTransactionsSubsystem = "long_running_transactions"
 
 func init() {
-	registerCollector(longRunningTransactionsSubsystem, defaultEnabled, NewPGLongRunningTransactionsCollector)
+	registerCollector(longRunningTransactionsSubsystem, defaultDisabled, NewPGLongRunningTransactionsCollector)
 }
 
 type PGLongRunningTransactionsCollector struct {
diff --git a/collector/pg_long_running_transactions_summary.go b/collector/pg_long_running_transactions_summary.go
@@ -20,29 +20,29 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const longRunningTransactionsMarginaliaSubsystem = "long_running_transactions_marginalia"
+const longRunningTransactionsSummarySubsystem = "long_running_transactions_summary"
 
 func init() {
-	registerCollector(longRunningTransactionsMarginaliaSubsystem, defaultEnabled, NewPGLongRunningTransactionsMarginaliaCollector)
+	registerCollector(longRunningTransactionsSummarySubsystem, defaultDisabled, NewPGLongRunningTransactionsSummaryCollector)
 }
 
-type PGLongRunningTransactionsMarginaliaCollector struct {
+type PGLongRunningTransactionsSummaryCollector struct {
 	log log.Logger
 }
 
-func NewPGLongRunningTransactionsMarginaliaCollector(config collectorConfig) (Collector, error) {
-	return &PGLongRunningTransactionsMarginaliaCollector{log: config.logger}, nil
+func NewPGLongRunningTransactionsSummaryCollector(config collectorConfig) (Collector, error) {
+	return &PGLongRunningTransactionsSummaryCollector{log: config.logger}, nil
 }
 
 var (
-	longRunningTransactionsMarginaliaMaxAgeInSeconds = prometheus.NewDesc(
-		prometheus.BuildFQName(namespace, longRunningTransactionsMarginaliaSubsystem, "max_age_in_seconds"),
+	longRunningTransactionsSummaryMaxAgeInSeconds = prometheus.NewDesc(
+		prometheus.BuildFQName(namespace, longRunningTransactionsSummarySubsystem, "max_age_in_seconds"),
 		"The current maximum transaction age in seconds",
 		[]string{"application", "endpoint"},
 		prometheus.Labels{},
 	)
 
-	longRunningTransactionsMarginaliaQuery = `
+	longRunningTransactionsSummaryQuery = `
 	SELECT
 		activity.matches[1] AS application,
 		activity.matches[2] AS endpoint,
@@ -62,10 +62,10 @@ var (
 	`
 )
 
-func (PGLongRunningTransactionsMarginaliaCollector) Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error {
+func (PGLongRunningTransactionsSummaryCollector) Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error {
 	db := instance.getDB()
 	rows, err := db.QueryContext(ctx,
-		longRunningTransactionsMarginaliaQuery)
+		longRunningTransactionsSummaryQuery)
 
 	if err != nil {
 		return err
@@ -81,7 +81,7 @@ func (PGLongRunningTransactionsMarginaliaCollector) Update(ctx context.Context,
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			longRunningTransactionsMarginaliaMaxAgeInSeconds,
+			longRunningTransactionsSummaryMaxAgeInSeconds,
 			prometheus.GaugeValue,
 			maxAgeInSeconds,
 			application, endpoint,
diff --git a/collector/pg_oldest_blocked.go b/collector/pg_oldest_blocked.go
@@ -23,7 +23,7 @@ import (
 const oldestBlockedSubsystem = "oldest_blocked"
 
 func init() {
-	registerCollector(oldestBlockedSubsystem, defaultEnabled, NewPGOldestBlockedCollector)
+	registerCollector(oldestBlockedSubsystem, defaultDisabled, NewPGOldestBlockedCollector)
 }
 
 type PGOldestBlockedCollector struct {
diff --git a/collector/pg_slow.go b/collector/pg_slow.go
@@ -23,7 +23,7 @@ import (
 const slowSubsystem = "slow"
 
 func init() {
-	registerCollector(slowSubsystem, defaultEnabled, NewPGSlowCollector)
+	registerCollector(slowSubsystem, defaultDisabled, NewPGSlowCollector)
 }
 
 type PGSlowCollector struct {
diff --git a/collector/pg_stat_activity_autovacuum.go b/collector/pg_stat_activity_autovacuum.go
@@ -23,7 +23,7 @@ import (
 const statActivityAutovacuumSubsystem = "stat_activity_autovacuum"
 
 func init() {
-	registerCollector(statActivityAutovacuumSubsystem, defaultEnabled, NewPGStatActivityAutovacuumCollector)
+	registerCollector(statActivityAutovacuumSubsystem, defaultDisabled, NewPGStatActivityAutovacuumCollector)
 }
 
 type PGStatActivityAutovacuumCollector struct {
diff --git a/collector/pg_stat_activity_autovacuum_active.go b/collector/pg_stat_activity_autovacuum_active.go
@@ -23,7 +23,7 @@ import (
 const statActivityAutovacuumActiveSubsystem = "stat_activity_autovacuum_active"
 
 func init() {
-	registerCollector(statActivityAutovacuumActiveSubsystem, defaultEnabled, NewPGStatActivityAutovacuumActiveCollector)
+	registerCollector(statActivityAutovacuumActiveSubsystem, defaultDisabled, NewPGStatActivityAutovacuumActiveCollector)
 }
 
 type PGStatActivityAutovacuumActiveCollector struct {
diff --git a/collector/pg_stat_activity_summary.go b/collector/pg_stat_activity_summary.go
@@ -20,35 +20,35 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const statActivityMarginaliaSubsystem = "stat_activity_marginalia"
+const statActivitySummarySubsystem = "stat_activity_summary"
 
 func init() {
-	registerCollector(statActivityMarginaliaSubsystem, defaultEnabled, NewPGStatActivityMarginaliaCollector)
+	registerCollector(statActivitySummarySubsystem, defaultEnabled, NewPGStatActivitySummaryCollector)
 }
 
-type PGStatActivityMarginaliaCollector struct {
+type PGStatActivitySummaryCollector struct {
 	log log.Logger
 }
 
-func NewPGStatActivityMarginaliaCollector(config collectorConfig) (Collector, error) {
-	return &PGStatActivityMarginaliaCollector{log: config.logger}, nil
+func NewPGStatActivitySummaryCollector(config collectorConfig) (Collector, error) {
+	return &PGStatActivitySummaryCollector{log: config.logger}, nil
 }
 
 var (
-	statActivityMarginaliaActiveCount = prometheus.NewDesc(
-		prometheus.BuildFQName(namespace, statActivityMarginaliaSubsystem, "active_count"),
+	statActivitySummaryActiveCount = prometheus.NewDesc(
+		prometheus.BuildFQName(namespace, statActivitySummarySubsystem, "active_count"),
 		"Number of active queries at time of sample",
 		[]string{"usename", "application", "endpoint", "command", "state", "wait_event", "wait_event_type"},
 		prometheus.Labels{},
 	)
-	statActivityMarginaliaMaxTxAgeInSeconds = prometheus.NewDesc(
-		prometheus.BuildFQName(namespace, statActivityMarginaliaSubsystem, "max_tx_age_in_seconds"),
+	statActivitySummaryMaxTxAgeInSeconds = prometheus.NewDesc(
+		prometheus.BuildFQName(namespace, statActivitySummarySubsystem, "max_tx_age_in_seconds"),
 		"Number of active queries at time of sample",
 		[]string{"usename", "application", "endpoint", "command", "state", "wait_event", "wait_event_type"},
 		prometheus.Labels{},
 	)
 
-	statActivityMarginaliaQuery = `
+	statActivitySummaryQuery = `
 	SELECT
 		usename AS usename,
 		a.matches[1] AS application,
@@ -75,10 +75,10 @@ var (
 	`
 )
 
-func (PGStatActivityMarginaliaCollector) Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error {
+func (PGStatActivitySummaryCollector) Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error {
 	db := instance.getDB()
 	rows, err := db.QueryContext(ctx,
-		statActivityMarginaliaQuery)
+		statActivitySummaryQuery)
 
 	if err != nil {
 		return err
@@ -94,13 +94,13 @@ func (PGStatActivityMarginaliaCollector) Update(ctx context.Context, instance *i
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			statActivityMarginaliaActiveCount,
+			statActivitySummaryActiveCount,
 			prometheus.GaugeValue,
 			count,
 			usename, application, endpoint, command, state, waitEvent, waitEventType,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			statActivityMarginaliaMaxTxAgeInSeconds,
+			statActivitySummaryMaxTxAgeInSeconds,
 			prometheus.GaugeValue,
 			maxTxAge,
 			usename, application, endpoint, command, state, waitEvent, waitEventType,
diff --git a/collector/pg_stat_user_indexes.go b/collector/pg_stat_user_indexes.go
@@ -20,7 +20,7 @@ import (
 )
 
 func init() {
-	registerCollector(statUserIndexesSubsystem, defaultEnabled, NewPGStatUserIndexesCollector)
+	registerCollector(statUserIndexesSubsystem, defaultDisabled, NewPGStatUserIndexesCollector)
 }
 
 type PGStatUserIndexesCollector struct {
diff --git a/collector/pg_stat_walreceiver.go b/collector/pg_stat_walreceiver.go
@@ -20,7 +20,7 @@ import (
 )
 
 func init() {
-	registerCollector(statWalReceiverSubsystem, defaultEnabled, NewPGStatWalReceiverCollector)
+	registerCollector(statWalReceiverSubsystem, defaultDisabled, NewPGStatWalReceiverCollector)
 }
 
 type PGStatWalReceiverCollector struct {
diff --git a/collector/pg_statio_user_indexes.go b/collector/pg_statio_user_indexes.go
@@ -20,7 +20,7 @@ import (
 )
 
 func init() {
-	registerCollector(statioUserIndexesSubsystem, defaultEnabled, NewPGStatioUserIndexesCollector)
+	registerCollector(statioUserIndexesSubsystem, defaultDisabled, NewPGStatioUserIndexesCollector)
 }
 
 type PGStatioUserIndexesCollector struct {
diff --git a/collector/pg_stuck_idle_in_transaction.go b/collector/pg_stuck_idle_in_transaction.go
@@ -23,7 +23,7 @@ import (
 const stuckIdleInTransactionSubsystem = "stuck_in_transaction"
 
 func init() {
-	registerCollector(stuckIdleInTransactionSubsystem, defaultEnabled, NewPGStuckIdleInTransactionCollector)
+	registerCollector(stuckIdleInTransactionSubsystem, defaultDisabled, NewPGStuckIdleInTransactionCollector)
 }
 
 type PGStuckIdleInTransactionCollector struct {
diff --git a/collector/pg_total_relation_size.go b/collector/pg_total_relation_size.go
@@ -23,7 +23,7 @@ import (
 const totalRelationSizeSubsystem = "total_relation_size"
 
 func init() {
-	registerCollector(totalRelationSizeSubsystem, defaultEnabled, NewPGTotalRelationSizeCollector)
+	registerCollector(totalRelationSizeSubsystem, defaultDisabled, NewPGTotalRelationSizeCollector)
 }
 
 type PGTotalRelationSizeCollector struct {
diff --git a/collector/pg_xid.go b/collector/pg_xid.go
@@ -23,7 +23,7 @@ import (
 const xidSubsystem = "xid"
 
 func init() {
-	registerCollector(xidSubsystem, defaultEnabled, NewPGXidCollector)
+	registerCollector(xidSubsystem, defaultDisabled, NewPGXidCollector)
 }
 
 type PGXidCollector struct {
diff --git a/collector/pg_xlog_location.go b/collector/pg_xlog_location.go
@@ -23,7 +23,7 @@ import (
 const xlogLocationSubsystem = "xlog_location"
 
 func init() {
-	registerCollector(xlogLocationSubsystem, defaultEnabled, NewPGXlogLocationCollector)
+	registerCollector(xlogLocationSubsystem, defaultDisabled, NewPGXlogLocationCollector)
 }
 
 type PGXlogLocationCollector struct {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`func init() {`
`23`		`- registerCollector("archiver", defaultEnabled, NewPGArchiverCollector)`
	`23`	`+ registerCollector("archiver", defaultDisabled, NewPGArchiverCollector)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`type PGArchiverCollector struct {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`const blockedSubsystem = "blocked"`
`24`	`24`
`25`	`25`	`func init() {`
`26`		`- registerCollector(blockedSubsystem, defaultEnabled, NewPGBlockedCollector)`
	`26`	`+ registerCollector(blockedSubsystem, defaultDisabled, NewPGBlockedCollector)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`type PGBlockedCollector struct {`