fix collcetor & config

Vonng · Vonng · commit 43b64385345d · 2022-05-13T07:02:59.000+08:00
* now pg_repl_10_11 covers version 11
* ttl of main branch `pg` now set to 1
* fix space margin for collectors
diff --git a/config/collector/110-pg.yml b/config/collector/110-pg.yml
@@ -43,7 +43,7 @@ pg_primary_only:
   tags:
     - cluster
     - primary
-  ttl: 10
+  ttl: 1
   # timeout: 0.1
   min_version: 100000
   # max_version: 0
@@ -163,7 +163,7 @@ pg_replica_only:
   tags:
     - cluster
     - replica
-  ttl: 10
+  ttl: 1
   # timeout: 0.1
   min_version: 100000
   # max_version: 0
@@ -235,4 +235,3 @@ pg_replica_only:
         description: seconds since current backup start
         usage: GAUGE
 
-
diff --git a/config/collector/130-pg_setting.yml b/config/collector/130-pg_setting.yml
@@ -61,4 +61,3 @@ pg_setting:
         usage: GAUGE
         description: whether wal_log_hints is enabled, 1 enabled 0 disabled
 
-
diff --git a/config/collector/210-pg_repl.yml b/config/collector/210-pg_repl.yml
@@ -1,5 +1,4 @@
 
-
 pg_repl_12:
   name: pg_repl
   desc: PostgreSQL replication stat metrics 12+
@@ -118,7 +117,7 @@ pg_repl_10_11:
 
   ttl: 10
   min_version: 100000
-  max_version: 110000
+  max_version: 120000
   tags:
     - cluster
 
@@ -198,4 +197,5 @@ pg_repl_10_11:
         description: Current timestamp in unix epoch
     - launch_time:
         usage: COUNTER
-        description: Time when this process was started, i.e., when the client connected to this WAL sender
+        description: Time when this process was started, i.e., when the client connected to this WAL sender
+
diff --git a/config/collector/220-pg_sync_standby.yml b/config/collector/220-pg_sync_standby.yml
@@ -24,4 +24,3 @@ pg_sync_standby:
         usage: GAUGE
         description: Synchronous commit enabled, 1 if enabled, 0 if disabled
 
-
diff --git a/config/collector/230-pg_downstrem.yml b/config/collector/230-pg_downstrem.yml
@@ -23,3 +23,4 @@ pg_downstream:
     - count:
         usage: GAUGE
         description: Count of corresponding state
+
diff --git a/config/collector/250-pg_recv.yml b/config/collector/250-pg_recv.yml
@@ -1,5 +1,4 @@
 
-
 pg_recv_13:
   name: pg_recv
   desc: PostgreSQL walreceiver metrics 13+ (add written and flush lsn)
@@ -208,4 +207,3 @@ pg_recv_10:
         usage: GAUGE
         description: Time of current snapshot
 
-
diff --git a/config/collector/260-pg_sub.yml b/config/collector/260-pg_sub.yml
@@ -1,5 +1,4 @@
 
-
 pg_sub_10:
   name: pg_sub
   desc: PostgreSQL subscription statistics ()
@@ -42,3 +41,4 @@ pg_sub_10:
     - reported_time:
         usage: GAUGE
         description: Time of last write-ahead log location reported to origin WAL sender
+
diff --git a/config/collector/270-pg_origin.yml b/config/collector/270-pg_origin.yml
@@ -1,5 +1,4 @@
 
-
 # skip by default, require additional privilege setup
 # GRANT SELECT ON pg_replication_origin, pg_replication_origin_status TO pg_monitor;
 pg_origin:
diff --git a/config/collector/340-pg_ssl.yml b/config/collector/340-pg_ssl.yml
@@ -17,3 +17,4 @@ pg_ssl:
     - disabled:
         usage: GAUGE
         description: Number of client connection that does not use ssl
+
diff --git a/config/collector/350-pg_checkpoint.yml b/config/collector/350-pg_checkpoint.yml
@@ -66,3 +66,4 @@ pg_checkpoint:
     - elapse:
         usage: GAUGE
         description: Seconds elapsed since latest checkpoint in seconds
+
diff --git a/config/collector/360-pg_recovery.yml b/config/collector/360-pg_recovery.yml
@@ -1,5 +1,4 @@
 
-
 pg_recovery:
   name: pg_recovery
   desc: PostgreSQL control recovery metrics (9.6+)
@@ -33,4 +32,5 @@ pg_recovery:
         description: Backup end location
     - require_record:
         usage: GAUGE
-        description: End-of-backup record required
+        description: End-of-backup record required
+
diff --git a/config/collector/370-pg_slru.yml b/config/collector/370-pg_slru.yml
@@ -1,5 +1,4 @@
 
-
 pg_slru_13:
   name: pg_slru
   desc: PostgreSQL simple-least-recently-used (SLRU) cache statistics v13
