Fix race condition that causes diamond to hang at shutdown.
Merge pull request #350 from lambdafu/master

Fix race condition where diamond hangs at shutdown.
fixing elasticsearch collector for 0.90RC2
Add an instance prefix for per-VM metric reporting.

For collectors that may report metrics on a per-VM basis, use the VM name in
the reported path, and a separate prefix. Thus instead of reporting

servers.host.metric...

the path will be

instances.VM.metric...
Collector for LIbvirt/KVM instances.

Report metrics per VM, using the instances root prefix.

Report per VM:
  * Block stats, for each disk and global: read/write bytes/reqs
  * Virtual NIC stats, for each vif and global: tx/rx bytes, packets,
    error and drop
  * Virtual CPU time, for each and global
  * Basic memory stats
Collectors for Gridcentric VMS.

Gridcentric VMS creates OpenStack instances by cloning them from a live-image,
a snapshot of the disk and memory of a previously running instance.

VMS carefully manages the memory footprint of cloned VMs. These collectors
report per VM and host wide metrics on pages allocated, dirtied, clean, shared,
etc.
Sometimes we need "ms" level in time measure, for example when two servers are connected to a same switch, the ping-time of them may be 0.115(ms).
Merge pull request #354 from huoxy/master

Sometimes we need "ms" level when measure time in ping
Merge pull request #351 from classmarkets/elasticsearch-90

fixing elasticsearch collector for 0.90RC2
Merge pull request #352 from andreslagarcavilla/master

Collectors for Libvirt/KVM and Gridcentric VMS
Fix unit tests for ceph