Merge branch 'sh/collectd-4.5' into sh/collectd-4.6

Conflicts:
	contrib/collection3/lib/Collectd/Graph/Common.pm
	src/postgresql_default.conf

diff --cc README
Simple merge

diff --cc src/postgresql_default.conf
index d289ded,5b024ca..83a32c7
--- 1/src/postgresql_default.conf
--- 2/src/postgresql_default.conf
+++ b/src/postgresql_default.conf
@@@ -141,56 -67,24 +141,56 @@@
  </Query>
  
  <Query disk_io>
-       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 \
 -      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>

diff --cc src/rrdtool.c
Simple merge

diff --cc src/snmp.c
Simple merge