postgresql plugin: Added support for <Result> blocks.
[collectd.git] / src / postgresql_default.conf
index ab0f178..9827b98 100644 (file)
@@ -1,13 +1,16 @@
 # Pre-defined queries of collectd's postgresql plugin.
 
 <Query backends>
-       Statement "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>
 
        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>
-       Statement "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
+       <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>
 
        MaxPGVersion 80299
 </Query>
 
 <Query queries>
-       Statement "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
+       <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>
 
        MinPGVersion 80300
 </Query>
 
 <Query query_plans>
-       Statement "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>
-       Statement "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
+       <Result>
+               Type "pg_n_tup_g"
+               InstancePrefix "live"
+               ValuesFrom "live"
+       </Result>
+       <Result>
+               Type "pg_n_tup_g"
+               InstancePrefix "dead"
+               ValuesFrom "dead"
+       </Result>
 
        MinPGVersion 80300
 </Query>
 
 <Query disk_io>
-       Statement "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), \
-                       sum(tidx_blks_read), sum(tidx_blks_hit) \
+       Statement "SELECT sum(heap_blks_read) AS heap_read, \
+                       sum(heap_blks_hit) AS heap_hit, \
+                       sum(idx_blks_read) AS idx_read, \
+                       sum(idx_blks_hit) AS idx_hit, \
+                       sum(toast_blks_read) AS toast_read, \
+                       sum(toast_blks_hit) AS toast_hit, \
+                       sum(tidx_blks_read) AS tidx_read, \
+                       sum(tidx_blks_hit) 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>
-       Statement "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 :
+