parametrize memory_path for cgroup collector and test it
add metrics and update test
skip parameter for memory_cgroup collector
add memory_cgroup to sys.path
conntrack: config can be a list or a string, handle both
pythonize a bit
Merge branch 'hvn-fix-conntrack-config'

* hvn-fix-conntrack-config:
  pythonize a bit
  conntrack: config can be a list or a string, handle both
updated SSL definition

changed the way we detect SSL usage and force SSL definition in the influxdb driver.
You now need to have influxdb version > 0.1.6
Merge pull request #627 from prune998/patch-2

updated SSL definition
http collector for many url response time

http collector to query data size and download time from HTTP/HTTPS urls
fix typo in example config
Merge pull request #628 from keen99/patch-1

fix typo in example config
PgSQL collector - sslmode, has_admin, connections

Commit does the following:
* add support for sslmode
* don't exhausts PgSQL connections
* don't execute query/queries which require admin privileges(configurable)

For more info, please, see https://github.com/BrightcoveOS/Diamond/issues/607

Signed-off-by: Zdenek Styblik <zdenek.styblik@icflix.com>
Merge pull request #8 from python-diamond/lacrymology/memory_docker-add-memory_cgroup-to-path

ok, looks good to me (=P) and to @kormoc and noone else is commenting, so in it goes
add btrfs to supported fs type

Now the collector can hanfle 0 inodes values without doing a division by zero, btrfs can be added to the supported filesystems to check.
Merge pull request #632 from prune998/patch-1

add btrfs to supported fs type
changed collector variable name

stripped . and / from the variable name to be compatible with Graphite and Influxdb
create testhttp.py mock test for http collector
create index fixture
feat(ossec): new ossec agent status collector

Change-Id: Ic6915ee95d3923e35b7eb62af4e5925a1ccee15c