nginx: fix log error msg text
Merge pull request #448 from vaijab/fix_nginx_log_msg

nginx: fix log error msg text
Fixes #443, defaults to non-blocking mode for cpu usage collection.
Disable gridengine by default, also update docs
Fixes #449, this uses the direct python names when installing in a virtual env
Add a Bitdeli badge to README
Merge pull request #450 from bitdeli-chef/master

Add a Bitdeli Badge to README
ceph: update the Ceph collector

1. The library routine subprocess.check_output was added in 2.7. This
patch implements a similar function on top of Popen in order to support
2.6.

2. Examines the performance counter schemas to make a better guess about
the data types being collected (e.g. counters, bytes, etc...)

3. Avoids creating deeper metric paths "osd.N", and renames these to be
osd-N which Graphite will not treat as a nested name.

4. Records the average since the last invocation of the collector for
the long-running average Ceph metric types.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Merge pull request #455 from ceph/wip-ceph-upstream

ceph: update the Ceph collector
Revert "ceph: update the Ceph collector"

This reverts commit 29f363a36c03fb0f339c093674474c72c01507d1.
test case for #456
Fix #456, this splits the url correctly into parts before processing
Fixes #453, this prevents the "Skipped loading disabled Collector" from logging outside of debug mode
Cleanup SNMPCollector slightly
pep8
Test for unpublished metrics
Re #458, this adds in the option to enable tcp keepalives for the graphite handler. This should prevent tcp stream timeouts.
Enable default database for _connect()

In the event you connect with a user that doesn't have it's own
database, set the default to be 'postgres' to enable _get_db_names()
to be able to collect the list of databases.
Adding the ability to set keepaliveinterval and atempt socket reconnect
on exception in _send_data
Merge pull request #461 from peterkh/master

Adding the ability to set keepaliveinterval and attempt socket reconnect on exception in _send_data