X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fpostgresql_default.conf;h=83a32c77b3fd7b1883c82de65cb1b60e1acbdc45;hp=5b024ca14aca2976a4ef99e9c183a390a8891210;hb=6d86a97190a193863aadc252f20f6b9dba61c263;hpb=54fb57fbc5658fc3d150219d07d840178d64d087

diff --git a/src/postgresql_default.conf b/src/postgresql_default.conf
index 5b024ca1..83a32c77 100644
--- a/src/postgresql_default.conf
+++ b/src/postgresql_default.conf
@@ -1,98 +1,207 @@
 # Pre-defined queries of collectd's postgresql plugin.
+#
+# Do not edit this file. If you want to change any of the query definitions,
+# overwrite them in collectd.conf instead.
+#
+# This file is distributed under the same terms as collectd itself.
 
 <Query backends>
-	Query "SELECT count(*) \
+	Statement "SELECT count(*) AS count \
 		FROM pg_stat_activity \
 		WHERE datname = $1;"
 
 	Param database
 
-	Column pg_numbackends
+	<Result>
+		Type "pg_numbackends"
+		ValuesFrom "count"
+	</Result>
 </Query>
 
 <Query transactions>
-	Query "SELECT xact_commit, xact_rollback \
+	Statement "SELECT xact_commit, xact_rollback \
 		FROM pg_stat_database \
 		WHERE datname = $1;"
 
 	Param database
 
-	Column pg_xact commit
-	Column pg_xact rollback
+	<Result>
+		Type "pg_xact"
+		InstancePrefix "commit"
+		ValuesFrom "xact_commit"
+	</Result>
+	<Result>
+		Type "pg_xact"
+		InstancePrefix "rollback"
+		ValuesFrom "xact_rollback"
+	</Result>
 </Query>
 
 <Query queries>
-	Query "SELECT sum(n_tup_ins), sum(n_tup_upd), sum(n_tup_del) \
+	Statement "SELECT sum(n_tup_ins) AS ins, \
+			sum(n_tup_upd) AS upd, \
+			sum(n_tup_del) AS 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
+	<Result>
+		Type "pg_n_tup_c"
+		InstancePrefix "ins"
+		ValuesFrom "ins"
+	</Result>
+	<Result>
+		Type "pg_n_tup_c"
+		InstancePrefix "upd"
+		ValuesFrom "upd"
+	</Result>
+	<Result>
+		Type "pg_n_tup_c"
+		InstancePrefix "del"
+		ValuesFrom "del"
+	</Result>
+
+	MaxVersion 80299
 </Query>
 
 <Query queries>
-	Query "SELECT sum(n_tup_ins), sum(n_tup_upd), sum(n_tup_del), \
-			sum(n_tup_hot_upd) \
+	Statement "SELECT sum(n_tup_ins) AS ins, \
+			sum(n_tup_upd) AS upd, \
+			sum(n_tup_del) AS del, \
+			sum(n_tup_hot_upd) AS 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
+	<Result>
+		Type "pg_n_tup_c"
+		InstancePrefix "ins"
+		ValuesFrom "ins"
+	</Result>
+	<Result>
+		Type "pg_n_tup_c"
+		InstancePrefix "upd"
+		ValuesFrom "upd"
+	</Result>
+	<Result>
+		Type "pg_n_tup_c"
+		InstancePrefix "del"
+		ValuesFrom "del"
+	</Result>
+	<Result>
+		Type "pg_n_tup_c"
+		InstancePrefix "hot_upd"
+		ValuesFrom "hot_upd"
+	</Result>
+
+	MinVersion 80300
 </Query>
 
 <Query query_plans>
-	Query "SELECT sum(seq_scan), sum(seq_tup_read), \
-			sum(idx_scan), sum(idx_tup_fetch) \
+	Statement "SELECT sum(seq_scan) AS seq, \
+			sum(seq_tup_read) AS seq_tup_read, \
+			sum(idx_scan) AS idx, \
+			sum(idx_tup_fetch) AS 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
+	<Result>
+		Type "pg_scan"
+		InstancePrefix "seq"
+		ValuesFrom "seq"
+	</Result>
+	<Result>
+		Type "pg_scan"
+		InstancePrefix "seq_tup_read"
+		ValuesFrom "seq_tup_read"
+	</Result>
+	<Result>
+		Type "pg_scan"
+		InstancePrefix "idx"
+		ValuesFrom "idx"
+	</Result>
+	<Result>
+		Type "pg_scan"
+		InstancePrefix "idx_tup_fetch"
+		ValuesFrom "idx_tup_fetch"
+	</Result>
 </Query>
 
 <Query table_states>