@@ -37,4 +36,5 @@ pg_slru_13:
         description: Number of truncates for this SLRU
     - reset_time:
         usage: COUNTER
-        description: Time at which these statistics were last reset
+        description: Time at which these statistics were last reset
+
diff --git a/config/collector/380-pg_shmem.yml b/config/collector/380-pg_shmem.yml
@@ -1,5 +1,4 @@
 
-
 # pg_shmem require su privilege to work. Disable it or create auxiliary function with su before use:
 # CREATE OR REPLACE FUNCTION monitor.pg_shmem() RETURNS SETOF pg_shmem_allocations AS $$ SELECT * FROM pg_shmem_allocations;$$ LANGUAGE SQL SECURITY DEFINER;
 pg_shmem:
diff --git a/config/collector/390-pg_wal.yml b/config/collector/390-pg_wal.yml
@@ -38,4 +38,5 @@ pg_wal_14:
         description: Total amount of time spent syncing WAL files to disk via issue_xlog_fsync request, in seconds
     - reset_time:
         usage: COUNTER
-        description: When statistics were last reset
+        description: When statistics were last reset
+
diff --git a/config/collector/410-pg_activity.yml b/config/collector/410-pg_activity.yml
@@ -33,3 +33,4 @@ pg_activity:
     - max_conn_duration:
         usage: GAUGE
         description: Max backend session duration since state change among (datname, state)
+
diff --git a/config/collector/420-pg_wait.yml b/config/collector/420-pg_wait.yml
@@ -1,5 +1,4 @@
 
-
 pg_wait:
   name: pg_wait
   desc: PostgreSQL backend client count group by wait event type since 9.6
diff --git a/config/collector/430-pg_backend.yml b/config/collector/430-pg_backend.yml
@@ -1,5 +1,4 @@
 
-
 pg_backend:
   name: pg_backend
   desc: PostgreSQL backend client count group by wait event type since 9.6
@@ -16,4 +15,5 @@ pg_backend:
         description: Database backend process type
     - count:
         usage: GAUGE
-        description: Database backend process count by backend_type
+        description: Database backend process count by backend_type
+
diff --git a/config/collector/440-pg_xact.yml b/config/collector/440-pg_xact.yml
@@ -20,4 +20,3 @@ pg_xact:
         usage: GAUGE
         description: Current active transaction count
 
-
diff --git a/config/collector/450-pg_lock.yml b/config/collector/450-pg_lock.yml
@@ -1,5 +1,4 @@
 
-
 pg_lock:
   name: pg_lock
   desc: PostgreSQL lock distribution by mode and database
diff --git a/config/collector/460-pg_query.yml b/config/collector/460-pg_query.yml
@@ -39,7 +39,6 @@ pg_query_13:
 
 
 
-
 pg_query_94_12:
   name: pg_query
   desc: PostgreSQL query statement metrics, require pg_stat_statements installed in schema monitor, 9.4 ~ 12
diff --git a/config/collector/540-pg_backup.yml b/config/collector/540-pg_backup.yml
@@ -30,3 +30,4 @@ pg_backup:
     - sent_bytes:
         usage: GAUGE
         description: Amount of data streamed
+
diff --git a/config/collector/610-pg_db.yml b/config/collector/610-pg_db.yml
@@ -1,5 +1,4 @@
 
-
 pg_db_14:
   name: pg_db
   desc: PostgreSQL database stats from pg_stat_database v14 (with 7 new time & session metrics)
@@ -366,6 +365,3 @@ pg_db_10_11:
         usage: COUNTER
         description: Time at which database statistics were last reset
 
-
-
-
diff --git a/config/collector/640-pg_pubrel.yml b/config/collector/640-pg_pubrel.yml
@@ -1,5 +1,4 @@
 
-
 pg_pubrel:
   name: pg_pubrel
   desc: PostgreSQL publication and relation count
diff --git a/config/collector/650-pg_subrel.yml b/config/collector/650-pg_subrel.yml
@@ -1,5 +1,4 @@
 
-
 pg_subrel:
   name: pg_subrel
   desc: PostgreSQL subscripted relation group by state
diff --git a/config/collector/700-pg_table.yml b/config/collector/700-pg_table.yml
@@ -1,4 +1,8 @@
 
+###############################################################
+#                  Per Database Collectors                    #
+###############################################################
+
 pg_table_13:
   name: pg_table
   desc: PostgreSQL table metrics (v13 with n_ins_since_vacuum)
diff --git a/config/collector/710-pg_index.yml b/config/collector/710-pg_index.yml
@@ -48,3 +48,4 @@ pg_index:
     - idx_blks_hit:
         usage: COUNTER
         description: Number of buffer hits in this index
+
diff --git a/config/collector/720-pg_func.yml b/config/collector/720-pg_func.yml
diff --git a/config/collector/730-pg_seq.yml b/config/collector/730-pg_seq.yml
@@ -22,3 +22,4 @@ pg_seq:
     - blks_hit:
         usage: COUNTER
         description: Number of buffer hits in this sequence
