X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpostgresql_default.conf;h=61844a024aa648def479fcf3171c00c29d745d0e;hb=b4d9bd23f3e04f9b42204d9954842524e2a7eb61;hp=1391147cbb4470a2b074d0e5e4a752bcef206ed4;hpb=09c001b38efcb0344c517c5944df87127ea30ee6;p=collectd.git

diff --git a/src/postgresql_default.conf b/src/postgresql_default.conf
index 1391147c..61844a02 100644
--- a/src/postgresql_default.conf
+++ b/src/postgresql_default.conf
@@ -1,25 +1,72 @@
 # Pre-defined queries of collectd's postgresql plugin.
 
-<Query user_tables>
-	Query "SELECT sum(seq_scan), sum(seq_tup_read), \
-			sum(idx_scan), sum(idx_tup_fetch), \
-			sum(n_tup_ins), sum(n_tup_upd), sum(n_tup_del), \
-			sum(n_tup_hot_upd), sum(n_live_tup), sum(n_dead_tup) \
-		FROM pg_stat_user_tables"
-
-	Column pg_scan    seq
-	Column pg_scan    seq_tup_read
-	Column pg_scan    idx
-	Column pg_scan    idx_tup_fetch
+<Query backends>
+	Query "SELECT count(*) \
+		FROM pg_stat_activity \
+		WHERE datname = $1;"
+
+	Param database
+
+	Column pg_numbackends
+</Query>
+
+<Query transactions>
+	Query "SELECT xact_commit, xact_rollback \
+		FROM pg_stat_database \
+		WHERE datname = $1;"
+
+	Param database
+
+	Column pg_xact commit
+	Column pg_xact rollback
+</Query>
+
+<Query queries>
+	Query "SELECT sum(n_tup_ins), sum(n_tup_upd), sum(n_tup_del) \
+		FROM pg_stat_user_tables;"
+
+	Column pg_n_tup_c ins
+	Column pg_n_tup_c upd
+	Column pg_n_tup_c del
+
+	MaxPGVersion 80299
+</Query>
+
+<Query queries>
+	Query "SELECT sum(n_tup_ins), sum(n_tup_upd), sum(n_tup_del), \
+			sum(n_tup_hot_upd) \
+		FROM pg_stat_user_tables;"
+
 	Column pg_n_tup_c ins
 	Column pg_n_tup_c upd
 	Column pg_n_tup_c del
 	Column pg_n_tup_c hot_upd
+
+	MinPGVersion 80300
+</Query>
+
+<Query query_plans>
+	Query "SELECT sum(seq_scan), sum(seq_tup_read), \
+			sum(idx_scan), sum(idx_tup_fetch) \
+		FROM pg_stat_user_tables;"
+
+	Column pg_scan seq
+	Column pg_scan seq_tup_read
+	Column pg_scan idx
+	Column pg_scan idx_tup_fetch
+</Query>
+
+<Query table_states>
+	Query "SELECT sum(n_live_tup), sum(n_dead_tup) \
+		FROM pg_stat_user_tables;"
+
 	Column pg_n_tup_g live
 	Column pg_n_tup_g dead
+
+	MinPGVersion 80300
 </Query>
 
-<Query io_user_tables>
+<Query disk_io>
 	Query "SELECT sum(heap_blks_read), sum(heap_blks_hit), \
 			sum(idx_blks_read), sum(idx_blks_hit), \
 			sum(toast_blks_read), sum(toast_blks_hit), \
@@ -36,3 +83,11 @@
 	Column pg_blks tidx_hit
 </Query>
 
+<Query disk_usage>
+	Query "SELECT pg_database_size($1);"
+
+	Param database
+
+	Column pg_db_size
+</Query>
+