-	Query "SELECT sum(n_live_tup), sum(n_dead_tup) \
+	Statement "SELECT sum(n_live_tup) AS live, sum(n_dead_tup) AS dead \
 		FROM pg_stat_user_tables;"
 
-	Column pg_n_tup_g live
-	Column pg_n_tup_g dead
-
-	MinPGVersion 80300
+	<Result>
+		Type "pg_n_tup_g"
+		InstancePrefix "live"
+		ValuesFrom "live"
+	</Result>
+	<Result>
+		Type "pg_n_tup_g"
+		InstancePrefix "dead"
+		ValuesFrom "dead"
+	</Result>
+
+	MinVersion 80300
 </Query>
 
 <Query disk_io>
-	Query "SELECT coalesce(sum(heap_blks_read), 0), \
-			coalesce(sum(heap_blks_hit), 0), \
-			coalesce(sum(idx_blks_read), 0), \
-			coalesce(sum(idx_blks_hit), 0), \
-			coalesce(sum(toast_blks_read), 0), \
-			coalesce(sum(toast_blks_hit), 0), \
-			coalesce(sum(tidx_blks_read), 0), \
-			coalesce(sum(tidx_blks_hit), 0) \
+	Statement "SELECT coalesce(sum(heap_blks_read), 0) AS heap_read, \
+			coalesce(sum(heap_blks_hit), 0) AS heap_hit, \
+			coalesce(sum(idx_blks_read), 0) AS idx_read, \
+			coalesce(sum(idx_blks_hit), 0) AS idx_hit, \
+			coalesce(sum(toast_blks_read), 0) AS toast_read, \
+			coalesce(sum(toast_blks_hit), 0) AS toast_hit, \
+			coalesce(sum(tidx_blks_read), 0) AS tidx_read, \
+			coalesce(sum(tidx_blks_hit), 0) AS tidx_hit \
 		FROM pg_statio_user_tables;"
 
-	Column pg_blks heap_read
-	Column pg_blks heap_hit
-	Column pg_blks idx_read
-	Column pg_blks idx_hit
-	Column pg_blks toast_read
-	Column pg_blks toast_hit
-	Column pg_blks tidx_read
-	Column pg_blks tidx_hit
+	<Result>
+		Type "pg_blks"
+		InstancePrefix "heap_read"
+		ValuesFrom "heap_read"
+	</Result>
+	<Result>
+		Type "pg_blks"
+		InstancePrefix "heap_hit"
+		ValuesFrom "heap_hit"
+	</Result>
+	<Result>
+		Type "pg_blks"
+		InstancePrefix "idx_read"
+		ValuesFrom "idx_read"
+	</Result>
+	<Result>
+		Type "pg_blks"
+		InstancePrefix "idx_hit"
+		ValuesFrom "idx_hit"
+	</Result>
+	<Result>
+		Type "pg_blks"
+		InstancePrefix "toast_read"
+		ValuesFrom "toast_read"
+	</Result>
+	<Result>
+		Type "pg_blks"
+		InstancePrefix "toast_hit"
+		ValuesFrom "toast_hit"
+	</Result>
+	<Result>
+		Type "pg_blks"
+		InstancePrefix "tidx_read"
+		ValuesFrom "tidx_read"
+	</Result>
+	<Result>
+		Type "pg_blks"
+		InstancePrefix "tidx_hit"
+		ValuesFrom "tidx_hit"
+	</Result>
 </Query>
 
 <Query disk_usage>
-	Query "SELECT pg_database_size($1);"
+	Statement "SELECT pg_database_size($1) AS size;"
 
 	Param database
 
-	Column pg_db_size
+	<Result>
+		Type pg_db_size
+		ValuesFrom "size"
+	</Result>
 </Query>
 
 # vim: set ft=config :