fix a bug of extended postgres collector
Merge pull request #652 from choplin/patch-1

fix a bug of extended postgres collector
Fix 'dbname' in PostgreSQL Collector

Commit fixes 'dbname' which is missing from config in PostgreSQL Collector.
'dbname' can be specified in order to get list of databases in PostgreSQL by
monitoring user. 'dbname' can be different than 'postgres'.
'dbname' defaults to 'postgres' which is/was default behaviour.

Signed-off-by: Zdenek Styblik <zdenek.styblik@icflix.com>
Merge pull request #653 from zstyblik/pr-20140618-pgsql

Fix 'dbname' in PostgreSQL Collector
Merge pull request #651 from CashStar/master

adding cluster support and ability to ignore queues to rabbit collector
Re #289, fix the version identifier to support valid naming rules
Support passing in multiple collector paths, comma delimited, to support having a custom directory to load from
Fix http collector tests
Fix memcache uptime test
pep8
Re 13a0b68fc1386becdb31c2a118aa6c14a6a66cac this fixes a few recursion bugs
Add support for new varnish 4.0.1 stats

> Two new counters: n_purges and n_obj_purged.
https://github.com/varnish/Varnish-Cache/blob/master/doc/changes.rst#changes-from-400-to-401-2014-06-24
Update diamond

If diamond dies for any reason it leaves the lockfile /var/local/subsys/diamond and the pidfile /var/run/diamond.pid sitting on the disc. This prevents future attempts to 'service diamond start'. This change checks that diamond is still alive before looking at the lockfile. If it is not alive, the lockfile is zapped and it can then be started.
add 'minutes' to time conversion utility
add simple uptime collector
Parse the full list of elbs, and remove the ones that match the regular expressions
Merge pull request #655 from sanga/uptime_collector

add simple uptime collector
Merge pull request #656 from bhepple/patch-1

Update diamond
ELB tests are now passing
Merge branch 'master' of github.com:python-diamond/Diamond