+
diff --git a/config/collector/740-pg_relkind.yml b/config/collector/740-pg_relkind.yml
@@ -1,5 +1,4 @@
 
-
 pg_relkind:
   name: pg_relkind
   desc: Postgres relation count by kind (category, r,i,m,t,...)
diff --git a/config/collector/750-pg_defpart.yml b/config/collector/750-pg_defpart.yml
@@ -17,3 +17,4 @@ pg_defpart:
     - tuples:
         usage: GAUGE
         description: Number of tuples in this default partition
+
diff --git a/config/collector/810-pg_table_size.yml b/config/collector/810-pg_table_size.yml
@@ -38,3 +38,4 @@ pg_table_size:
         usage: GAUGE
         default: 0
         description: Bytes of toast tables of this table
+
diff --git a/config/collector/920-pgbouncer_database.yml b/config/collector/920-pgbouncer_database.yml
@@ -109,4 +109,3 @@ pgbouncer_database_108_115:
         usage: GAUGE
         description: True(1) if this database is currently disabled, else 0
 
-
diff --git a/pg_exporter.yml b/pg_exporter.yml
@@ -245,7 +245,7 @@ pg_primary_only:
   tags:
     - cluster
     - primary
-  ttl: 10
+  ttl: 1
   # timeout: 0.1
   min_version: 100000
   # max_version: 0
@@ -365,7 +365,7 @@ pg_replica_only:
   tags:
     - cluster
     - replica
-  ttl: 10
+  ttl: 1
   # timeout: 0.1
   min_version: 100000
   # max_version: 0
@@ -757,7 +757,7 @@ pg_repl_10_11:
 
   ttl: 10
   min_version: 100000
-  max_version: 110000
+  max_version: 120000
   tags:
     - cluster
 
@@ -1731,6 +1731,9 @@ pg_wal_14:
     - reset_time:
         usage: COUNTER
         description: When statistics were last reset
+
+
+
 pg_activity:
   name: pg_activity
   desc: PostgreSQL backend activity group by database and state
@@ -1809,6 +1812,8 @@ pg_backend:
     - count:
         usage: GAUGE
         description: Database backend process count by backend_type
+
+
 pg_xact:
   name: pg_xact
   desc: PostgreSQL transaction identifier metrics
@@ -2536,27 +2541,9 @@ pg_subrel:
         description: Count of relation in this subscription and corresponding state
 
 
-
-pg_relkind:
-  name: pg_relkind
-  desc: Postgres relation count by kind (category, r,i,m,t,...)
-
-  query: SELECT CURRENT_CATALOG AS datname, relkind, count(*) AS count FROM pg_class GROUP BY relkind;
-  ttl: 60
-  timeout: 1
-  min_version: 090400
-
-  metrics:
-    - datname:
-        usage: LABEL
-        description: Name of database
-    - relkind:
-        usage: LABEL
-        description: Kind of this relation, could be r,i,S,t,v,m,c,f,p,I
-    - count:
-        usage: GAUGE
-        description: Number of relations of corresponding relkind
-
+###############################################################
+#                  Per Database Collectors                    #
+###############################################################
 
 pg_table_13:
   name: pg_table
@@ -2989,6 +2976,28 @@ pg_seq:
         usage: COUNTER
         description: Number of buffer hits in this sequence
 
+
+pg_relkind:
+  name: pg_relkind
+  desc: Postgres relation count by kind (category, r,i,m,t,...)
+
+  query: SELECT CURRENT_CATALOG AS datname, relkind, count(*) AS count FROM pg_class GROUP BY relkind;
+  ttl: 60
+  timeout: 1
+  min_version: 090400
+
+  metrics:
+    - datname:
+        usage: LABEL
+        description: Name of database
+    - relkind:
+        usage: LABEL
+        description: Kind of this relation, could be r,i,S,t,v,m,c,f,p,I
+    - count:
+        usage: GAUGE
+        description: Number of relations of corresponding relkind
+
+
 pg_defpart:
   name: pg_defpart
   desc: PostgreSQL default partition tuples

Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,3 @@ pg_setting:`
`61`	`61`	`usage: GAUGE`
`62`	`62`	`description: whether wal_log_hints is enabled, 1 enabled 0 disabled`
`63`	`63`
`64`		`-`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,3 @@ pg_sync_standby:`
`24`	`24`	`usage: GAUGE`
`25`	`25`	`description: Synchronous commit enabled, 1 if enabled, 0 if disabled`
`26`	`26`
`27`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`
`2`		`-`
`3`	`2`	`# skip by default, require additional privilege setup`
`4`	`3`	`# GRANT SELECT ON pg_replication_origin, pg_replication_origin_status TO pg_monitor;`
`5`	`4`	`pg_origin:`